diff --git a/dev-libs/nss/nss-3.40.recipe b/dev-libs/nss/nss-3.46.1.recipe similarity index 98% rename from dev-libs/nss/nss-3.40.recipe rename to dev-libs/nss/nss-3.46.1.recipe index db58509ec..a7fcb0cb4 100644 --- a/dev-libs/nss/nss-3.40.recipe +++ b/dev-libs/nss/nss-3.46.1.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="0562087b8bda072bf5964f8acf851f9c0997a59c384f4887cb517b3b628b32dd" +CHECKSUM_SHA256="3bf7e0ed7db98803f134c527c436cc68415ff17257d34bd75de14e9a09d13651" SOURCE_DIR="nss-$portVersion/nss" PATCHES="nss-$portVersion.patchset" @@ -59,6 +59,7 @@ PROVIDES=" cmd:p7verify$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk11ectest$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk11gcmtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11importtest$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk11mode$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk12util$secondaryArchSuffix = $portVersion compat >= 3 cmd:pk1sign$secondaryArchSuffix = $portVersion compat >= 3 diff --git a/dev-libs/nss/patches/nss-3.40.patchset b/dev-libs/nss/patches/nss-3.46.1.patchset similarity index 87% rename from dev-libs/nss/patches/nss-3.40.patchset rename to dev-libs/nss/patches/nss-3.46.1.patchset index 7af2b3b4b..1d96e17ba 100644 --- a/dev-libs/nss/patches/nss-3.40.patchset +++ b/dev-libs/nss/patches/nss-3.46.1.patchset @@ -1,4 +1,4 @@ -From 2aa45a2c3b2355964078592f252bba2342f1753f Mon Sep 17 00:00:00 2001 +From e22b4ac23e017e5cead121558520c151d2c8ef2a Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 5 Jul 2014 02:12:23 +0200 Subject: Haiku support @@ -46,7 +46,7 @@ index 79e56d5..0c9ccd3 100644 # Force the IRIX64 machines to use IRIX. # diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index 0a4f6dc..09a6061 100644 +index e961dd1..58a6481 100644 --- a/lib/dbm/include/mcom_db.h +++ b/lib/dbm/include/mcom_db.h @@ -60,7 +60,7 @@ typedef PRUint32 uint32; @@ -59,10 +59,10 @@ index 0a4f6dc..09a6061 100644 #ifndef BYTE_ORDER #define BYTE_ORDER __BYTE_ORDER -- -2.16.4 +2.24.0 -From 798fee81e524f85cc1e23d4dfb06f6f13533bfa0 Mon Sep 17 00:00:00 2001 +From f054122c30c56d9fc54edbf2f244b072c562ba65 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 13:09:35 +0000 Subject: define RTLD_NOLOAD @@ -84,10 +84,10 @@ index c42f694..edee40a 100644 * fetch the library if it's loaded. For NSS it should already be loaded */ -- -2.16.4 +2.24.0 -From 19f3c7996f3db98f4c509720b5676f80a8af556e Mon Sep 17 00:00:00 2001 +From 7b2f76ef5470761714572b0052c9ba1700e5f475 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 13:40:13 +0000 Subject: skip optionally the signing part @@ -116,10 +116,10 @@ index b53cfea..51fe162 100644 + +SKIP_SHLIBSIGN=1 -- -2.16.4 +2.24.0 -From 38e58c10c25b364718c07f366994ab45b46b49a8 Mon Sep 17 00:00:00 2001 +From ab70f80bf43996bbfd008b4d079a8f07bb3ae799 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Sep 2014 14:14:26 +0000 Subject: use system libs @@ -137,10 +137,10 @@ index 51fe162..fe54580 100644 +ZLIB_LIBS = -lz +NSS_USE_SYSTEM_SQLITE=1 -- -2.16.4 +2.24.0 -From 32a3408ba89edfa790921ba44b7134b98e5a5104 Mon Sep 17 00:00:00 2001 +From b03a185b82f8b8749827a6a8823c5c9a98fafde9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 24 Nov 2015 19:12:08 +0000 Subject: avoid some tests. @@ -156,10 +156,10 @@ index fe54580..3bc0ce3 100644 NSS_USE_SYSTEM_SQLITE=1 +NSS_DISABLE_GTESTS=1 -- -2.16.4 +2.24.0 -From 18f1448d42e9c2fa5e72f45bb06ce4833e17daa9 Mon Sep 17 00:00:00 2001 +From ae369f44e6caa23f9935a251903b19f63b187982 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Fri, 27 Apr 2018 21:38:56 +0200 Subject: Enable -Bsymbolic for BeOS target @@ -167,10 +167,10 @@ Subject: Enable -Bsymbolic for BeOS target * Fixes infinite loop in RNG_RNGInit. diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile -index bff11c7..0c4272f 100644 +index d5dd4bb..40a68f5 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile -@@ -298,7 +298,7 @@ endif +@@ -301,7 +301,7 @@ endif # to bind the blapi function references in FREEBLVector vector # (ldvector.c) to the blapi functions defined in the freebl # shared libraries. @@ -180,10 +180,10 @@ index bff11c7..0c4272f 100644 endif -- -2.16.4 +2.24.0 -From fe86fbc25c46015bb63c6f92ede9c002a3a9cbb2 Mon Sep 17 00:00:00 2001 +From 43157854586333ff89646a077ace06c64c95130c Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 11 Aug 2018 00:46:36 +0200 Subject: Define XP_HAIKU @@ -204,10 +204,10 @@ index 3bc0ce3..d25df28 100644 USE_PTHREADS = 1 -- -2.16.4 +2.24.0 -From 92156286b7b584f7be1deed33605a56f5039bdf0 Mon Sep 17 00:00:00 2001 +From beecbae173e26da24284798d5226c3726752221c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 14 Aug 2018 09:00:06 +1000 Subject: Fix build for x64 @@ -229,17 +229,17 @@ index d25df28..9cc8afc 100644 ifdef BUILD_OPT OPTIMIZER = -O2 -- -2.16.4 +2.24.0 -From 8e7856e475659ff8d5ccada94fff9ea8ec4ad703 Mon Sep 17 00:00:00 2001 +From 37926061c79f3e489eed9e2e101e7428bef4eee0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 15 Aug 2018 11:12:46 +1000 Subject: Fix build for x86 diff --git a/cmd/httpserv/httpserv.c b/cmd/httpserv/httpserv.c -index 71e2ab8..d138b1f 100644 +index c7277f3..eb806e2 100644 --- a/cmd/httpserv/httpserv.c +++ b/cmd/httpserv/httpserv.c @@ -1325,7 +1325,7 @@ main(int argc, char **argv) @@ -252,10 +252,10 @@ index 71e2ab8..d138b1f 100644 } } diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c -index 1784c9e..538a15b 100644 +index fb2d8d5..e995b4e 100644 --- a/cmd/selfserv/selfserv.c +++ b/cmd/selfserv/selfserv.c -@@ -2532,7 +2532,7 @@ main(int argc, char **argv) +@@ -2564,7 +2564,7 @@ main(int argc, char **argv) FILE *tmpfile = fopen(pidFile, "w+"); if (tmpfile) { @@ -265,5 +265,5 @@ index 1784c9e..538a15b 100644 } } -- -2.16.4 +2.24.0