commit:     f7ed2901332214add97e1427e3dc24a66af709eb
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 08:10:05 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 08:10:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ed2901

dev-libs/nss: drop 3.93, 3.94

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/nss/Manifest        |   2 -
 dev-libs/nss/nss-3.93.ebuild | 415 ------------------------------------------
 dev-libs/nss/nss-3.94.ebuild | 417 -------------------------------------------
 3 files changed, 834 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index cac9fe8a9439..b0a4a44694f7 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,8 +2,6 @@ DIST nss-3.79.4.tar.gz 84826326 BLAKE2B 
c34b1ba2c24891bd316af27828dbcc6b193b7298
 DIST nss-3.91-fixed-certs.tar.xz 11300 BLAKE2B 
85f191b85c7caf1ee24f92a2ff76f7660a1afd64d6c8d9da84f521aea18cb12bdf3d08426c47302a4b444b0e4b4ed2f2251ed8234d5bc0006b00cd4b97aacc51
 SHA512 
88d2a47ba160f93f2f2c88a1e2a591c516d19209bd77cc18111c8538d9cf86498cbfd57c7e36478819bde307d90ba31e0a12a9c17320ae5dc736d02959a32a3a
 DIST nss-3.91.tar.gz 72267945 BLAKE2B 
7dcd680311a5503007c0bb738ec24b50e40841470592c2d8dd542b3bdf085a6e4816f1fab4cb6b86220ff3e39a828f57a0a9172e3d1c2c82537eab6558a50226
 SHA512 
65258a4ea0b8c06ec49dd411eabe860ad5d7c3873beb27f8f43e10ef6be020b1522112df9deaeed27f23fd72f13cc7554e9c1854cd97e4716de419f722aff020
 DIST nss-3.92.tar.gz 72133646 BLAKE2B 
251daae56ccf8b8f4fd0b4287fea2049b6e72d1fc57fe02fb3d4f0b8a083aaf00046844145721a1e7620ecfbdbbb93206591e47386c12662765c09cf99db42bc
 SHA512 
dc317ec909433c9026f108b466bc436110b3c77edc3f73aef3d6dc6782f584c205053a368e4a134715bfdf63d2c1ae2185fc23238e5c2dca8f88ec185b1fec2a
-DIST nss-3.93.tar.gz 72281331 BLAKE2B 
99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f
 SHA512 
d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951
-DIST nss-3.94.tar.gz 76580364 BLAKE2B 
ad7d4fb7c8ddb063100b70717642677fcea177e46f04cf1a172eb4a7d565f99fdf0fca8b431498d83948f88aa89d4d53fbbc871cd8d64fb95242990eae203852
 SHA512 
3a839a6cc7267e45749f769621c3e8823f92cb654ee40460187e59b50825bb0f84ca278cd61881a3e0e7d95f95e0ffcd266a10c780cdcf8a08a2f0a9bb71892f
 DIST nss-3.95.tar.gz 76571130 BLAKE2B 
9d40b09c0c58901781abfad609dd45f44c2f4d1ce9d4f1592748cb64a9eb29b1ac84be54ebb19fa528d8b9fd08911f769a80f72d9e6dbb22e82e5b3581a30af1
 SHA512 
54567c063fc72bf1a29898bc8cc405e54aa086269021d864b10a3640e6b4ae0d632834db87766257fdb43740d9bc71e362d69cfe6924f5c72a6e1a99a91f8c3a
 DIST nss-3.96.tar.gz 76724862 BLAKE2B 
307c4ebcd6124a0006a24c8e2e9e884788f44c83645fd8cdd49cfa49497ed5c4f83d2d4f22ce5dd3b5256fffd6aec572b289af5e84f8131f1f23be3ea4264245
 SHA512 
96fdc1f09882c15678515f46f2daf966862fbf7525b92241297f26b95475de21e95128ffd63a0f9f9063e6c99e4abf435da8e93a19327885bfb0ad384ef15227
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git a/dev-libs/nss/nss-3.93.ebuild b/dev-libs/nss/nss-3.93.ebuild
deleted file mode 100644
index e5b28698782c..000000000000
--- a/dev-libs/nss/nss-3.93.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.35"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI 
support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-       cacert? ( 
https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 
cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
-RESTRICT="!test? ( test )"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-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}]
-       virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
-)
-
-src_prepare() {
-       default
-
-       if use cacert ; then
-               eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-       fi
-
-       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
-
-       # Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
-       sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
-
-       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
-               *86*-pc-solaris2*) echo "i86pc"   ;;
-               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)"
-               CCC="$(tc-getCXX)"
-               AR="$(tc-getAR) rc \$@"
-               RANLIB="$(tc-getRANLIB)"
-               OPTIMIZER=
-               ${mybits}
-               disable_ckbi=0
-       )
-
-       # Take care of nspr settings #436216
-       local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-       unset NSPR_INCLUDE_DIR
-
-       export NSS_ALLOW_SSLKEYLOGFILE=1
-       export NSS_ENABLE_WERROR=0 #567158
-       export BUILD_OPT=1
-       export NSS_USE_SYSTEM_SQLITE=1
-       export NSDISTMODE=copy
-       export FREEBL_NO_DEPEND=1
-       export FREEBL_LOWHASH=1
-       export NSS_SEED_ONLY_DEV_URANDOM=1
-       export USE_SYSTEM_ZLIB=1
-       export ZLIB_LIBS=-lz
-       export ASFLAGS=""
-       # Fix build failure on arm64
-       export NS_USE_GCC=1
-       # Detect compiler type and set proper environment value
-       if tc-is-gcc; then
-               export CC_IS_GCC=1
-       elif tc-is-clang; then
-               export CC_IS_CLANG=1
-       fi
-
-       export NSS_DISABLE_GTESTS=$(usex !test 1 0)
-
-       # Include exportable custom settings defined by users, #900915
-       # Two examples uses:
-       #   EXTRA_NSSCONF="MYONESWITCH=1"
-       #   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
-       # e.g.
-       #   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
-       # or
-       #   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
-       # etc.
-       if [[ -n "${EXTRA_NSSCONF}" ]]; then
-               ewarn "EXTRA_NSSCONF applied, please disable custom settings 
before reporting bugs."
-               read -a myextranssconf <<< "${EXTRA_NSSCONF}"
-
-               for (( i=0; i<${#myextranssconf[@]}; i++ )); do
-                       export "${myextranssconf[$i]}"
-                       echo "exported ${myextranssconf[$i]}"
-               done
-       fi
-
-       # explicitly disable altivec/vsx if not requested
-       # https://bugs.gentoo.org/789114
-       case ${ARCH} in
-               ppc*)
-                       use cpu_flags_ppc_altivec || export 
NSS_DISABLE_ALTIVEC=1
-                       use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-                       ;;
-       esac
-
-       use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
-       use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
-
-       local d
-
-       # Build the host tools first.
-       LDFLAGS="${BUILD_LDFLAGS}" \
-       XCFLAGS="${BUILD_CFLAGS}" \
-       NSPR_LIB_DIR="${T}/fakedir" \
-       emake -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 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-multilib_src_test() {
-       einfo "Tests can take a *long* time, especially on a multilib system."
-       einfo "30-45+ minutes per lib configuration. Bug #852755"
-
-       # https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
-       # 
https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
-       # 
https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html 
(older)
-       export BUILD_OPT=1
-       export HOST="localhost"
-       export DOMSUF="localdomain"
-       export USE_IP=TRUE
-       export IP_ADDRESS="127.0.0.1"
-       # Per README, this is recommended to make run tests quicker.
-       export NSS_CYCLES="standard"
-
-       NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
-
-       cd "${BUILD_DIR}"/tests || die
-       # Hack to get current objdir (prefixed dir where built binaries are)
-       # Without this, at least multilib tests go wrong when building the 
amd64 variant
-       # after x86.
-       local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev 
| cut -d/ -f1 | rev)
-
-       # Can tweak to a subset of tests in future if we need to, but would 
prefer not
-       OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" 
./all.sh || die
-}
-
-# 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"
-       local i
-       for i in crmf freebl nssb nssckfw ; do
-               cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying 
libs failed"
-       done
-
-       # 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,api}
-       insinto /usr/include/nss/private
-       doins private/nss/{blapi,alghmac,cmac}.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"
-                       # 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}
-               done
-               popd >/dev/null || die
-       fi
-}
-
-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
-}

diff --git a/dev-libs/nss/nss-3.94.ebuild b/dev-libs/nss/nss-3.94.ebuild
deleted file mode 100644
index ef59d94cde49..000000000000
--- a/dev-libs/nss/nss-3.94.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.35"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI 
support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-       cacert? ( 
https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 
cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
-RESTRICT="!test? ( test )"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-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}]
-       virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/nss-config
-)
-
-PATCHES=(
-       "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-       "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-       "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
-)
-
-src_prepare() {
-       default
-
-       if use cacert ; then
-               eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-       fi
-
-       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
-
-       # Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
-       sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
-
-       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
-               *86*-pc-solaris2*) echo "i86pc"   ;;
-               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)"
-               CCC="$(tc-getCXX)"
-               AR="$(tc-getAR) rc \$@"
-               RANLIB="$(tc-getRANLIB)"
-               OPTIMIZER=
-               ${mybits}
-               disable_ckbi=0
-       )
-
-       # Take care of nspr settings #436216
-       local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-       unset NSPR_INCLUDE_DIR
-
-       export NSS_ALLOW_SSLKEYLOGFILE=1
-       export NSS_ENABLE_WERROR=0 #567158
-       export BUILD_OPT=1
-       export NSS_USE_SYSTEM_SQLITE=1
-       export NSDISTMODE=copy
-       export FREEBL_NO_DEPEND=1
-       export FREEBL_LOWHASH=1
-       export NSS_SEED_ONLY_DEV_URANDOM=1
-       export USE_SYSTEM_ZLIB=1
-       export ZLIB_LIBS=-lz
-       export ASFLAGS=""
-       # Fix build failure on arm64
-       export NS_USE_GCC=1
-       # Detect compiler type and set proper environment value
-       if tc-is-gcc; then
-               export CC_IS_GCC=1
-       elif tc-is-clang; then
-               export CC_IS_CLANG=1
-       fi
-
-       export NSS_DISABLE_GTESTS=$(usex !test 1 0)
-
-       # Include exportable custom settings defined by users, #900915
-       # Two examples uses:
-       #   EXTRA_NSSCONF="MYONESWITCH=1"
-       #   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
-       # e.g.
-       #   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
-       # or
-       #   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
-       # etc.
-       if [[ -n "${EXTRA_NSSCONF}" ]]; then
-               ewarn "EXTRA_NSSCONF applied, please disable custom settings 
before reporting bugs."
-               read -a myextranssconf <<< "${EXTRA_NSSCONF}"
-
-               for (( i=0; i<${#myextranssconf[@]}; i++ )); do
-                       export "${myextranssconf[$i]}"
-                       echo "exported ${myextranssconf[$i]}"
-               done
-       fi
-
-       # explicitly disable altivec/vsx if not requested
-       # https://bugs.gentoo.org/789114
-       case ${ARCH} in
-               ppc*)
-                       use cpu_flags_ppc_altivec || export 
NSS_DISABLE_ALTIVEC=1
-                       use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-                       ;;
-       esac
-
-       use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
-       use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
-
-       local d
-
-       # Build the host tools first.
-       LDFLAGS="${BUILD_LDFLAGS}" \
-       XCFLAGS="${BUILD_CFLAGS}" \
-       NSPR_LIB_DIR="${T}/fakedir" \
-       emake -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 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-       done
-}
-
-multilib_src_test() {
-       einfo "Tests can take a *long* time, especially on a multilib system."
-       einfo "30-45+ minutes per lib configuration. Bug #852755"
-
-       # https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
-       # 
https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
-       # 
https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html 
(older)
-       export BUILD_OPT=1
-       export HOST="localhost"
-       export DOMSUF="localdomain"
-       export USE_IP=TRUE
-       export IP_ADDRESS="127.0.0.1"
-
-       # Only run the standard cycle instead of full, reducing testing time 
from 45 minutes to 15
-       # per lib implementation.
-       export NSS_CYCLES=standard
-
-       NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
-
-       cd "${BUILD_DIR}"/tests || die
-       # Hack to get current objdir (prefixed dir where built binaries are)
-       # Without this, at least multilib tests go wrong when building the 
amd64 variant
-       # after x86.
-       local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev 
| cut -d/ -f1 | rev)
-
-       # Can tweak to a subset of tests in future if we need to, but would 
prefer not
-       OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" 
./all.sh || die
-}
-
-# 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"
-       local i
-       for i in crmf freebl nssb nssckfw ; do
-               cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying 
libs failed"
-       done
-
-       # 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,api}
-       insinto /usr/include/nss/private
-       doins private/nss/{blapi,alghmac,cmac}.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"
-                       # 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}
-               done
-               popd >/dev/null || die
-       fi
-}
-
-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
-}

Reply via email to