Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/
Date: Tue, 23 Aug 2022 13:11:27
Message-Id: 1661260279.2b18736862d208e4f29fe4983fa27b8e73134c76.juippis@gentoo
1 commit: 2b18736862d208e4f29fe4983fa27b8e73134c76
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 23 07:45:49 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 23 13:11:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b187368
7
8 dev-libs/nss: drop 3.79-r1
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 dev-libs/nss/Manifest | 1 -
13 dev-libs/nss/nss-3.79-r1.ebuild | 385 ----------------------------------------
14 2 files changed, 386 deletions(-)
15
16 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
17 index 7349ac2f9e29..b6cfb5e98f55 100644
18 --- a/dev-libs/nss/Manifest
19 +++ b/dev-libs/nss/Manifest
20 @@ -1,6 +1,5 @@
21 DIST nss-3.68.4.tar.gz 82409303 BLAKE2B a3cf572e82ce29dbc77e9356e0db425170f7294f1468755843746539663fe486089660e1c1b379d0184003d9ccf57db6cf0b2c161d7038301c1cb5028175b16d SHA512 f97b63a9f8218f8fbd7b5d48c084b8166366d02cd50aac69a22d56324d2fea01c49d074e51430bd128f510c733085f3f43c9739ce4073a07a5666675e0ef3b15
22 DIST nss-3.79.1.tar.gz 84694831 BLAKE2B 209a502ba4b808bb4cb9b8775328fa26e36c55147ee5da7b8f661349129250f09685dd69919e24d7ff72cc55a2e9cbbbc9c059e543cf1b0a6a08e809be262d4c SHA512 e841efe9d0300d99b50e54c159c75df76c09c34c74bbc9b6ca007ad017b2cb91a8d33f6f4195e52bd8f3ed7be5d53f3ce7ce10825fa21abbf5dbba3db109e037
23 -DIST nss-3.79.tar.gz 84830113 BLAKE2B f558592bf0983d3c44f11e079512865d310b4f4c225bcc8e2058cb6a4a721d471c575965a1c2b5d0a130dcf27840da3d7b0ee8aa27fc63791414e22ef7804fa8 SHA512 d3311da3bd0e6907760390221c1307a63d84dd8ad9b85dbfdbf59fe4678341c9856b6f93235731999a1236c98dc0ac66d2dc023eb439cb696f73509dae70c41d
24 DIST nss-3.81.tar.gz 84842767 BLAKE2B 01b6bf96a1507f8f16693b11aec7897c2fd046a97109fe30dcd4dbd53f82247d9809d189d885fded1f9c89e87b4051d2c121003a30e180ba685a95c46d3232fd SHA512 206faa29ff9fc9c70f85cbb86690b55bd11003a1a5b1d49f5f3731fdd1221690f957a17d912ee5272505afb938968327f4532ae8f5d2d77e6e13370768229747
25 DIST nss-3.82.tar.gz 84708994 BLAKE2B 59d3ace416c725933a07c51dc911f2fa11d55b1daddc5252a01ef3ae9df3375cbb199eff92e8e2bb364b9381ad1066c74d4f93c00900847f5234591bbbb29824 SHA512 6e0f28c3f776178ab2d97c6e2436aa10d72c9c2668aea1a6695ccf49e8c3c4cd2d266168508bcb456c655f2e692dceb44eae53c80d50076d7156db3deac70057
26 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
27
28 diff --git a/dev-libs/nss/nss-3.79-r1.ebuild b/dev-libs/nss/nss-3.79-r1.ebuild
29 deleted file mode 100644
30 index 2f82bbb29d11..000000000000
31 --- a/dev-libs/nss/nss-3.79-r1.ebuild
32 +++ /dev/null
33 @@ -1,385 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -inherit flag-o-matic multilib toolchain-funcs multilib-minimal
40 -
41 -NSPR_VER="4.34"
42 -RTM_NAME="NSS_${PV//./_}_RTM"
43 -
44 -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
45 -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
46 -SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
47 - cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
48 -
49 -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
50 -SLOT="0"
51 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
52 -IUSE="cacert test utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
53 -RESTRICT="!test? ( test )"
54 -# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
55 -RDEPEND="
56 - >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
57 - >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
58 - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
59 - virtual/pkgconfig
60 -"
61 -DEPEND="${RDEPEND}"
62 -BDEPEND="dev-lang/perl"
63 -
64 -S="${WORKDIR}/${P}/${PN}"
65 -
66 -MULTILIB_CHOST_TOOLS=(
67 - /usr/bin/nss-config
68 -)
69 -
70 -PATCHES=(
71 - # Custom changes for gentoo
72 - "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
73 - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
74 - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
75 - "${FILESDIR}/${PN}-3.79-gcc-13.patch"
76 -)
77 -
78 -src_prepare() {
79 - default
80 -
81 - if use cacert ; then
82 - eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
83 - fi
84 -
85 - pushd coreconf >/dev/null || die
86 - # hack nspr paths
87 - echo 'INCLUDES += -I$(DIST)/include/dbm' \
88 - >> headers.mk || die "failed to append include"
89 -
90 - # modify install path
91 - sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
92 - -i source.mk || die
93 -
94 - # Respect LDFLAGS
95 - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
96 - popd >/dev/null || die
97 -
98 - # Fix pkgconfig file for Prefix
99 - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
100 - config/Makefile || die
101 -
102 - # use host shlibsign if need be #436216
103 - if tc-is-cross-compiler ; then
104 - sed -i \
105 - -e 's:"${2}"/shlibsign:shlibsign:' \
106 - cmd/shlibsign/sign.sh || die
107 - fi
108 -
109 - # dirty hack
110 - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
111 - lib/ssl/config.mk || die
112 - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
113 - cmd/platlibs.mk || die
114 -
115 - multilib_copy_sources
116 -
117 - strip-flags
118 -}
119 -
120 -multilib_src_configure() {
121 - # Ensure we stay multilib aware
122 - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
123 -}
124 -
125 -nssarch() {
126 - # Most of the arches are the same as $ARCH
127 - local t=${1:-${CHOST}}
128 - case ${t} in
129 - *86*-pc-solaris2*) echo "i86pc" ;;
130 - aarch64*) echo "aarch64" ;;
131 - hppa*) echo "parisc" ;;
132 - i?86*) echo "i686" ;;
133 - x86_64*) echo "x86_64" ;;
134 - *) tc-arch ${t} ;;
135 - esac
136 -}
137 -
138 -nssbits() {
139 - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
140 - if [[ ${1} == BUILD_ ]]; then
141 - cc=$(tc-getBUILD_CC)
142 - else
143 - cc=$(tc-getCC)
144 - fi
145 - echo > "${T}"/test.c || die
146 - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
147 - case $(file "${T}/${1}test.o") in
148 - *32-bit*x86-64*) echo USE_X32=1;;
149 - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
150 - *32-bit*|*ppc*|*i386*) ;;
151 - *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
152 - esac
153 -}
154 -
155 -multilib_src_compile() {
156 - # use ABI to determine bit'ness, or fallback if unset
157 - local buildbits mybits
158 - case "${ABI}" in
159 - n32) mybits="USE_N32=1";;
160 - x32) mybits="USE_X32=1";;
161 - s390x|*64) mybits="USE_64=1";;
162 - ${DEFAULT_ABI})
163 - einfo "Running compilation test to determine bit'ness"
164 - mybits=$(nssbits)
165 - ;;
166 - esac
167 - # bitness of host may differ from target
168 - if tc-is-cross-compiler; then
169 - buildbits=$(nssbits BUILD_)
170 - fi
171 -
172 - local makeargs=(
173 - CC="$(tc-getCC)"
174 - CCC="$(tc-getCXX)"
175 - AR="$(tc-getAR) rc \$@"
176 - RANLIB="$(tc-getRANLIB)"
177 - OPTIMIZER=
178 - ${mybits}
179 - )
180 -
181 - # Take care of nspr settings #436216
182 - local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
183 - unset NSPR_INCLUDE_DIR
184 -
185 - export NSS_ALLOW_SSLKEYLOGFILE=1
186 - export NSS_ENABLE_WERROR=0 #567158
187 - export BUILD_OPT=1
188 - export NSS_USE_SYSTEM_SQLITE=1
189 - export NSDISTMODE=copy
190 - export FREEBL_NO_DEPEND=1
191 - export FREEBL_LOWHASH=1
192 - export NSS_SEED_ONLY_DEV_URANDOM=1
193 - export USE_SYSTEM_ZLIB=1
194 - export ZLIB_LIBS=-lz
195 - export ASFLAGS=""
196 - # Fix build failure on arm64
197 - export NS_USE_GCC=1
198 - # Detect compiler type and set proper environment value
199 - if tc-is-gcc; then
200 - export CC_IS_GCC=1
201 - elif tc-is-clang; then
202 - export CC_IS_CLANG=1
203 - fi
204 -
205 - export NSS_DISABLE_GTESTS=$(usex !test 1 0)
206 -
207 - # explicitly disable altivec/vsx if not requested
208 - # https://bugs.gentoo.org/789114
209 - case ${ARCH} in
210 - ppc*)
211 - use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
212 - use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
213 - ;;
214 - esac
215 -
216 - local d
217 -
218 - # Build the host tools first.
219 - LDFLAGS="${BUILD_LDFLAGS}" \
220 - XCFLAGS="${BUILD_CFLAGS}" \
221 - NSPR_LIB_DIR="${T}/fakedir" \
222 - emake -C coreconf \
223 - CC="$(tc-getBUILD_CC)" \
224 - ${buildbits-${mybits}}
225 - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
226 -
227 - # Then build the target tools.
228 - for d in . lib/dbm ; do
229 - CPPFLAGS="${myCPPFLAGS}" \
230 - XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
231 - NSPR_LIB_DIR="${T}/fakedir" \
232 - emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
233 - done
234 -}
235 -
236 -multilib_src_test() {
237 - # https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
238 - # https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
239 - # https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
240 - export BUILD_OPT=1
241 - export HOST="localhost"
242 - export DOMSUF="localdomain"
243 - export USE_IP=TRUE
244 - export IP_ADDRESS="127.0.0.1"
245 -
246 - NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
247 -
248 - cd "${BUILD_DIR}"/tests || die
249 - # Hack to get current objdir (prefixed dir where built binaries are)
250 - # Without this, at least multilib tests go wrong when building the amd64 variant
251 - # after x86.
252 - local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
253 -
254 - # Can tweak to a subset of tests in future if we need to, but would prefer not
255 - OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
256 -}
257 -
258 -# Altering these 3 libraries breaks the CHK verification.
259 -# All of the following cause it to break:
260 -# - stripping
261 -# - prelink
262 -# - ELF signing
263 -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
264 -# Either we have to NOT strip them, or we have to forcibly resign after
265 -# stripping.
266 -#local_libdir="$(get_libdir)"
267 -#export STRIP_MASK="
268 -# */${local_libdir}/libfreebl3.so*
269 -# */${local_libdir}/libnssdbm3.so*
270 -# */${local_libdir}/libsoftokn3.so*"
271 -
272 -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
273 -
274 -generate_chk() {
275 - local shlibsign="$1"
276 - local libdir="$2"
277 - einfo "Resigning core NSS libraries for FIPS validation"
278 - shift 2
279 - local i
280 - for i in ${NSS_CHK_SIGN_LIBS} ; do
281 - local libname=lib${i}.so
282 - local chkname=lib${i}.chk
283 - "${shlibsign}" \
284 - -i "${libdir}"/${libname} \
285 - -o "${libdir}"/${chkname}.tmp \
286 - && mv -f \
287 - "${libdir}"/${chkname}.tmp \
288 - "${libdir}"/${chkname} \
289 - || die "Failed to sign ${libname}"
290 - done
291 -}
292 -
293 -cleanup_chk() {
294 - local libdir="$1"
295 - shift 1
296 - local i
297 - for i in ${NSS_CHK_SIGN_LIBS} ; do
298 - local libfname="${libdir}/lib${i}.so"
299 - # If the major version has changed, then we have old chk files.
300 - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
301 - && rm -f "${libfname}.chk"
302 - done
303 -}
304 -
305 -multilib_src_install() {
306 - pushd dist >/dev/null || die
307 -
308 - dodir /usr/$(get_libdir)
309 - cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
310 - local i
311 - for i in crmf freebl nssb nssckfw ; do
312 - cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
313 - done
314 -
315 - # Install nss-config and pkgconfig file
316 - dodir /usr/bin
317 - cp -L */bin/nss-config "${ED}"/usr/bin || die
318 - dodir /usr/$(get_libdir)/pkgconfig
319 - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
320 -
321 - # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
322 - # bug 517266
323 - sed -e 's#Libs:#Libs: -lfreebl#' \
324 - -e 's#Cflags:#Cflags: -I${includedir}/private#' \
325 - */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
326 - || die "could not create nss-softokn.pc"
327 -
328 - # all the include files
329 - insinto /usr/include/nss
330 - doins public/nss/*.{h,api}
331 - insinto /usr/include/nss/private
332 - doins private/nss/{blapi,alghmac,cmac}.h
333 -
334 - popd >/dev/null || die
335 -
336 - local f nssutils
337 - # Always enabled because we need it for chk generation.
338 - nssutils=( shlibsign )
339 -
340 - if multilib_is_native_abi ; then
341 - if use utils; then
342 - # The tests we do not need to install.
343 - #nssutils_test="bltest crmftest dbtest dertimetest
344 - #fipstest remtest sdrtest"
345 - # checkcert utils has been removed in nss-3.22:
346 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
347 - # https://hg.mozilla.org/projects/nss/rev/df1729d37870
348 - # certcgi has been removed in nss-3.36:
349 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
350 - nssutils+=(
351 - addbuiltin
352 - atob
353 - baddbdir
354 - btoa
355 - certutil
356 - cmsutil
357 - conflict
358 - crlutil
359 - derdump
360 - digest
361 - makepqg
362 - mangle
363 - modutil
364 - multinit
365 - nonspr10
366 - ocspclnt
367 - oidcalc
368 - p7content
369 - p7env
370 - p7sign
371 - p7verify
372 - pk11mode
373 - pk12util
374 - pp
375 - rsaperf
376 - selfserv
377 - signtool
378 - signver
379 - ssltap
380 - strsclnt
381 - symkeyutil
382 - tstclnt
383 - vfychain
384 - vfyserv
385 - )
386 - # install man-pages for utils (bug #516810)
387 - doman doc/nroff/*.1
388 - fi
389 - pushd dist/*/bin >/dev/null || die
390 - for f in ${nssutils[@]}; do
391 - dobin ${f}
392 - done
393 - popd >/dev/null || die
394 - fi
395 -}
396 -
397 -pkg_postinst() {
398 - multilib_pkg_postinst() {
399 - # We must re-sign the libraries AFTER they are stripped.
400 - local shlibsign="${EROOT}/usr/bin/shlibsign"
401 - # See if we can execute it (cross-compiling & such). #436216
402 - "${shlibsign}" -h >&/dev/null
403 - if [[ $? -gt 1 ]] ; then
404 - shlibsign="shlibsign"
405 - fi
406 - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
407 - }
408 -
409 - multilib_foreach_abi multilib_pkg_postinst
410 -}
411 -
412 -pkg_postrm() {
413 - multilib_pkg_postrm() {
414 - cleanup_chk "${EROOT}"/usr/$(get_libdir)
415 - }
416 -
417 - multilib_foreach_abi multilib_pkg_postrm
418 -}