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