Version bump

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

3 files changed, 289 insertions, 17 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index d20a426b1975..93677bda3d83 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.334 2013/12/15 19:27:41 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.335 2014/01/09 13:11:20 polynomial-c Exp $
+
+*nss-3.15.4 (09 Jan 2014)
+
+  09 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> +nss-3.15.4.ebuild:
+  Version bump.
 
   15 Dec 2013; Agostino Sarubbo <ago@gentoo.org> nss-3.15.3.ebuild:
   Stable for sparc, wrt bug #493850
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d67adb0f0515..cc630ae69756 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 SHA512 fcb47b120860436987858be53971f020db2d7c2f1bef1300bdca6dcf45d76a9b595c545112c1e7553ac29c412f72eafe3d29cd91ed1ab196b03146a7d8bc1870 WHIRLPOOL 1f59af79d4d7565185a3b841b3e936f7d3dddc642630d261be22c04d04cb0f8dfdd13ddacaa0fe8d69256fcffaee5fc273dfe73fc72f539abb5ed501dd1439c2
 AUX nss-3.14.1-gentoo-fixups-r1.patch 6370 SHA256 68a7e9f3f05d247825abe364e12289b7924e5e6f079d309b18aa7ef0be90d002 SHA512 8ac25987f330a34dd364ba4ea1eb9378813268d0a47dc6f287ece66184d88d2eb32fb80f8c6ea46815161ef54f6dac2960c8024ef443545d8ffdba43c10405e1 WHIRLPOOL fa45342b098c62daa6b8b798f8bcfec894743b264d50bd0c025f0395b91bd3c354547f4282fa8d9afcb5dd844f9f2590014657d881ab606cc71c2d84ba9ed7ce
@@ -15,25 +15,28 @@ DIST nss-3.15-pem-support-20130617.patch.xz 27800 SHA256 01885877f12b04607987606
 DIST nss-3.15.2.tar.gz 6288669 SHA256 7b2c80d18c49581edbdb509cbf7afd61d8c53658f2a38ff20e224c1909faeddc SHA512 f19889115ebd9f3214ee4faef11764d30936522c55aebe31bbed22073a39ca025559aa90ed96c973384b4f404c7179cffd212a63406e79f50213c0c991bb1c9e WHIRLPOOL 4464f0e56415871f22d89bd9c97c750088066d454d4d643f8475379e6372fa4f3a0839f49949d4024babfe1500250ef60d40358fca52e5133ee45ddc02bc2efd
 DIST nss-3.15.3.1.tar.gz 6289657 SHA256 607a913882540df81f74152e8aa492e0dd09c5d3f2c7321f18c69ee501fc6ba5 SHA512 a6b93df711a5af32afc29629132c72b3b93b880c0072916d892840088d23c0cf1c8db211a2f0ced9a97b5f80be2c9debdce9829a2a428be7bb4a7b62a91d9ab7 WHIRLPOOL 77a907ff069ff432e1aecf56ebcb37821310bde8628d949178e3f90483b16248b85a283db9dd19fe76934543b7ad48c495682cd5bcf035a7548aaa6b69489179
 DIST nss-3.15.3.tar.gz 6288990 SHA256 ec5f01f7d9f42cf8ad3f95c7f8921bde583df9297c83dc9062930462e3717a18 SHA512 54ad1ab7c589a7a9f866a8e6d9ef2827321a03959f9ea28c6a931d17594f433e951cc253950f205bc19dde457562ccd91e6c412fa02fb6a96611b392341f87ba WHIRLPOOL 4d5336d8a745587f70249a06958f56787ec731dc1eab7ba6db57b177cb51eae3c2028f2094b98cecdfbd789e6e80e43ffba8f2d2c20dbbbb5066fd2636d5c6d1
+DIST nss-3.15.4-pem-support-20140109.patch.xz 28400 SHA256 bcdd3decd9a7e33e240af899ead32fb92c9bf623bc99fc4b60ca4e08bcf92b82 SHA512 59066b73357ae96d3f18749b8f3bd07548d8f5e6a7b8b1f2bf227ac95ee6d3ad8ccfa60471de41f7b73f37db8e80e948c34109c69e96e958be094140e026504e WHIRLPOOL b08f463a6f699957737f3d7dda8e25e15658097d8a538c2596b94c55777afdf6526ab041e617c54ae709bdce4f1acc2aa19da619eb98e128a1d0cd0dc1de230d
+DIST nss-3.15.4.tar.gz 6366271 SHA256 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c SHA512 21ca81b636f7e230715556bc874d5c1c4f370c6fe57a39cb12fa349d0414a88e13aa931060613a793f7267868e026eaf167cbab5f2a5e8759e7a4b176d97fc6a WHIRLPOOL 7ebf8a60e7db5ee8e90137430f1b97d591fc11d02771aac027a1ff702f17ff74a8c78f4f77fb92aab1d10d6e0ff63d2e72e4bbf3d489ba60d778cb02868c2ec6
 EBUILD nss-3.15.2.ebuild 7514 SHA256 819d05c422fb7cdcbc67973de7bd31c8369fbaa0eea2890776d270dfe27d21b2 SHA512 1131f290f0d653f097a6074374ef03e04e1adc7df55f6e2bd3fe602c9f901f573a561148dc4fc51b24d4d233d3dfa8c7ee925ad2c5a99fc0e66926d637fb4744 WHIRLPOOL 9a17b451140b089b3c5d5c69b016fc92501f4cab67314d8edfd027d44ff0e3d12cdbee81272497a3c2e50dd74dc7e83f46bf33fda05d12486aae85cb5b1926e2
 EBUILD nss-3.15.3.1.ebuild 7522 SHA256 5e9f277dd8326e5484938bbf517ba8ebbe0c222e2161890d34493eae504cc60d SHA512 68990fe44610d2dc8d6daa261e105118a30e717f0b2a00911d0ff94cbec4f29270cde7e9b01fab6edd00b09e951d03453cf2e8ba9f09d781c32e03e749e14d0f WHIRLPOOL 4610b5673ea452ff0c6203a7c9cf306da16558d62cdc13d3657379cfed8bbd04f8b520d3527a7d08ff2e3b081d6e88945182b9edcf3b2e6e1a62c1ed16360d6d
 EBUILD nss-3.15.3.ebuild 7514 SHA256 6ba7cfd4313b335b809cd683aa51645fcea7ade4d12d7ce50e946b2d8ec346f2 SHA512 6ce88f3f444de3449af257be7f984b897d32ab8fe6cdb6dc18c34d52912c16226e3c82dae71407c9c3d31ec2e186633a4d0cc1c2f2e2d3e9908a96b67e7b406a WHIRLPOOL d2c49027fd833e4e80edf1a49c64cbc27a22ba98bd85c73bab962c6759591c5bd4635cd59d354eb65833da5c3395220944c8053ed4e05b7855d36da17a5cd01b
-MISC ChangeLog 42437 SHA256 4a0126732c0884f3ec36992fff996cffd455fbd64170796c5ca3a0b37642d94c SHA512 182b33cdc0bf617a60a54d9a06e47b839772123e4a9fa6571c2cab5f8b183d6ae134ce52375089947f3851408baf31c99cb0ebe64081de7b7441e20f5bc216b1 WHIRLPOOL 1dad953c0c4828fffca5f1d7ce144276443e81b377d05de4d4e4426674ce35bc1dffea7e2b535357b178e44d5a816159788c11c57ce6c5ba5bcddc33af1953bc
+EBUILD nss-3.15.4.ebuild 7476 SHA256 1e7a901c68196fb6cd4ed97dceb4ccb94e37122e794fd30222b6ba62811a6297 SHA512 ed47d937e747913808c5e1a8d7d868ffeb720546e8ec0959db688740f29cf80482a5e50a9d76f5da76096757c6ac2d65c794717f28457edeef54417fe07e23bd WHIRLPOOL 8f21019f59b8a5ad86354bd09cac2f3d756e326d3e57caa9f5c19c08e62d5bc7e8902479e47ba4a654844fe186778eaff29a00c56d9cf9152bd4721b1015217b
+MISC ChangeLog 42564 SHA256 32f48cc4eb09ca3d7776a4a8721df51d6361d991940bd2551631aed3a8838d6f SHA512 7a0ee61e28e6d3cc254c61f46dc065a1a7882312985eb5ab65e9de41ed34249d5098c61002bac8a476d1febaf9863a1f33b7562cd03ee71e286e97abc720640e WHIRLPOOL ad2d10877d3982f1663a746a5ba712749d431eecf6c1ed0c27edc5da3976e28b4c8ab23081575257175a234f477b7fdd04bf5d477ede5da60549becc9047ee09
 MISC metadata.xml 323 SHA256 e6fef8af50b09ae8cd84d42ca66b3716d47046ca2c643cb842a0cbc75196c1c5 SHA512 d4631c5de361b5b04d5ec36061fcb4762d47efd93b977c63e26d921109d0b2c2639f803442600b363c91937f2e5b2acd7ef0dde8b85abf801d814f8f70c20dfb WHIRLPOOL 38c7d7ccfbaf04fa026fe377b5810c187cf4da4c9c9f77ee0f80fc0d68bffd398a65eb37ec3457a351ec80405d0bd71ae09612efc6cff16e047ba01ec87ccac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSrgKlAAoJELp701BxlEWfoE8P/RcDMYhkNo5TBHeIQEPCTyqY
-Sl6TK1e10Yeql7cto7Updm6rBcl4mZ3h7x8UeMvT5hTa2xYYLndczgFPlbcUx+qf
-ZyrhdA+m8eN7AigIfnaqlUKUib0Uh9qlag4HmYb6alI3+nTYchpCHfrcpBeBrY+u
-wWD3YRP5J+XL1yXSQisT0KrOzQBrPvcn55PoqQ32nRg6tTEk3b5gfon3+WurlxWd
-qknV88CZkCNHC7MU/Dj+sK7r+/QLtICrIbzOmjW9eycO3cRmLfx1c/HcqoLS+8mU
-rSPZUZJiLcEZddTXm1c8bEFVaI+mFDL5FfRXYcXAmcxMY/CmtE+NeheD2vpiCPwp
-apbBzo1VPCBfk27djjffOkxgAkg7wcbhh0lFAzQyueuZ7NdITpAWbzDsVGLAoYtw
-cmbQV8Fhz8eiFQcmGXf4DhlH+aMybXOHjtQi96g79v+R1P0UVlxUQTSeD1aTFREE
-JabUrqfPX9ygiz7Ll10T9szxztmuw3cK3L2IjRaaJf/YS90iw5WDH18BItKMaPdY
-iaSixw0tb6BETsBxXvZxCzgxuchSQ/mMoQ6KLlrc/5lXKNc4/mTJzFHPkAGA52Pt
-LHPU7qmUEbkZoRwZTso8Fe58qHtCq9KsNaMYCFLQGYKeWhI4OYlQY2bZ7m2BToQD
-HryKbJfjhywpThG94tQr
-=K4GV
+iQIcBAEBCAAGBQJSzp/5AAoJEPiazRVxLXTF9qEP/jrClpmbpvv4rz1Vrt/XEQxk
+8GJA0USE/3nPwx9HVVrzrrbfSJMhxFMcT6TLXdYhbHDVLJhBzi67d2cF8XgWEq2H
+ZVsbkj9x6CjxMFMsniL8YZZk0+m8znhyDTQTEENcdLcj0b34qyEQn0Jh4pBW1tC6
+I+yYEkbB5X1whuY0SngtIpyCnovtDLkn1QyMOSnNvnQ8MEVd+skWKORORFQzcrt4
+xWUtY7GmDsew8X7N5b8TyrFz0cAfuroSpxoO3J+Rsieq1mfUREeS32T+CCGuozEY
++53vmvw8ubA7woUwzRPHFz6Gzr5bv8fq9RGN5azltQCEZVzwhJtL3HcZ9It5S7+p
+pV4igLk3tY4BT4gj7VFzSWBHn7oic4uQiG1U16VRxSCnjvihjNNz1vOjsim5HXh6
+AfAJrLnSByr+oLOIdndETLJ/sriZYj//drDmPuW4mFYFdLDahTB3773nnOv2xGSm
+5dcA5FGJlCDXqZN/FRy6I8WHLojXWlQFy9cGaVhlzgxLm6O32RfBrrVyFxMmlLPO
+sGK5ibMXeVmy2jAeX7JIAZdAapKVYPeGA/3tNBJdygzYF0uvxxPeHAquKNklj825
+i8TUkxLXgFO1tTUymHhzNZg0VefYgbD/uGcTLXeksvjA+yZdYdqvG2gBQo+GwXj8
+ieXwlV/aSXaI+A+DBGZy
+=otN/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.15.4.ebuild b/dev-libs/nss/nss-3.15.4.ebuild
new file mode 100644
index 000000000000..9062d704f149
--- /dev/null
+++ b/dev-libs/nss/nss-3.15.4.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.4.ebuild,v 1.1 2014/01/09 13:11:20 polynomial-c Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.10"
+RTM_NAME="NSS_${PV//./_}_RTM"
+PEM_PATCH="${PN}-3.15.4-pem-support-20140109.patch.xz"
+
+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
+	http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
+	http://dev.gentoo.org/~polynomial-c/mozilla/${PEM_PATCH}"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="utils"
+
+DEPEND="virtual/pkgconfig
+	>=dev-libs/nspr-${NSPR_VER}"
+
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5
+	sys-libs/zlib"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+src_setup() {
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	epatch "${DISTDIR}/${PEM_PATCH}"
+	epatch "${FILESDIR}/${PN}-3.15-x32.patch"
+	cd coreconf
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		"${S}"/config/Makefile
+
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			"${S}"/cmd/shlibsign/sign.sh
+	fi
+
+	# dirty hack
+	cd "${S}"
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+	hppa*)   echo "parisc";;
+	i?86*)   echo "i686";;
+	x86_64*) echo "x86_64";;
+	*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	echo > "${T}"/test.c || die
+	${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
+	case $(file "${T}"/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 your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+src_compile() {
+	strip-flags
+
+	tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+	local makeargs=(
+		CC="${CC}"
+		AR="${AR} rc \$@"
+		RANLIB="${RANLIB}"
+		OPTIMIZER=
+		$(nssbits)
+	)
+
+	# Take care of nspr settings #436216
+	append-cppflags $(${PKG_CONFIG} nspr --cflags)
+	append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
+	unset NSPR_INCLUDE_DIR
+	export NSPR_LIB_DIR=${T}/fake-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 XCFLAGS="${CFLAGS} ${CPPFLAGS}"
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	emake -j1 -C coreconf \
+		CC="${BUILD_CC}" \
+		$(nssbits BUILD_) \
+		|| die
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed"
+	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
+}
+
+src_install() {
+	cd "${S}"/dist
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	# We generate these after stripping the libraries, else they don't match.
+	#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
+	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+	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
+	cd "${S}"/dist/*/bin/
+	for f in ${nssutils}; do
+		dobin ${f}
+	done
+
+	# 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"
+	doenvd "${T}/90nss"
+}
+
+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)
+}
+
+pkg_postrm() {
+	cleanup_chk "${EROOT}"/usr/$(get_libdir)
+}