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