Version bump (bug #544252)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 3ed4bf635ddb39f437bdac00c8d8e2cc75b6c44c..5ed121093687e7a1d35e0af593a680028e0fee89 100644 (file)
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.404 2015/01/31 11:08:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.405 2015/03/23 18:08:12 polynomial-c Exp $
+
+*nss-3.18 (23 Mar 2015)
+
+  23 Mar 2015; Lars Wendler <polynomial-c@gentoo.org> +nss-3.18.ebuild:
+  Version bump (bug #544252).
 
 *nss-3.17.4 (31 Jan 2015)
 

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index fc1dfbd5952c3756136d022dbe7e9a7624a80f88..3213558ba73718cdd99e244624dfe8de225494e5 100644 (file)
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,25 +8,27 @@ AUX nss-3.17.1-gentoo-fixups.patch 5415 SHA256 b28efbafe7be3adec9fba08fa79e28052
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 DIST nss-3.17.3.tar.gz 6932021 SHA256 f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5 SHA512 828d3d495492bed020d819790b439a912e5a997a2e38dd2b3b27f5d92989960984b758fffe410fc82165dea2c138125571a992f6b90596f599bfb5636d0ccaaf WHIRLPOOL f450eefbd2a64fe0cde12188ff6b1e21d649528e06f3d9303f28147cfee77aa085bd83746a7b5ccb1a1c57599688e05a214ef6e0eac79c9c8d1e3958aa7a1542
 DIST nss-3.17.4.tar.gz 6924699 SHA256 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79 SHA512 dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89 WHIRLPOOL bb6e1027c5237d12fe58b4c520536022d8d4e83183a78c3421fd46bf9c3503b1f0ca4644240e383f216ec1e5174c0ae4148372db68fb9f1c10275954559d5bbf
+DIST nss-3.18.tar.gz 6944836 SHA256 618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40 SHA512 b9ba1feed47ea6e650a3b746691134907cd7682748aed0d65ab5d15cbf07ab00010caabc0375f5d2d88d47277d002cddc299a57053e954e191205070b3a8297b WHIRLPOOL 7dab7c55658814bb1e46c99d4214b0d6329031829c940784d90c9e42211d35fc2ec1c9464ddcd4ba217b576521700060f64a4b7c2b7fe061b342c73e3a040cc9
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
 EBUILD nss-3.17.3.ebuild 9172 SHA256 e0b59735f5ad22209e6ea3023e94b04a0fa83a52dc37f9cfcf45afc856f53be3 SHA512 f33bc2ed093c6e3159f52bf2e1f60ac826412eacde0a8fc44a13485863d3dd074a28c1f09665c12fdd97508e501372efc1a9e9771f1e5d0fd4ed9fe15f6fa957 WHIRLPOOL 70297f8f776f8716e868349f335f881444d7b8c62e6d8998e50aa3ab29e704f13d40febca17d09dccb334ddcab7ded20ad78bc3dfc0b985079d836bca2f2c0d6
 EBUILD nss-3.17.4.ebuild 9189 SHA256 d05d27c5b30b82065ea9cd2da1bfb28ce5aba2b96b3916d26bdfe61f980c03ef SHA512 632b1f72eed20a78f4509c9555246dcce2a8ffb68137f5ae128d80bf2d4063dc9174ddfe219d7b33643ddcfd1bea25ce46db91cf74a0e85345c2b265ec187ecf WHIRLPOOL ab3a67477d52a32bfae01078f26887ddda436d9534a9a2fe8528e1053c39d2af162ebbf55ff85fdac0c20ce2cb5fe3ee05a2e4cba377719999596ebfa4237e2a
-MISC ChangeLog 51988 SHA256 41e425c1b46ccd7b4f2980ea101b2679648e78507a2d6610efb87188de264415 SHA512 df96e0a56985949776051d042b901b47c684eb139d6d985d34c8c69db2f311668c4d18bb7cdbbc9de26a2940761325c1011d4b2ab47952925af6ff81fa6eb390 WHIRLPOOL 29999adc8e32b8430053e4190519e616d6448a374d91eacb84bc4f65c377126e5efa40254cc9bc088c08054ec0a0716839210288fd325da26e7030b8b9588b1f
+EBUILD nss-3.18.ebuild 9187 SHA256 ad22c086f6f43118afd6ed4469231e76d74bb71371a04108103bdcee6af939ff SHA512 dbd633e179c72175df292ce004d7b542bff1a8dcbbc4808e1128884c9e7beff36b9c94e060bd30038fbd32af9c5f6dbdac714d21886374ab60bf54c22379041a WHIRLPOOL d4256cc2f37b651c75dd28272534d276b7260688aea2c17705efa00a93fdc1eaa682ded89f88bbb5daf5a0348945e985f229f6e21b6bcfa4808aad35517f58f0
+MISC ChangeLog 52116 SHA256 461e4bfeaa4ab1889bc3a8521f3148ed76966049b45c38bb741bccb39cde5369 SHA512 7e77bd3f01d7d6c05cb5c2b7b899e526a1d59cf60a2d751c55212418283690514a8ab5398f753ce863bc8d4cfc13b73da598d80b708f446c371d4bfb6640165c WHIRLPOOL 24be956401409307a386e0f4ab55d0268b17a8e8a70d8676f6f1111c2a1d396ad331efc6291e2d980ac590ab080f14238928740ecb19d3df806f0622b29202fd
 MISC metadata.xml 545 SHA256 d3a7dfb4b9f063b343b42b3002d3722ee44aea8a47154fa2158533aa94a5a258 SHA512 4da88948d5b637093646300bab0105c642968b2c9693939be6b75b5d24f02bd9b2cc5f13ae18594b9b00fa8dfe02e5d6959c13021124cd027007649787aec750 WHIRLPOOL 0879625ef92b2db563e5a1b434176bab08846e815fbf0c963a23b3ca228b3525dc80f6e7940a303fc1dd47403416c67811ed09d00f29a431abc4979865b67ff9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUzLeZAAoJEPiazRVxLXTFvUEP/RmqeymtJ9O3euSQKoydmGrg
-BJs0W6mPlR/YlgLkcSF6lXOM2NCjfMo8cVXneDtRvq5BIsAN6mfeILirbACFUHeF
-RoFL5BVlo1fbZ6ahDKLJ/fxM2fIbggwEehUSDOpe9r4BivzNnSIJNXjPFAWaX9lL
-3QEkZywtU3VfEdrW29gZ2uVAuwxreVRMtNmZYLEUDt/icpwya35ox5iGcg3IL/2W
-s2sVs9CTZ2XeOsFOdvlTdVly0FlF0TSzpiAVBm2stFG85OT3j0N6u/XPlSeUISoS
-YN+nMv7wks7+ga0n5GOWbWLhU+qHYJhOL61CjQzNfHF2ZXk9fCCTik/yEn9ipg4o
-oI4mUJhbmdFvQSEYwTo5waAFrU4WvGrHSPRTE/usz74YtesCUk0NHyNaTYcXHgfo
-Ro4tPFI7rXAGWGKVbd0AuyaMbsOAghxFl16KudkNjXtHchzjxPBPEzNB44V/4KHa
-38b6psjV1ksDvtSDqOebuiXwW49N3BjU5qqPc/ueCMuMVv9UpWgZuqPMgGFE5NfQ
-Jac2brhrAWnAAHY18YYlMpPLUf8/de2FsiJVSLnpUx5XztPRxXR8IPcXZU03eXQH
-EqGLbDa928FJudMM8Bm40n1GTClxaOUpk5fi7sECbaYba4RYTXngNYtUSR9RupwZ
-7JJ0k76i1+zizoM+AfgL
-=0f+j
+iQIcBAEBCAAGBQJVEFaOAAoJEPiazRVxLXTF2I4QAJcv8kvSVLZQUEmMfnUDk6Lv
+rvGD1U8Q088YdQEVkNBeTTxRpazK9NmhuZ4KL05LhjIK99nP7fgD5fVow1KGFNt+
+/eVANdXjCMTmxM3ammQG0AWuLTyqMLgCkUwNfBTnfal/iElGJiwD6SuUS+SuwgAj
+ym/uClrWkIhsA50Xfe0H4ufP7cMwm+FGGZJxTmCKqUgFtbempEXS8yBHsOc6VEcU
+rXUZ/iGQ6kIC9raxJ/2HE5DN4ZzYZrB1jsNTIm20Bl6VbekOdkIx0nfaEmkgWuPI
+HpnrcpL8JT+f115xCKOOXt503udoaMJP13EU6m08x9VOxqj+PzRO4HXQnkbgqOB2
+nOHXmyqza0cMqVnXOziQtGcvJiEaajDUk1eXBQAPLR49yUbJKcMQavebxoPv/Du6
+PYdCmKNsd+SjRJK0JHn/ypmo8nAupl7VT4Uno6zyc4KFsEbF9e8sxxBCBhATfxFZ
+4N3c7lxQ+hzzMipvRX2Yib80nPvgwAO+Hyi68EBT2hTEpOiwuzdmP8ROaUeK/Cw1
+AYpZU1aIg7BLA2aEdD0u83O/y0uo7M61AvICjnBw+pv843NaPiqjBEP2egvFHAM2
+PUQoZMV2kmgTwDyA2zxQIEWU7OzzO4jJWQzXo13X77WhwqqaEhyb+2vS6hoAVjAA
+gNgTZgGJNnL7J3+9Ue6D
+=nRCx
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/nss/nss-3.18.ebuild b/dev-libs/nss/nss-3.18.ebuild
new file mode 100644 (file)
index 0000000..4371f7f
--- /dev/null
+++ b/dev-libs/nss/nss-3.18.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.18.ebuild,v 1.1 2015/03/23 18:08:12 polynomial-c Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.10.6-r1"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
+PEM_P="${PN}-pem-${PEM_GIT_REV}"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+       cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
+       nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
+
+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 utils"
+
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+       >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+       >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+       )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/nss-config
+)
+
+src_unpack() {
+       unpack ${A}
+       if use nss-pem ; then
+               mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+       fi
+}
+
+src_prepare() {
+       # Custom changes for gentoo
+       epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
+       epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+       use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+       use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
+       epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+
+       pushd coreconf >/dev/null || die
+       # hack nspr paths
+       echo 'INCLUDES += -I$(DIST)/include/dbm' \
+               >> headers.mk || die "failed to append include"
+
+       # modify install path
+       sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+               -i source.mk || die
+
+       # Respect LDFLAGS
+       sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+       popd >/dev/null || die
+
+       # Fix pkgconfig file for Prefix
+       sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+               config/Makefile || die
+
+       # use host shlibsign if need be #436216
+       if tc-is-cross-compiler ; then
+               sed -i \
+                       -e 's:"${2}"/shlibsign:shlibsign:' \
+                       cmd/shlibsign/sign.sh || die
+       fi
+
+       # dirty hack
+       sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+               lib/ssl/config.mk || die
+       sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+               cmd/platlibs.mk || die
+
+       multilib_copy_sources
+
+       strip-flags
+}
+
+multilib_src_configure() {
+       # Ensure we stay multilib aware
+       sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+       # Most of the arches are the same as $ARCH
+       local t=${1:-${CHOST}}
+       case ${t} in
+               aarch64*)echo "aarch64";;
+               hppa*)   echo "parisc";;
+               i?86*)   echo "i686";;
+               x86_64*) echo "x86_64";;
+               *)       tc-arch ${t};;
+       esac
+}
+
+nssbits() {
+       local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+       if [[ ${1} == BUILD_ ]]; then
+               cc=$(tc-getBUILD_CC)
+       else
+               cc=$(tc-getCC)
+       fi
+       echo > "${T}"/test.c || die
+       ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+       case $(file "${T}/${1}test.o") in
+               *32-bit*x86-64*) echo USE_X32=1;;
+               *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+               *32-bit*|*ppc*|*i386*) ;;
+               *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+       esac
+}
+
+multilib_src_compile() {
+       # use ABI to determine bit'ness, or fallback if unset
+       local buildbits mybits
+       case "${ABI}" in
+               n32) mybits="USE_N32=1";;
+               x32) mybits="USE_X32=1";;
+               s390x|*64) mybits="USE_64=1";;
+               ${DEFAULT_ABI})
+                       einfo "Running compilation test to determine bit'ness"
+                       mybits=$(nssbits)
+                       ;;
+       esac
+       # bitness of host may differ from target
+       if tc-is-cross-compiler; then
+               buildbits=$(nssbits BUILD_)
+       fi
+
+       local makeargs=(
+               CC="$(tc-getCC)"
+               AR="$(tc-getAR) rc \$@"
+               RANLIB="$(tc-getRANLIB)"
+               OPTIMIZER=
+               ${mybits}
+       )
+
+       # Take care of nspr settings #436216
+       local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+       unset NSPR_INCLUDE_DIR
+
+       # Do not let `uname` be used.
+       if use kernel_linux ; then
+               makeargs+=(
+                       OS_TARGET=Linux
+                       OS_RELEASE=2.6
+                       OS_TEST="$(nssarch)"
+               )
+       fi
+
+       export BUILD_OPT=1
+       export NSS_USE_SYSTEM_SQLITE=1
+       export NSDISTMODE=copy
+       export NSS_ENABLE_ECC=1
+       export FREEBL_NO_DEPEND=1
+       export ASFLAGS=""
+
+       local d
+
+       # Build the host tools first.
+       LDFLAGS="${BUILD_LDFLAGS}" \
+       XCFLAGS="${BUILD_CFLAGS}" \
+       NSPR_LIB_DIR="${T}/fakedir" \
+       emake -j1 -C coreconf \
+               CC="$(tc-getBUILD_CC)" \
+               ${buildbits:-${mybits}}
+       makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+       # Then build the target tools.
+       for d in . lib/dbm ; do
+               CPPFLAGS="${myCPPFLAGS}" \
+               XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+               NSPR_LIB_DIR="${T}/fakedir" \
+               emake -j1 "${makeargs[@]}" -C ${d}
+       done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#      */${local_libdir}/libfreebl3.so*
+#      */${local_libdir}/libnssdbm3.so*
+#      */${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+       local shlibsign="$1"
+       local libdir="$2"
+       einfo "Resigning core NSS libraries for FIPS validation"
+       shift 2
+       local i
+       for i in ${NSS_CHK_SIGN_LIBS} ; do
+               local libname=lib${i}.so
+               local chkname=lib${i}.chk
+               "${shlibsign}" \
+                       -i "${libdir}"/${libname} \
+                       -o "${libdir}"/${chkname}.tmp \
+               && mv -f \
+                       "${libdir}"/${chkname}.tmp \
+                       "${libdir}"/${chkname} \
+               || die "Failed to sign ${libname}"
+       done
+}
+
+cleanup_chk() {
+       local libdir="$1"
+       shift 1
+       local i
+       for i in ${NSS_CHK_SIGN_LIBS} ; do
+               local libfname="${libdir}/lib${i}.so"
+               # If the major version has changed, then we have old chk files.
+               [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+                       && rm -f "${libfname}.chk"
+       done
+}
+
+multilib_src_install() {
+       pushd dist >/dev/null || die
+
+       dodir /usr/$(get_libdir)
+       cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+       cp -L -t "${ED}"/usr/$(get_libdir) */lib/{libcrmf,libfreebl}.a || die "copying libs failed"
+
+       # Install nss-config and pkgconfig file
+       dodir /usr/bin
+       cp -L */bin/nss-config "${ED}"/usr/bin || die
+       dodir /usr/$(get_libdir)/pkgconfig
+       cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+       # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+       # bug 517266
+       sed     -e 's#Libs:#Libs: -lfreebl#' \
+               -e 's#Cflags:#Cflags: -I${includedir}/private#' \
+               */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+               || die "could not create nss-softokn.pc"
+
+       # all the include files
+       insinto /usr/include/nss
+       doins public/nss/*.h
+       insinto /usr/include/nss/private
+       doins private/nss/{blapi,alghmac}.h
+
+       popd >/dev/null || die
+
+       local f nssutils
+       # Always enabled because we need it for chk generation.
+       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"
+                       nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+                       cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+                       nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+                       pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+                       symkeyutil tstclnt vfychain vfyserv"
+               fi
+               pushd dist/*/bin >/dev/null || die
+               for f in ${nssutils}; do
+                       dobin ${f}
+               done
+               popd >/dev/null || die
+       fi
+
+       # Prelink breaks the CHK files. We don't have any reliable way to run
+       # shlibsign after prelink.
+       local l libs=() liblist
+       for l in ${NSS_CHK_SIGN_LIBS} ; do
+               libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+       done
+       liblist=$(printf '%s:' "${libs[@]}")
+       echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
+       doenvd "${T}/90nss-${ABI}"
+}
+
+pkg_postinst() {
+       multilib_pkg_postinst() {
+               # We must re-sign the libraries AFTER they are stripped.
+               local shlibsign="${EROOT}/usr/bin/shlibsign"
+               # See if we can execute it (cross-compiling & such). #436216
+               "${shlibsign}" -h >&/dev/null
+               if [[ $? -gt 1 ]] ; then
+                       shlibsign="shlibsign"
+               fi
+               generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+       }
+
+       multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+       multilib_pkg_postrm() {
+               cleanup_chk "${EROOT}"/usr/$(get_libdir)
+       }
+
+       multilib_foreach_abi multilib_pkg_postrm
+}