From 5c512dcb5ceee2da0f7e3f9e8683d6efc6ab9324 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Fri, 27 Apr 2018 21:45:34 +0200
Subject: [PATCH] nss: fix infinite loop in RNG_RNGInit

* Fixes #2469.
---
 dev-libs/nss/nss-3.23.recipe           |  2 +-
 dev-libs/nss/patches/nss-3.23.patchset | 60 ++++++++++++++++++--------
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/dev-libs/nss/nss-3.23.recipe b/dev-libs/nss/nss-3.23.recipe
index 4d569f9c7..0ded26bde 100644
--- a/dev-libs/nss/nss-3.23.recipe
+++ b/dev-libs/nss/nss-3.23.recipe
@@ -11,7 +11,7 @@ LICENSE="
 	GNU LGPL v2.1
 	MPL v2.0
 	"
-REVISION="5"
+REVISION="6"
 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="94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf"
diff --git a/dev-libs/nss/patches/nss-3.23.patchset b/dev-libs/nss/patches/nss-3.23.patchset
index 1d07aad7b..bb8bbf6b3 100644
--- a/dev-libs/nss/patches/nss-3.23.patchset
+++ b/dev-libs/nss/patches/nss-3.23.patchset
@@ -1,4 +1,4 @@
-From a05105e8cf826330b1de3e2f33150c0283c934bd Mon Sep 17 00:00:00 2001
+From 6ef42b03e65f0c2b51361f9bcf8cac760aaa09dd Mon Sep 17 00:00:00 2001
 From: Kacper Kasper <kacperkasper@gmail.com>
 Date: Sat, 5 Jul 2014 02:12:23 +0200
 Subject: Haiku support
@@ -30,10 +30,11 @@ diff --git a/coreconf/arch.mk b/coreconf/arch.mk
 index 62ba8d5..d515a20 100644
 --- a/coreconf/arch.mk
 +++ b/coreconf/arch.mk
-@@ -41,6 +41,14 @@ else
+@@ -40,6 +40,14 @@ else
+     OS_RELEASE := $(shell uname -r)
  endif
  
- #
++#
 +# Force the Haiku machines to use BeOS.
 +#
 +
@@ -41,12 +42,11 @@ index 62ba8d5..d515a20 100644
 +	OS_ARCH = BeOS
 +endif
 +
-+#
+ #
  # Force the IRIX64 machines to use IRIX.
  #
- 
 diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h
-index 4cca532..ecec75d 100644
+index 0a4f6dc..09a6061 100644
 --- a/lib/dbm/include/mcom_db.h
 +++ b/lib/dbm/include/mcom_db.h
 @@ -60,7 +60,7 @@ typedef PRUint32 uint32;
@@ -57,22 +57,22 @@ index 4cca532..ecec75d 100644
 +#if defined(__linux) || defined(BEOS)
  #include <endian.h>
  #ifndef BYTE_ORDER
- #define BYTE_ORDER    __BYTE_ORDER
+ #define BYTE_ORDER __BYTE_ORDER
 -- 
-2.2.2
+2.16.2
 
 
-From 155512db961560ecaa31781efc1a4e8e56673d51 Mon Sep 17 00:00:00 2001
+From 6473ce45ba7fdbc3540d1eeb0dcb5dc5abf0ece4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 25 Sep 2014 13:09:35 +0000
 Subject: define RTLD_NOLOAD
 
 
 diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c
-index 993d01e..b436dd2 100644
+index ed2b643..99a9609 100644
 --- a/lib/freebl/stubs.c
 +++ b/lib/freebl/stubs.c
-@@ -596,6 +596,10 @@ freebl_InitNSSUtil(void *lib)
+@@ -605,6 +605,10 @@ freebl_InitNSSUtil(void *lib)
      return SECSuccess;
  }
  
@@ -84,10 +84,10 @@ index 993d01e..b436dd2 100644
   * fetch the library if it's loaded. For NSS it should already be loaded
   */
 -- 
-2.2.2
+2.16.2
 
 
-From 107d6928d8f969d28a7341bb500268d15fa7ebe1 Mon Sep 17 00:00:00 2001
+From b9f37c9372cb256d72f882db3be942131607020a Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 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.2.2
+2.16.2
 
 
-From 814cc5773310331615081ead443177f3085f6dd7 Mon Sep 17 00:00:00 2001
+From a8b3d9367ad80b2c537622240c94ade5aaf880b2 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 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.2.2
+2.16.2
 
 
-From 22dc826a0490c0fdb42e5ba69a56695d388a9e14 Mon Sep 17 00:00:00 2001
+From 030f82d941b36e67949b9796b5697304eab3f91f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 24 Nov 2015 19:12:08 +0000
 Subject: avoid some tests.
@@ -156,5 +156,29 @@ index fe54580..3bc0ce3 100644
  NSS_USE_SYSTEM_SQLITE=1
 +NSS_DISABLE_GTESTS=1
 -- 
-2.2.2
+2.16.2
+
+
+From f05a1c872745baa9382bff6fe2b23a9a1a9f6fa1 Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Fri, 27 Apr 2018 21:38:56 +0200
+Subject: Enable -Bsymbolic for BeOS target
+
+* Fixes infinite loop in RNG_RNGInit.
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+index 4d1860b..f6b1f43 100644
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -277,7 +277,7 @@ endif
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD BeOS, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 
+-- 
+2.16.2