[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     7509da53448a2593afecaa2e78e02f4bb4f230d0
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 01:55:27 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri May 17 01:55:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7509da53

dev-libs/nss: sync with tree

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 dev-libs/nss/metadata.xml                          |  1 +
 .../nss/{nss-3.44-r1.ebuild => nss-3.44-r2.ebuild} | 51 +++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index 6046625..009a097 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -10,6 +10,7 @@
     Include root/class3 certs from CAcert (http://www.cacert.org/)
   </flag>
   <flag name="nss-pem">Add support for libnsspem</flag>
+  <flag name="utils">Install utilities included with the library</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/a:mozilla:nss</remote-id>

diff --git a/dev-libs/nss/nss-3.44-r1.ebuild b/dev-libs/nss/nss-3.44-r2.ebuild
similarity index 89%
rename from dev-libs/nss/nss-3.44-r1.ebuild
rename to dev-libs/nss/nss-3.44-r2.ebuild
index 8e716b1..bd22251 100644
--- a/dev-libs/nss/nss-3.44-r1.ebuild
+++ b/dev-libs/nss/nss-3.44-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem"
+IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
@@ -181,6 +181,7 @@ multilib_src_compile() {
 	export NSS_ENABLE_ECC=1
 	export FREEBL_NO_DEPEND=1
 	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
 	export ASFLAGS=""
 
 	local d
@@ -286,6 +287,54 @@ multilib_src_install() {
 	nssutils=( shlibsign )
 
 	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
 		pushd dist/*/bin >/dev/null || die
 		for f in ${nssutils[@]}; do
 			dobin ${f}