Date: Wed, 10 Jul 2013 13:01:52 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322687 - in head/security: ca_root_nss nss nss/files Message-ID: <201307101301.r6AD1qEJ038919@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Jul 10 13:01:52 2013 New Revision: 322687 URL: http://svnweb.freebsd.org/changeset/ports/322687 Log: Update to 3.15.1 Submitted by: Jan Beich <jbeich@tormail.org> Added: head/security/nss/files/patch-coreconf_FreeBSD.mk (contents, props changed) head/security/nss/files/patch-coreconf_UNIX.mk (contents, props changed) head/security/nss/files/patch-coreconf_arch.mk (contents, props changed) head/security/nss/files/patch-coreconf_command.mk (contents, props changed) head/security/nss/files/patch-coreconf_rules.mk (contents, props changed) head/security/nss/files/patch-coreconf_ruleset.mk (contents, props changed) Deleted: head/security/nss/files/patch-..::coreconf::FreeBSD.mk head/security/nss/files/patch-..::coreconf::UNIX.mk head/security/nss/files/patch-..::coreconf::command.mk head/security/nss/files/patch-..::coreconf::rules.mk head/security/nss/files/patch-..::coreconf::ruleset.mk head/security/nss/files/patch-.._coreconf_arch.mk head/security/nss/files/patch-Makefile Modified: head/security/ca_root_nss/Makefile head/security/ca_root_nss/distinfo head/security/nss/Makefile head/security/nss/distinfo head/security/nss/files/nss-config.in Modified: head/security/ca_root_nss/Makefile ============================================================================== --- head/security/ca_root_nss/Makefile Wed Jul 10 12:54:59 2013 (r322686) +++ head/security/ca_root_nss/Makefile Wed Jul 10 13:01:52 2013 (r322687) @@ -24,9 +24,9 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.14.3 +VERSION_NSS= 3.15.1 #NSS_SUFFIX= .with.ckbi.1.93 -CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl SUB_LIST= VERSION_NSS=${VERSION_NSS} Modified: head/security/ca_root_nss/distinfo ============================================================================== --- head/security/ca_root_nss/distinfo Wed Jul 10 12:54:59 2013 (r322686) +++ head/security/ca_root_nss/distinfo Wed Jul 10 13:01:52 2013 (r322687) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 -SIZE (nss-3.14.3.tar.gz) = 6189790 +SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284 +SIZE (nss-3.15.1.tar.gz) = 6286561 Modified: head/security/nss/Makefile ============================================================================== --- head/security/nss/Makefile Wed Jul 10 12:54:59 2013 (r322686) +++ head/security/nss/Makefile Wed Jul 10 13:01:52 2013 (r322687) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.14.3 +PORTVERSION= 3.15.1 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src @@ -16,7 +16,7 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss @@ -25,14 +25,12 @@ USE_PERL5_BUILD=yes MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 -ALL_TARGET= nss_build_all CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc -SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ - PORTVERSION=${PORTVERSION} +SUB_LIST= PORTVERSION=${PORTVERSION} -DIST= ${WRKSRC:H:H}/dist +DIST= ${WRKSRC:H}/dist EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ Modified: head/security/nss/distinfo ============================================================================== --- head/security/nss/distinfo Wed Jul 10 12:54:59 2013 (r322686) +++ head/security/nss/distinfo Wed Jul 10 13:01:52 2013 (r322687) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 -SIZE (nss-3.14.3.tar.gz) = 6189790 +SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284 +SIZE (nss-3.15.1.tar.gz) = 6286561 Modified: head/security/nss/files/nss-config.in ============================================================================== --- head/security/nss/files/nss-config.in Wed Jul 10 12:54:59 2013 (r322686) +++ head/security/nss/files/nss-config.in Wed Jul 10 13:01:52 2013 (r322687) @@ -1,6 +1,7 @@ #!/bin/sh prefix=%%PREFIX%% +version=%%PORTVERSION%% usage() { @@ -64,7 +65,11 @@ while test $# -gt 0; do echo_libdir=yes ;; --version) - echo %%PORTVERSION%% + case $version in + *.*.*) echo $version ;; + *.*) echo $version.0 ;; + *) echo $version.0.0 ;; + esac ;; --cflags) echo_cflags=yes @@ -125,16 +130,16 @@ fi if test "$echo_libs" = "yes"; then libdirs="-L$libdir" if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl%%MAJOR_VERSION%%" + libdirs="$libdirs -lssl3" fi if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime%%MAJOR_VERSION%%" + libdirs="$libdirs -lsmime3" fi if test -n "$lib_nss"; then - libdirs="$libdirs -lnss%%MAJOR_VERSION%%" + libdirs="$libdirs -lnss3" fi if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%" + libdirs="$libdirs -lnssutil3" fi echo $libdirs fi Added: head/security/nss/files/patch-coreconf_FreeBSD.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_FreeBSD.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,58 @@ +--- coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200 ++++ coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200 +@@ -37,9 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CC ?= gcc ++CCC = $(CXX) + RANLIB = ranlib + + CPU_ARCH = $(OS_TEST) +@@ -52,6 +52,13 @@ endif + ifeq ($(CPU_ARCH),amd64) + CPU_ARCH = x86_64 + endif ++ifneq (,$(filter powerpc%, $(CPU_ARCH))) ++CPU_ARCH = ppc ++endif ++ ++ifneq (,$(filter %64, $(OS_TEST))) ++USE_64 = 1 ++endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -70,15 +85,15 @@ + + ARCH = freebsd + +-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) ++ifndef MOZILLA_CLIENT ++DLL_SUFFIX = so.1 ++endif + +-ifeq ($(MOZ_OBJFORMAT),elf) +-DLL_SUFFIX = so ++ifneq (,$(filter alpha ia64,$(OS_TEST))) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) + else +-DLL_SUFFIX = so.1.0 ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) + endif +- +-MKSHLIB = $(CC) $(DSO_LDOPTS) + ifdef MAPFILE + MKSHLIB += -Wl,--version-script,$(MAPFILE) + endif +@@ -87,4 +100,5 @@ + + G++INCLUDES = -I/usr/include/g++ + +-INCLUDES += -I/usr/X11R6/include ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz Added: head/security/nss/files/patch-coreconf_UNIX.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_UNIX.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,13 @@ +--- coreconf/UNIX.mk~ ++++ coreconf/UNIX.mk +@@ -42,10 +42,8 @@ AR = ar cr $@ + LDOPTS += -L$(SOURCE_LIB_DIR) + + ifdef BUILD_OPT +- OPTIMIZER += -O + DEFINES += -UDEBUG -DNDEBUG + else +- OPTIMIZER += -g + USERNAME := $(shell whoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) Added: head/security/nss/files/patch-coreconf_arch.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_arch.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,11 @@ +--- coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100 ++++ coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100 +@@ -66,7 +66,7 @@ + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST := $(shell uname -p) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else Added: head/security/nss/files/patch-coreconf_command.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_command.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,9 @@ +--- coreconf/command.mk Mon Oct 10 19:46:12 2005 ++++ coreconf/command.mk Wed Jan 18 17:23:28 2006 +@@ -46,5 +46,5 @@ + LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) + LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) +-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ ++CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ + $(XCFLAGS) + RANLIB = echo Added: head/security/nss/files/patch-coreconf_rules.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_rules.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,12 @@ +--- coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007 ++++ coreconf/rules.mk Fri Mar 23 10:15:46 2007 +@@ -114,6 +114,9 @@ + endif + ifdef SHARED_LIBRARY + $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) ++ifndef MOZILLA_CLIENT ++ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so)) ++endif + ifdef MOZ_DEBUG_SYMBOLS + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) Added: head/security/nss/files/patch-coreconf_ruleset.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-coreconf_ruleset.mk Wed Jul 10 13:01:52 2013 (r322687) @@ -0,0 +1,11 @@ +--- coreconf/ruleset.mk~ ++++ coreconf/ruleset.mk +@@ -85,7 +85,7 @@ + # + + ifndef COMPILER_TAG +- ifneq ($(DEFAULT_COMPILER), $(notdir $(firstword $(CC)))) ++ ifneq ($(DEFAULT_COMPILER), $(CC)) + # + # Temporary define for the Client; to be removed when binary release is used + #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307101301.r6AD1qEJ038919>