1 |
commit: 22a7f74cd073475de223ab74952c2e4ad0b8f167 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 1 14:11:34 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 1 14:11:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a7f74c |
7 |
|
8 |
dev-libs/nss: bump to v3.69.1 |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-libs/nss/Manifest | 1 + |
14 |
dev-libs/nss/nss-3.69.1.ebuild | 357 +++++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 358 insertions(+) |
16 |
|
17 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
18 |
index fc6e2e47052..3ee3c349398 100644 |
19 |
--- a/dev-libs/nss/Manifest |
20 |
+++ b/dev-libs/nss/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730 |
23 |
DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103 SHA512 be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e |
24 |
+DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 71948a9fee08536c41da9916e6d2eb82bf52bf688c900eb283f83f0ac60498cce2d936950836b0bfb097ee9315860dbbd402a3b63ab28d23b3bd90523b65ead3 SHA512 26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697 |
25 |
DIST nss-3.69.tar.gz 82427268 BLAKE2B 1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe SHA512 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf |
26 |
DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 |
27 |
|
28 |
diff --git a/dev-libs/nss/nss-3.69.1.ebuild b/dev-libs/nss/nss-3.69.1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..2b0b9c2e628 |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/nss/nss-3.69.1.ebuild |
33 |
@@ -0,0 +1,357 @@ |
34 |
+# Copyright 1999-2021 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.32" |
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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
52 |
+IUSE="cacert utils" |
53 |
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND |
54 |
+RDEPEND=" |
55 |
+ >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] |
56 |
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
57 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
58 |
+ virtual/pkgconfig |
59 |
+" |
60 |
+DEPEND="${RDEPEND}" |
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 |
+ local d |
205 |
+ |
206 |
+ # Build the host tools first. |
207 |
+ LDFLAGS="${BUILD_LDFLAGS}" \ |
208 |
+ XCFLAGS="${BUILD_CFLAGS}" \ |
209 |
+ NSPR_LIB_DIR="${T}/fakedir" \ |
210 |
+ emake -j1 -C coreconf \ |
211 |
+ CC="$(tc-getBUILD_CC)" \ |
212 |
+ ${buildbits-${mybits}} |
213 |
+ makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) |
214 |
+ |
215 |
+ # Then build the target tools. |
216 |
+ for d in . lib/dbm ; do |
217 |
+ CPPFLAGS="${myCPPFLAGS}" \ |
218 |
+ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
219 |
+ NSPR_LIB_DIR="${T}/fakedir" \ |
220 |
+ emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)" |
221 |
+ done |
222 |
+} |
223 |
+ |
224 |
+# Altering these 3 libraries breaks the CHK verification. |
225 |
+# All of the following cause it to break: |
226 |
+# - stripping |
227 |
+# - prelink |
228 |
+# - ELF signing |
229 |
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html |
230 |
+# Either we have to NOT strip them, or we have to forcibly resign after |
231 |
+# stripping. |
232 |
+#local_libdir="$(get_libdir)" |
233 |
+#export STRIP_MASK=" |
234 |
+# */${local_libdir}/libfreebl3.so* |
235 |
+# */${local_libdir}/libnssdbm3.so* |
236 |
+# */${local_libdir}/libsoftokn3.so*" |
237 |
+ |
238 |
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" |
239 |
+ |
240 |
+generate_chk() { |
241 |
+ local shlibsign="$1" |
242 |
+ local libdir="$2" |
243 |
+ einfo "Resigning core NSS libraries for FIPS validation" |
244 |
+ shift 2 |
245 |
+ local i |
246 |
+ for i in ${NSS_CHK_SIGN_LIBS} ; do |
247 |
+ local libname=lib${i}.so |
248 |
+ local chkname=lib${i}.chk |
249 |
+ "${shlibsign}" \ |
250 |
+ -i "${libdir}"/${libname} \ |
251 |
+ -o "${libdir}"/${chkname}.tmp \ |
252 |
+ && mv -f \ |
253 |
+ "${libdir}"/${chkname}.tmp \ |
254 |
+ "${libdir}"/${chkname} \ |
255 |
+ || die "Failed to sign ${libname}" |
256 |
+ done |
257 |
+} |
258 |
+ |
259 |
+cleanup_chk() { |
260 |
+ local libdir="$1" |
261 |
+ shift 1 |
262 |
+ local i |
263 |
+ for i in ${NSS_CHK_SIGN_LIBS} ; do |
264 |
+ local libfname="${libdir}/lib${i}.so" |
265 |
+ # If the major version has changed, then we have old chk files. |
266 |
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ |
267 |
+ && rm -f "${libfname}.chk" |
268 |
+ done |
269 |
+} |
270 |
+ |
271 |
+multilib_src_install() { |
272 |
+ pushd dist >/dev/null || die |
273 |
+ |
274 |
+ dodir /usr/$(get_libdir) |
275 |
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" |
276 |
+ local i |
277 |
+ for i in crmf freebl nssb nssckfw ; do |
278 |
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
279 |
+ done |
280 |
+ |
281 |
+ # Install nss-config and pkgconfig file |
282 |
+ dodir /usr/bin |
283 |
+ cp -L */bin/nss-config "${ED}"/usr/bin || die |
284 |
+ dodir /usr/$(get_libdir)/pkgconfig |
285 |
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die |
286 |
+ |
287 |
+ # create an nss-softokn.pc from nss.pc for libfreebl and some private headers |
288 |
+ # bug 517266 |
289 |
+ sed -e 's#Libs:#Libs: -lfreebl#' \ |
290 |
+ -e 's#Cflags:#Cflags: -I${includedir}/private#' \ |
291 |
+ */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ |
292 |
+ || die "could not create nss-softokn.pc" |
293 |
+ |
294 |
+ # all the include files |
295 |
+ insinto /usr/include/nss |
296 |
+ doins public/nss/*.{h,api} |
297 |
+ insinto /usr/include/nss/private |
298 |
+ doins private/nss/{blapi,alghmac,cmac}.h |
299 |
+ |
300 |
+ popd >/dev/null || die |
301 |
+ |
302 |
+ local f nssutils |
303 |
+ # Always enabled because we need it for chk generation. |
304 |
+ nssutils=( shlibsign ) |
305 |
+ |
306 |
+ if multilib_is_native_abi ; then |
307 |
+ if use utils; then |
308 |
+ # The tests we do not need to install. |
309 |
+ #nssutils_test="bltest crmftest dbtest dertimetest |
310 |
+ #fipstest remtest sdrtest" |
311 |
+ # checkcert utils has been removed in nss-3.22: |
312 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 |
313 |
+ # https://hg.mozilla.org/projects/nss/rev/df1729d37870 |
314 |
+ # certcgi has been removed in nss-3.36: |
315 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 |
316 |
+ nssutils+=( |
317 |
+ addbuiltin |
318 |
+ atob |
319 |
+ baddbdir |
320 |
+ btoa |
321 |
+ certutil |
322 |
+ cmsutil |
323 |
+ conflict |
324 |
+ crlutil |
325 |
+ derdump |
326 |
+ digest |
327 |
+ makepqg |
328 |
+ mangle |
329 |
+ modutil |
330 |
+ multinit |
331 |
+ nonspr10 |
332 |
+ ocspclnt |
333 |
+ oidcalc |
334 |
+ p7content |
335 |
+ p7env |
336 |
+ p7sign |
337 |
+ p7verify |
338 |
+ pk11mode |
339 |
+ pk12util |
340 |
+ pp |
341 |
+ rsaperf |
342 |
+ selfserv |
343 |
+ signtool |
344 |
+ signver |
345 |
+ ssltap |
346 |
+ strsclnt |
347 |
+ symkeyutil |
348 |
+ tstclnt |
349 |
+ vfychain |
350 |
+ vfyserv |
351 |
+ ) |
352 |
+ # install man-pages for utils (bug #516810) |
353 |
+ doman doc/nroff/*.1 |
354 |
+ fi |
355 |
+ pushd dist/*/bin >/dev/null || die |
356 |
+ for f in ${nssutils[@]}; do |
357 |
+ dobin ${f} |
358 |
+ done |
359 |
+ popd >/dev/null || die |
360 |
+ fi |
361 |
+ |
362 |
+ # Prelink breaks the CHK files. We don't have any reliable way to run |
363 |
+ # shlibsign after prelink. |
364 |
+ dodir /etc/prelink.conf.d |
365 |
+ printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ |
366 |
+ > "${ED}"/etc/prelink.conf.d/nss.conf |
367 |
+} |
368 |
+ |
369 |
+pkg_postinst() { |
370 |
+ multilib_pkg_postinst() { |
371 |
+ # We must re-sign the libraries AFTER they are stripped. |
372 |
+ local shlibsign="${EROOT}/usr/bin/shlibsign" |
373 |
+ # See if we can execute it (cross-compiling & such). #436216 |
374 |
+ "${shlibsign}" -h >&/dev/null |
375 |
+ if [[ $? -gt 1 ]] ; then |
376 |
+ shlibsign="shlibsign" |
377 |
+ fi |
378 |
+ generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) |
379 |
+ } |
380 |
+ |
381 |
+ multilib_foreach_abi multilib_pkg_postinst |
382 |
+} |
383 |
+ |
384 |
+pkg_postrm() { |
385 |
+ multilib_pkg_postrm() { |
386 |
+ cleanup_chk "${EROOT}"/usr/$(get_libdir) |
387 |
+ } |
388 |
+ |
389 |
+ multilib_foreach_abi multilib_pkg_postrm |
390 |
+} |