1 |
commit: 7c069960016136f3e6d856250584b0bda4b318c6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 09:59:39 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 10:02:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c069960 |
7 |
|
8 |
dev-libs/nss: Bump to version 3.54 |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/nss/Manifest | 1 + |
14 |
dev-libs/nss/nss-3.54.ebuild | 351 +++++++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 352 insertions(+) |
16 |
|
17 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
18 |
index 809bdb00ebb..673342d8225 100644 |
19 |
--- a/dev-libs/nss/Manifest |
20 |
+++ b/dev-libs/nss/Manifest |
21 |
@@ -3,4 +3,5 @@ DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0 |
22 |
DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6 |
23 |
DIST nss-3.52.tar.gz 81220587 BLAKE2B 0208c9047c61233ed36f02d57fdc64fa1734ef69d17fa499707f4a3b14a2e880b1dcf4b19b17a38e9b41d2e46b4a9488613d82989be747ad82aebc35b8e491af SHA512 a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6 |
24 |
DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0 |
25 |
+DIST nss-3.54.tar.gz 81190188 BLAKE2B bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2 SHA512 9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b |
26 |
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 |
27 |
|
28 |
diff --git a/dev-libs/nss/nss-3.54.ebuild b/dev-libs/nss/nss-3.54.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..d94d193dbe9 |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/nss/nss-3.54.ebuild |
33 |
@@ -0,0 +1,351 @@ |
34 |
+# Copyright 1999-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal |
40 |
+ |
41 |
+NSPR_VER="4.25" |
42 |
+RTM_NAME="NSS_${PV//./_}_RTM" |
43 |
+ |
44 |
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" |
45 |
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" |
46 |
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz |
47 |
+ cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~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 |
+ "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch" |
76 |
+) |
77 |
+ |
78 |
+src_prepare() { |
79 |
+ if use cacert ; then #521462 |
80 |
+ PATCHES+=( |
81 |
+ "${DISTDIR}/${PN}-cacert-class1-class3.patch" |
82 |
+ ) |
83 |
+ fi |
84 |
+ |
85 |
+ default |
86 |
+ |
87 |
+ pushd coreconf >/dev/null || die |
88 |
+ # hack nspr paths |
89 |
+ echo 'INCLUDES += -I$(DIST)/include/dbm' \ |
90 |
+ >> headers.mk || die "failed to append include" |
91 |
+ |
92 |
+ # modify install path |
93 |
+ sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
94 |
+ -i source.mk || die |
95 |
+ |
96 |
+ # Respect LDFLAGS |
97 |
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk |
98 |
+ popd >/dev/null || die |
99 |
+ |
100 |
+ # Fix pkgconfig file for Prefix |
101 |
+ sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ |
102 |
+ config/Makefile || die |
103 |
+ |
104 |
+ # use host shlibsign if need be #436216 |
105 |
+ if tc-is-cross-compiler ; then |
106 |
+ sed -i \ |
107 |
+ -e 's:"${2}"/shlibsign:shlibsign:' \ |
108 |
+ cmd/shlibsign/sign.sh || die |
109 |
+ fi |
110 |
+ |
111 |
+ # dirty hack |
112 |
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ |
113 |
+ lib/ssl/config.mk || die |
114 |
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ |
115 |
+ cmd/platlibs.mk || die |
116 |
+ |
117 |
+ multilib_copy_sources |
118 |
+ |
119 |
+ strip-flags |
120 |
+} |
121 |
+ |
122 |
+multilib_src_configure() { |
123 |
+ # Ensure we stay multilib aware |
124 |
+ sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die |
125 |
+} |
126 |
+ |
127 |
+nssarch() { |
128 |
+ # Most of the arches are the same as $ARCH |
129 |
+ local t=${1:-${CHOST}} |
130 |
+ case ${t} in |
131 |
+ aarch64*)echo "aarch64";; |
132 |
+ hppa*) echo "parisc";; |
133 |
+ i?86*) echo "i686";; |
134 |
+ x86_64*) echo "x86_64";; |
135 |
+ *) tc-arch ${t};; |
136 |
+ esac |
137 |
+} |
138 |
+ |
139 |
+nssbits() { |
140 |
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" |
141 |
+ if [[ ${1} == BUILD_ ]]; then |
142 |
+ cc=$(tc-getBUILD_CC) |
143 |
+ else |
144 |
+ cc=$(tc-getCC) |
145 |
+ fi |
146 |
+ echo > "${T}"/test.c || die |
147 |
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die |
148 |
+ case $(file "${T}/${1}test.o") in |
149 |
+ *32-bit*x86-64*) echo USE_X32=1;; |
150 |
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; |
151 |
+ *32-bit*|*ppc*|*i386*) ;; |
152 |
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; |
153 |
+ esac |
154 |
+} |
155 |
+ |
156 |
+multilib_src_compile() { |
157 |
+ # use ABI to determine bit'ness, or fallback if unset |
158 |
+ local buildbits mybits |
159 |
+ case "${ABI}" in |
160 |
+ n32) mybits="USE_N32=1";; |
161 |
+ x32) mybits="USE_X32=1";; |
162 |
+ s390x|*64) mybits="USE_64=1";; |
163 |
+ ${DEFAULT_ABI}) |
164 |
+ einfo "Running compilation test to determine bit'ness" |
165 |
+ mybits=$(nssbits) |
166 |
+ ;; |
167 |
+ esac |
168 |
+ # bitness of host may differ from target |
169 |
+ if tc-is-cross-compiler; then |
170 |
+ buildbits=$(nssbits BUILD_) |
171 |
+ fi |
172 |
+ |
173 |
+ local makeargs=( |
174 |
+ CC="$(tc-getCC)" |
175 |
+ CCC="$(tc-getCXX)" |
176 |
+ AR="$(tc-getAR) rc \$@" |
177 |
+ RANLIB="$(tc-getRANLIB)" |
178 |
+ OPTIMIZER= |
179 |
+ ${mybits} |
180 |
+ ) |
181 |
+ |
182 |
+ # Take care of nspr settings #436216 |
183 |
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" |
184 |
+ unset NSPR_INCLUDE_DIR |
185 |
+ |
186 |
+ export NSS_ALLOW_SSLKEYLOGFILE=1 |
187 |
+ export NSS_ENABLE_WERROR=0 #567158 |
188 |
+ export BUILD_OPT=1 |
189 |
+ export NSS_USE_SYSTEM_SQLITE=1 |
190 |
+ export NSDISTMODE=copy |
191 |
+ export FREEBL_NO_DEPEND=1 |
192 |
+ export FREEBL_LOWHASH=1 |
193 |
+ export NSS_SEED_ONLY_DEV_URANDOM=1 |
194 |
+ export USE_SYSTEM_ZLIB=1 |
195 |
+ export ZLIB_LIBS=-lz |
196 |
+ export ASFLAGS="" |
197 |
+ |
198 |
+ local d |
199 |
+ |
200 |
+ # Build the host tools first. |
201 |
+ LDFLAGS="${BUILD_LDFLAGS}" \ |
202 |
+ XCFLAGS="${BUILD_CFLAGS}" \ |
203 |
+ NSPR_LIB_DIR="${T}/fakedir" \ |
204 |
+ emake -j1 -C coreconf \ |
205 |
+ CC="$(tc-getBUILD_CC)" \ |
206 |
+ ${buildbits-${mybits}} |
207 |
+ makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) |
208 |
+ |
209 |
+ # Then build the target tools. |
210 |
+ for d in . lib/dbm ; do |
211 |
+ CPPFLAGS="${myCPPFLAGS}" \ |
212 |
+ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
213 |
+ NSPR_LIB_DIR="${T}/fakedir" \ |
214 |
+ emake -j1 "${makeargs[@]}" -C ${d} |
215 |
+ done |
216 |
+} |
217 |
+ |
218 |
+# Altering these 3 libraries breaks the CHK verification. |
219 |
+# All of the following cause it to break: |
220 |
+# - stripping |
221 |
+# - prelink |
222 |
+# - ELF signing |
223 |
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html |
224 |
+# Either we have to NOT strip them, or we have to forcibly resign after |
225 |
+# stripping. |
226 |
+#local_libdir="$(get_libdir)" |
227 |
+#export STRIP_MASK=" |
228 |
+# */${local_libdir}/libfreebl3.so* |
229 |
+# */${local_libdir}/libnssdbm3.so* |
230 |
+# */${local_libdir}/libsoftokn3.so*" |
231 |
+ |
232 |
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" |
233 |
+ |
234 |
+generate_chk() { |
235 |
+ local shlibsign="$1" |
236 |
+ local libdir="$2" |
237 |
+ einfo "Resigning core NSS libraries for FIPS validation" |
238 |
+ shift 2 |
239 |
+ local i |
240 |
+ for i in ${NSS_CHK_SIGN_LIBS} ; do |
241 |
+ local libname=lib${i}.so |
242 |
+ local chkname=lib${i}.chk |
243 |
+ "${shlibsign}" \ |
244 |
+ -i "${libdir}"/${libname} \ |
245 |
+ -o "${libdir}"/${chkname}.tmp \ |
246 |
+ && mv -f \ |
247 |
+ "${libdir}"/${chkname}.tmp \ |
248 |
+ "${libdir}"/${chkname} \ |
249 |
+ || die "Failed to sign ${libname}" |
250 |
+ done |
251 |
+} |
252 |
+ |
253 |
+cleanup_chk() { |
254 |
+ local libdir="$1" |
255 |
+ shift 1 |
256 |
+ local i |
257 |
+ for i in ${NSS_CHK_SIGN_LIBS} ; do |
258 |
+ local libfname="${libdir}/lib${i}.so" |
259 |
+ # If the major version has changed, then we have old chk files. |
260 |
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ |
261 |
+ && rm -f "${libfname}.chk" |
262 |
+ done |
263 |
+} |
264 |
+ |
265 |
+multilib_src_install() { |
266 |
+ pushd dist >/dev/null || die |
267 |
+ |
268 |
+ dodir /usr/$(get_libdir) |
269 |
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" |
270 |
+ local i |
271 |
+ for i in crmf freebl nssb nssckfw ; do |
272 |
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
273 |
+ done |
274 |
+ |
275 |
+ # Install nss-config and pkgconfig file |
276 |
+ dodir /usr/bin |
277 |
+ cp -L */bin/nss-config "${ED}"/usr/bin || die |
278 |
+ dodir /usr/$(get_libdir)/pkgconfig |
279 |
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die |
280 |
+ |
281 |
+ # create an nss-softokn.pc from nss.pc for libfreebl and some private headers |
282 |
+ # bug 517266 |
283 |
+ sed -e 's#Libs:#Libs: -lfreebl#' \ |
284 |
+ -e 's#Cflags:#Cflags: -I${includedir}/private#' \ |
285 |
+ */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ |
286 |
+ || die "could not create nss-softokn.pc" |
287 |
+ |
288 |
+ # all the include files |
289 |
+ insinto /usr/include/nss |
290 |
+ doins public/nss/*.{h,api} |
291 |
+ insinto /usr/include/nss/private |
292 |
+ doins private/nss/{blapi,alghmac,cmac}.h |
293 |
+ |
294 |
+ popd >/dev/null || die |
295 |
+ |
296 |
+ local f nssutils |
297 |
+ # Always enabled because we need it for chk generation. |
298 |
+ nssutils=( shlibsign ) |
299 |
+ |
300 |
+ if multilib_is_native_abi ; then |
301 |
+ if use utils; then |
302 |
+ # The tests we do not need to install. |
303 |
+ #nssutils_test="bltest crmftest dbtest dertimetest |
304 |
+ #fipstest remtest sdrtest" |
305 |
+ # checkcert utils has been removed in nss-3.22: |
306 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 |
307 |
+ # https://hg.mozilla.org/projects/nss/rev/df1729d37870 |
308 |
+ # certcgi has been removed in nss-3.36: |
309 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 |
310 |
+ nssutils+=( |
311 |
+ addbuiltin |
312 |
+ atob |
313 |
+ baddbdir |
314 |
+ btoa |
315 |
+ certutil |
316 |
+ cmsutil |
317 |
+ conflict |
318 |
+ crlutil |
319 |
+ derdump |
320 |
+ digest |
321 |
+ makepqg |
322 |
+ mangle |
323 |
+ modutil |
324 |
+ multinit |
325 |
+ nonspr10 |
326 |
+ ocspclnt |
327 |
+ oidcalc |
328 |
+ p7content |
329 |
+ p7env |
330 |
+ p7sign |
331 |
+ p7verify |
332 |
+ pk11mode |
333 |
+ pk12util |
334 |
+ pp |
335 |
+ rsaperf |
336 |
+ selfserv |
337 |
+ signtool |
338 |
+ signver |
339 |
+ ssltap |
340 |
+ strsclnt |
341 |
+ symkeyutil |
342 |
+ tstclnt |
343 |
+ vfychain |
344 |
+ vfyserv |
345 |
+ ) |
346 |
+ # install man-pages for utils (bug #516810) |
347 |
+ doman doc/nroff/*.1 |
348 |
+ fi |
349 |
+ pushd dist/*/bin >/dev/null || die |
350 |
+ for f in ${nssutils[@]}; do |
351 |
+ dobin ${f} |
352 |
+ done |
353 |
+ popd >/dev/null || die |
354 |
+ fi |
355 |
+ |
356 |
+ # Prelink breaks the CHK files. We don't have any reliable way to run |
357 |
+ # shlibsign after prelink. |
358 |
+ dodir /etc/prelink.conf.d |
359 |
+ printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ |
360 |
+ > "${ED}"/etc/prelink.conf.d/nss.conf |
361 |
+} |
362 |
+ |
363 |
+pkg_postinst() { |
364 |
+ multilib_pkg_postinst() { |
365 |
+ # We must re-sign the libraries AFTER they are stripped. |
366 |
+ local shlibsign="${EROOT}/usr/bin/shlibsign" |
367 |
+ # See if we can execute it (cross-compiling & such). #436216 |
368 |
+ "${shlibsign}" -h >&/dev/null |
369 |
+ if [[ $? -gt 1 ]] ; then |
370 |
+ shlibsign="shlibsign" |
371 |
+ fi |
372 |
+ generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) |
373 |
+ } |
374 |
+ |
375 |
+ multilib_foreach_abi multilib_pkg_postinst |
376 |
+} |
377 |
+ |
378 |
+pkg_postrm() { |
379 |
+ multilib_pkg_postrm() { |
380 |
+ cleanup_chk "${EROOT}"/usr/$(get_libdir) |
381 |
+ } |
382 |
+ |
383 |
+ multilib_foreach_abi multilib_pkg_postrm |
384 |
+} |