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