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