Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/
Date: Sat, 08 Jan 2022 17:13:33
Message-Id: 1641661994.28113e379a42a5e50ca8651776445224014be8a0.polynomial-c@gentoo
1 commit: 28113e379a42a5e50ca8651776445224014be8a0
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 8 16:59:36 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 8 17:13:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28113e37
7
8 dev-libs/nss: Bump to version 3.74
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 dev-libs/nss/Manifest | 1 +
13 dev-libs/nss/nss-3.74.ebuild | 367 +++++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 368 insertions(+)
15
16 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
17 index e488378e443d..8fc42c03a5a1 100644
18 --- a/dev-libs/nss/Manifest
19 +++ b/dev-libs/nss/Manifest
20 @@ -4,4 +4,5 @@ DIST nss-3.72.1.tar.gz 83929867 BLAKE2B 8be49eef0c1845a65da61829798d119b6b88b5aa
21 DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511 SHA512 1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
22 DIST nss-3.73.1.tar.gz 83931597 BLAKE2B 590e3c9c5262f4ca0d9137905ce396ddc81f722fabbb54f235eb1bab344d9b7913b0be8d4ddf99fef34d45ed0102e8b7b571764eefe055eefe6bb487c22bafbe SHA512 4cca26cb430f1c167ce7c3a2654c1315938c73bbd425c89d4e636a966fd052724499f34affc5764ec680eeaa080892caab28ef00fe21992421c739f7623cf071
23 DIST nss-3.73.tar.gz 83928905 BLAKE2B 64c95a04c366dc3d57c42ddb105b3afe5b4b579b3fdb554ffa684f74f5c203b136213a1a67a554756be605722ac03c15cee766afba6edf2c7c0b2162a8181ec5 SHA512 84b6e4ce8838f77674a5587cd227fa103c80f1b36c8bfb9b60a175157f131e59153c79ee77b29feffa57f49b217a90a8a091ee368eb0bc03312894e386a4c01b
24 +DIST nss-3.74.tar.gz 83937875 BLAKE2B 55881f0e78e0ccc9b246c4323f6f2a5f7a84cb5e57aa3902d3d5a4068ec0be6f2669a9da11377b86d11d2ce400c2e73a6132fd4e490a04aad96be399110edbea SHA512 6fb322b64a5b42e5e22e803c8985986240d2990849d576cfc4b94cdc5c4ab27f683ebc4e1cf5e0ad16c636fc32debb24ec3b2d02d5baedc8fbaedec79c908226
25 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
26
27 diff --git a/dev-libs/nss/nss-3.74.ebuild b/dev-libs/nss/nss-3.74.ebuild
28 new file mode 100644
29 index 000000000000..df96481cbb3d
30 --- /dev/null
31 +++ b/dev-libs/nss/nss-3.74.ebuild
32 @@ -0,0 +1,367 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +inherit flag-o-matic multilib toolchain-funcs multilib-minimal
39 +
40 +NSPR_VER="4.32"
41 +RTM_NAME="NSS_${PV//./_}_RTM"
42 +
43 +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
44 +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
45 +SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
46 + cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
47 +
48 +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
49 +SLOT="0"
50 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
51 +IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
52 +# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
53 +RDEPEND="
54 + >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
55 + >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
56 + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
57 + virtual/pkgconfig
58 +"
59 +DEPEND="${RDEPEND}"
60 +BDEPEND="dev-lang/perl"
61 +
62 +RESTRICT="test"
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 +)
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 + OPTIMIZER=
177 + ${mybits}
178 + )
179 +
180 + # Take care of nspr settings #436216
181 + local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
182 + unset NSPR_INCLUDE_DIR
183 +
184 + export NSS_ALLOW_SSLKEYLOGFILE=1
185 + export NSS_ENABLE_WERROR=0 #567158
186 + export BUILD_OPT=1
187 + export NSS_USE_SYSTEM_SQLITE=1
188 + export NSDISTMODE=copy
189 + export FREEBL_NO_DEPEND=1
190 + export FREEBL_LOWHASH=1
191 + export NSS_SEED_ONLY_DEV_URANDOM=1
192 + export USE_SYSTEM_ZLIB=1
193 + export ZLIB_LIBS=-lz
194 + export ASFLAGS=""
195 + # Fix build failure on arm64
196 + export NS_USE_GCC=1
197 + # Detect compiler type and set proper environment value
198 + if tc-is-gcc; then
199 + export CC_IS_GCC=1
200 + elif tc-is-clang; then
201 + export CC_IS_CLANG=1
202 + fi
203 +
204 + # explicitly disable altivec/vsx if not requested
205 + # https://bugs.gentoo.org/789114
206 + case ${ARCH} in
207 + ppc*)
208 + use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
209 + use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
210 + ;;
211 + esac
212 +
213 + local d
214 +
215 + # Build the host tools first.
216 + LDFLAGS="${BUILD_LDFLAGS}" \
217 + XCFLAGS="${BUILD_CFLAGS}" \
218 + NSPR_LIB_DIR="${T}/fakedir" \
219 + emake -j1 -C coreconf \
220 + CC="$(tc-getBUILD_CC)" \
221 + ${buildbits-${mybits}}
222 + makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
223 +
224 + # Then build the target tools.
225 + for d in . lib/dbm ; do
226 + CPPFLAGS="${myCPPFLAGS}" \
227 + XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
228 + NSPR_LIB_DIR="${T}/fakedir" \
229 + emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
230 + done
231 +}
232 +
233 +# Altering these 3 libraries breaks the CHK verification.
234 +# All of the following cause it to break:
235 +# - stripping
236 +# - prelink
237 +# - ELF signing
238 +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
239 +# Either we have to NOT strip them, or we have to forcibly resign after
240 +# stripping.
241 +#local_libdir="$(get_libdir)"
242 +#export STRIP_MASK="
243 +# */${local_libdir}/libfreebl3.so*
244 +# */${local_libdir}/libnssdbm3.so*
245 +# */${local_libdir}/libsoftokn3.so*"
246 +
247 +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
248 +
249 +generate_chk() {
250 + local shlibsign="$1"
251 + local libdir="$2"
252 + einfo "Resigning core NSS libraries for FIPS validation"
253 + shift 2
254 + local i
255 + for i in ${NSS_CHK_SIGN_LIBS} ; do
256 + local libname=lib${i}.so
257 + local chkname=lib${i}.chk
258 + "${shlibsign}" \
259 + -i "${libdir}"/${libname} \
260 + -o "${libdir}"/${chkname}.tmp \
261 + && mv -f \
262 + "${libdir}"/${chkname}.tmp \
263 + "${libdir}"/${chkname} \
264 + || die "Failed to sign ${libname}"
265 + done
266 +}
267 +
268 +cleanup_chk() {
269 + local libdir="$1"
270 + shift 1
271 + local i
272 + for i in ${NSS_CHK_SIGN_LIBS} ; do
273 + local libfname="${libdir}/lib${i}.so"
274 + # If the major version has changed, then we have old chk files.
275 + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
276 + && rm -f "${libfname}.chk"
277 + done
278 +}
279 +
280 +multilib_src_install() {
281 + pushd dist >/dev/null || die
282 +
283 + dodir /usr/$(get_libdir)
284 + cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
285 + local i
286 + for i in crmf freebl nssb nssckfw ; do
287 + cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
288 + done
289 +
290 + # Install nss-config and pkgconfig file
291 + dodir /usr/bin
292 + cp -L */bin/nss-config "${ED}"/usr/bin || die
293 + dodir /usr/$(get_libdir)/pkgconfig
294 + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
295 +
296 + # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
297 + # bug 517266
298 + sed -e 's#Libs:#Libs: -lfreebl#' \
299 + -e 's#Cflags:#Cflags: -I${includedir}/private#' \
300 + */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
301 + || die "could not create nss-softokn.pc"
302 +
303 + # all the include files
304 + insinto /usr/include/nss
305 + doins public/nss/*.{h,api}
306 + insinto /usr/include/nss/private
307 + doins private/nss/{blapi,alghmac,cmac}.h
308 +
309 + popd >/dev/null || die
310 +
311 + local f nssutils
312 + # Always enabled because we need it for chk generation.
313 + nssutils=( shlibsign )
314 +
315 + if multilib_is_native_abi ; then
316 + if use utils; then
317 + # The tests we do not need to install.
318 + #nssutils_test="bltest crmftest dbtest dertimetest
319 + #fipstest remtest sdrtest"
320 + # checkcert utils has been removed in nss-3.22:
321 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
322 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870
323 + # certcgi has been removed in nss-3.36:
324 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
325 + nssutils+=(
326 + addbuiltin
327 + atob
328 + baddbdir
329 + btoa
330 + certutil
331 + cmsutil
332 + conflict
333 + crlutil
334 + derdump
335 + digest
336 + makepqg
337 + mangle
338 + modutil
339 + multinit
340 + nonspr10
341 + ocspclnt
342 + oidcalc
343 + p7content
344 + p7env
345 + p7sign
346 + p7verify
347 + pk11mode
348 + pk12util
349 + pp
350 + rsaperf
351 + selfserv
352 + signtool
353 + signver
354 + ssltap
355 + strsclnt
356 + symkeyutil
357 + tstclnt
358 + vfychain
359 + vfyserv
360 + )
361 + # install man-pages for utils (bug #516810)
362 + doman doc/nroff/*.1
363 + fi
364 + pushd dist/*/bin >/dev/null || die
365 + for f in ${nssutils[@]}; do
366 + dobin ${f}
367 + done
368 + popd >/dev/null || die
369 + fi
370 +
371 + # Prelink breaks the CHK files. We don't have any reliable way to run
372 + # shlibsign after prelink.
373 + dodir /etc/prelink.conf.d
374 + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
375 + > "${ED}"/etc/prelink.conf.d/nss.conf
376 +}
377 +
378 +pkg_postinst() {
379 + multilib_pkg_postinst() {
380 + # We must re-sign the libraries AFTER they are stripped.
381 + local shlibsign="${EROOT}/usr/bin/shlibsign"
382 + # See if we can execute it (cross-compiling & such). #436216
383 + "${shlibsign}" -h >&/dev/null
384 + if [[ $? -gt 1 ]] ; then
385 + shlibsign="shlibsign"
386 + fi
387 + generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
388 + }
389 +
390 + multilib_foreach_abi multilib_pkg_postinst
391 +}
392 +
393 +pkg_postrm() {
394 + multilib_pkg_postrm() {
395 + cleanup_chk "${EROOT}"/usr/$(get_libdir)
396 + }
397 +
398 + multilib_foreach_abi multilib_pkg_postrm
399 +}