From c818bc68cc3fe368e42fc12d273ca834274b9a3c Mon Sep 17 00:00:00 2001
From: Maurits Lamers <mauritslamers@sproutcore.com>
Date: Fri, 28 Sep 2018 15:36:05 +0000
Subject: [PATCH] nss: bump to 3.39. (#3155)

---
 dev-libs/nss/{nss-3.38.recipe => nss-3.39.recipe}   | 13 ++++++-------
 .../{nss-3.38.patchset => nss-3.39.patchset}        |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename dev-libs/nss/{nss-3.38.recipe => nss-3.39.recipe} (96%)
 rename dev-libs/nss/patches/{nss-3.38.patchset => nss-3.39.patchset} (98%)

diff --git a/dev-libs/nss/nss-3.38.recipe b/dev-libs/nss/nss-3.39.recipe
similarity index 96%
rename from dev-libs/nss/nss-3.38.recipe
rename to dev-libs/nss/nss-3.39.recipe
index 83e3e7827..217ec8f1a 100644
--- a/dev-libs/nss/nss-3.38.recipe
+++ b/dev-libs/nss/nss-3.39.recipe
@@ -6,15 +6,13 @@ PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and \
 other security standards."
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 COPYRIGHT="Mozilla Foundation"
-LICENSE="
-	GNU GPL v2
+LICENSE="GNU GPL v2
 	GNU LGPL v2.1
-	MPL v2.0
-	"
-REVISION="3"
+	MPL v2.0"
+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="2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62"
+CHECKSUM_SHA256="6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b"
 SOURCE_DIR="nss-$portVersion/nss"
 PATCHES="nss-$portVersion.patchset"
 
@@ -51,6 +49,7 @@ PROVIDES="
 	cmd:modutil$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:multinit$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:nonspr10$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:nss_policy_check$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:ocspclnt$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:ocspresp$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:oidcalc$secondaryArchSuffix = $portVersion compat >= 3
@@ -138,7 +137,7 @@ BUILD()
 	export NSDISTMODE=copy
 	export FREEBL_NO_DEPEND=1
 	export ASFLAGS=""
-	if [ $effectiveTargetArchitecture == 'x86_64' ]; then
+	if [ "$effectiveTargetArchitecture" = x86_64 ]; then
 		export USE_64=1
 	fi
 	for d in . lib/dbm ; do
diff --git a/dev-libs/nss/patches/nss-3.38.patchset b/dev-libs/nss/patches/nss-3.39.patchset
similarity index 98%
rename from dev-libs/nss/patches/nss-3.38.patchset
rename to dev-libs/nss/patches/nss-3.39.patchset
index 67a517176..e3788e77c 100644
--- a/dev-libs/nss/patches/nss-3.38.patchset
+++ b/dev-libs/nss/patches/nss-3.39.patchset
@@ -252,10 +252,10 @@ index 71e2ab8..d138b1f 100644
          }
      }
 diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c
-index c372ec9..87d2241 100644
+index 093c23b..89353bf 100644
 --- a/cmd/selfserv/selfserv.c
 +++ b/cmd/selfserv/selfserv.c
-@@ -2519,7 +2519,7 @@ main(int argc, char **argv)
+@@ -2532,7 +2532,7 @@ main(int argc, char **argv)
          FILE *tmpfile = fopen(pidFile, "w+");
  
          if (tmpfile) {