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