diff options
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 40 | ||||
| -rw-r--r-- | security/nss/distinfo | 4 | ||||
| -rw-r--r-- | security/nss/files/extra-bug835050 | 10 | ||||
| -rw-r--r-- | security/nss/files/nss-config.in | 22 | ||||
| -rw-r--r-- | security/nss/files/nss.pc.in | 10 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 4 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::rules.mk | 4 | ||||
| -rw-r--r-- | security/nss/files/patch-lib_softoken_manifest.mn | 13 | ||||
| -rw-r--r-- | security/nss/files/patch-pr175656 | 13 |
9 files changed, 64 insertions, 56 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index bcb265201720..52bc584b9606 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +PORTVERSION= 3.14.3 +#DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src -DISTNAME= nss-${PORTVERSION}.with.ckbi.${CKBI_VER} +MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications @@ -16,11 +16,6 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 -_MAJOR= 3 -_MINOR= 14 -_PATCH= 1 - -CKBI_VER= 1.93 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss MAKE_JOBS_UNSAFE= yes @@ -28,10 +23,15 @@ USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${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 -L${LOCALBASE}/lib +SUB_FILES= nss-config nss.pc +SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ + PORTVERSION=${PORTVERSION} + DIST= ${WRKSRC:H:H}/dist EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm @@ -50,6 +50,16 @@ BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif +.include <bsd.port.pre.mk> + +.if ${ARCH} == amd64 +USE_BINUTILS= # intel-gcm.s +CFLAGS+= -B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin +.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 +EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 +.endif +.endif + check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ @@ -67,23 +77,11 @@ check regression-test test: post-patch: @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk - @${SED} -e 's|@exec_prefix@|${PREFIX}|; \ - s|@includedir@|${PREFIX}/include/nss|; \ - s|@libdir@|${PREFIX}/lib/nss|; \ - s|@prefix@|${PREFIX}|' \ - ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config - @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \ - ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc -.for i in MAJOR MINOR PATCH - @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config -.endfor @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|' - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/lib/softoken/manifest.mn ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' @@ -104,4 +102,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/nss/distinfo b/security/nss/distinfo index 61a54a477d2a..6cfaa9cbd8bc 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98 -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 +SIZE (nss-3.14.3.tar.gz) = 6189790 diff --git a/security/nss/files/extra-bug835050 b/security/nss/files/extra-bug835050 new file mode 100644 index 000000000000..a9ccd0a0c0d1 --- /dev/null +++ b/security/nss/files/extra-bug835050 @@ -0,0 +1,10 @@ +--- lib/freebl/Makefile~ ++++ lib/freebl/Makefile +@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( + # symbolic names to registers, for example, + # .set Htbl, %rdi + # So we can't use Clang's integrated assembler with intel-gcm.s. +-ifneq (,$(findstring clang,$(AS))) + $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as + endif +-endif diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in index 4e7f19737940..eba0fa7f528c 100644 --- a/security/nss/files/nss-config.in +++ b/security/nss/files/nss-config.in @@ -1,10 +1,6 @@ #!/bin/sh -prefix=@prefix@ - -major_version=@MAJOR@ -minor_version=@MINOR@ -patch_version=@PATCH@ +prefix=%%PREFIX%% usage() { @@ -68,7 +64,7 @@ while test $# -gt 0; do echo_libdir=yes ;; --version) - echo ${major_version}.${minor_version}.${patch_version} + echo %%PORTVERSION%% ;; --cflags) echo_cflags=yes @@ -97,13 +93,13 @@ done # Set variables that may be dependent upon other variables if test -z "$exec_prefix"; then - exec_prefix=@exec_prefix@ + exec_prefix=$prefix fi if test -z "$includedir"; then - includedir=@includedir@ + includedir=$prefix/include/nss fi if test -z "$libdir"; then - libdir=@libdir@ + libdir=$prefix/lib/nss fi if test "$echo_prefix" = "yes"; then @@ -129,16 +125,16 @@ fi if test "$echo_libs" = "yes"; then libdirs="-L$libdir" if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" + libdirs="$libdirs -lssl%%MAJOR_VERSION%%" fi if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" + libdirs="$libdirs -lsmime%%MAJOR_VERSION%%" fi if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" + libdirs="$libdirs -lnss%%MAJOR_VERSION%%" fi if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" + libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%" fi echo $libdirs fi diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in index 3aca32ee3208..12df4b7d05fd 100644 --- a/security/nss/files/nss.pc.in +++ b/security/nss/files/nss.pc.in @@ -1,11 +1,11 @@ -prefix=@PREFIX@ -exec_prefix=@PREFIX@ -libdir=@PREFIX@/lib/nss -includedir=@PREFIX@/include +prefix=%%PREFIX%% +exec_prefix=%%PREFIX%% +libdir=%%PREFIX%%/lib/nss +includedir=%%PREFIX%%/include Name: NSS Description: Mozilla Network Security Services -Version: @PORTVERSION@ +Version: %%PORTVERSION%% Requires: nspr Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lnssutil3 Cflags: -I${includedir}/nss -I${includedir}/nss/nss diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index 2b8c57181be8..c215c366f0af 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -27,7 +27,7 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -65,20 +80,18 @@ +@@ -65,20 +80,20 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT OS_LIBS += -pthread @@ -38,7 +38,9 @@ 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 diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk index 707f69da83ea..7b2adc31a707 100644 --- a/security/nss/files/patch-..::coreconf::rules.mk +++ b/security/nss/files/patch-..::coreconf::rules.mk @@ -1,10 +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,7 @@ +@@ -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) diff --git a/security/nss/files/patch-lib_softoken_manifest.mn b/security/nss/files/patch-lib_softoken_manifest.mn deleted file mode 100644 index 402e89a80507..000000000000 --- a/security/nss/files/patch-lib_softoken_manifest.mn +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/softoken/manifest.mn.orig 2010-07-30 04:33:26.000000000 +0200 -+++ lib/softoken/manifest.mn 2010-10-17 12:01:04.000000000 +0200 -@@ -47,9 +47,7 @@ - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" - --ifdef SQLITE_INCLUDE_DIR --INCLUDES += -I$(SQLITE_INCLUDE_DIR) --endif -+INCLUDES += -I$(LOCALBASE)/include - - EXPORTS = \ - secmodt.h \ diff --git a/security/nss/files/patch-pr175656 b/security/nss/files/patch-pr175656 new file mode 100644 index 000000000000..1f1bd51b838e --- /dev/null +++ b/security/nss/files/patch-pr175656 @@ -0,0 +1,13 @@ +--- lib/softoken/sdb.c~ ++++ lib/softoken/sdb.c +@@ -38,6 +38,10 @@ + #include <unistd.h> + #endif + ++#ifndef SQLITE_FCNTL_TEMPFILENAME ++#define SQLITE_FCNTL_TEMPFILENAME 16 ++#endif ++ + #ifdef SQLITE_UNSAFE_THREADS + #include "prlock.h" + /* |