diff --git a/dev-libs/nss/nss-3.52.1.recipe b/dev-libs/nss/nss-3.56.recipe similarity index 97% rename from dev-libs/nss/nss-3.52.1.recipe rename to dev-libs/nss/nss-3.56.recipe index 1d044bed2..0810542cc 100644 --- a/dev-libs/nss/nss-3.52.1.recipe +++ b/dev-libs/nss/nss-3.56.recipe @@ -12,7 +12,7 @@ LICENSE="GNU GPL v2 REVISION="1" NSS_VERSION=`echo $portVersion | sed 's/\./_/g'` SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz" -CHECKSUM_SHA256="bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278" +CHECKSUM_SHA256="f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" SOURCE_DIR="nss-$portVersion/nss" PATCHES="nss-$portVersion.patchset" @@ -136,9 +136,11 @@ BUILD() myCPPFLAGS="${CPPFLAGS} `pkg-config nspr --cflags`" myLDFLAGS="${LDFLAGS} `pkg-config nspr --libs-only-L`" - export BUILD_OPT=1 + # export BUILD_OPT=1 export NSDISTMODE=copy export FREEBL_NO_DEPEND=1 + export NSS_ALLOW_SSLKEYLOGFILE=1 + export NSS_ENABLE_WERROR=0 export ASFLAGS="" if [ "$effectiveTargetArchitecture" = x86_64 ]; then export USE_64=1 @@ -159,6 +161,10 @@ INSTALL() mv ../dist/*/lib $libDir mv ../dist/public/nss $includeDir + # strip debug info + strip $binDir/* + strip $libDir/* + # set up the develop directory correctly prepareInstalledDevelLibs libnss3 libfreebl3 libnssckbi libnssdbm3 \ libnssutil3 libsmime3 libsoftokn3 libssl3 diff --git a/dev-libs/nss/patches/nss-3.52.1.patchset b/dev-libs/nss/patches/nss-3.56.patchset similarity index 95% rename from dev-libs/nss/patches/nss-3.52.1.patchset rename to dev-libs/nss/patches/nss-3.56.patchset index de757175e..f4693249e 100644 --- a/dev-libs/nss/patches/nss-3.52.1.patchset +++ b/dev-libs/nss/patches/nss-3.56.patchset @@ -27,7 +27,7 @@ index 750696d..b53cfea 100644 OPTIMIZER = -O2 endif diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 790372d..24835d0 100644 +index cc13ced..8035236 100644 --- a/coreconf/arch.mk +++ b/coreconf/arch.mk @@ -33,6 +33,14 @@ else @@ -84,7 +84,7 @@ index c42f694..edee40a 100644 * fetch the library if it's loaded. For NSS it should already be loaded */ -- -2.27.0 +2.28.0 From 28a3097e65d9cb2cef61e850ce3b7302419c0cc7 Mon Sep 17 00:00:00 2001 @@ -94,17 +94,19 @@ Subject: skip optionally the signing part diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 +index a119205..9e38c1c 100644 --- a/cmd/shlibsign/Makefile +++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else +@@ -95,7 +95,9 @@ else endif endif -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) ++ifndef SKIP_SHLIBSIGN + libs: install +endif - + ifdef CHECKLOC + $(MAKE) $(CHECKLOC) + endif diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk index b53cfea..51fe162 100644 --- a/coreconf/BeOS.mk @@ -167,10 +169,10 @@ Subject: Enable -Bsymbolic for BeOS target * Fixes infinite loop in RNG_RNGInit. diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile -index 3e75dbf..27fbf16 100644 +index 4a60041..32cfca1 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile -@@ -323,7 +323,7 @@ endif +@@ -333,7 +333,7 @@ endif # to bind the blapi function references in FREEBLVector vector # (ldvector.c) to the blapi functions defined in the freebl # shared libraries. @@ -252,10 +254,10 @@ index c7277f3..eb806e2 100644 } } diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c -index 0f500d6..61a8264 100644 +index 1584d7e..0c899b0 100644 --- a/cmd/selfserv/selfserv.c +++ b/cmd/selfserv/selfserv.c -@@ -2620,7 +2620,7 @@ main(int argc, char **argv) +@@ -2668,7 +2668,7 @@ main(int argc, char **argv) FILE *tmpfile = fopen(pidFile, "w+"); if (tmpfile) {