Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/
Date: Thu, 21 Sep 2017 22:26:53
Message-Id: 1506032787.400e3f36fd647e71f52b9d74702ce576ab8f7a11.polynomial-c@gentoo
1 commit: 400e3f36fd647e71f52b9d74702ce576ab8f7a11
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 21 22:08:42 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 21 22:26:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400e3f36
7
8 dev-libs/nss: Removed old.
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 dev-libs/nss/Manifest | 1 -
13 dev-libs/nss/nss-3.31.ebuild | 340 -------------------------------------------
14 2 files changed, 341 deletions(-)
15
16 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
17 index c9a04742fce..94e69da45e2 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 SHA256 5df483b73535d726207483f6349df23fe56aee83382b94b13298aec2e254d985 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa WHIRLPOOL ca341bc9e76208e01ee9b1b1fa8a67dd502676d1a2062468722ad80ed81fa3e4b0958907892871249b3596b310aa813259cf47b5bc64ec37b05613dc9d31323f
22 -DIST nss-3.31.tar.gz 9537011 SHA256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d SHA512 2b56405b32d37cc4386cbbe54462cc57092e47b3418a743adbae14e1825ca69d07256fbfe16c0cfd7540c46cea67259151b42a0d95419c80964015eacdcafea1 WHIRLPOOL b63b481436feaf48ef3acc03e7af3831b743e91fda802f1fb5d4e782cbefab979dda5b643766f3a600b16ff815a90dacabd0b06b79baa76386237b56e74676fb
23 DIST nss-3.32.1.tar.gz 9494609 SHA256 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652 SHA512 b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8 WHIRLPOOL 4c15b4ba85ce10787b9ee541d20a829a99aed5628b59f7e7e3045ec694d6d8a0a83bc730ae4d74148cf7c425f59debfd1574cb1b036c1407d1f9d4896647d9cf
24 DIST nss-3.33.tar.gz 9578033 SHA256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 SHA512 82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0 WHIRLPOOL c11129bce97990a41a3118e62d79481fbd38cad51356a6b6c1b0af7efe2f27b3d5d51a8e987287c1cdff77ccee14a3e96d5bbb76e92f9a81b2f50988de250dea
25 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
26
27 diff --git a/dev-libs/nss/nss-3.31.ebuild b/dev-libs/nss/nss-3.31.ebuild
28 deleted file mode 100644
29 index 3d6f566f242..00000000000
30 --- a/dev-libs/nss/nss-3.31.ebuild
31 +++ /dev/null
32 @@ -1,340 +0,0 @@
33 -# Copyright 1999-2017 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.13.1"
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 - abi_x86_32? (
64 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
65 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
66 - )"
67 -
68 -RESTRICT="test"
69 -
70 -S="${WORKDIR}/${P}/${PN}"
71 -
72 -MULTILIB_CHOST_TOOLS=(
73 - /usr/bin/nss-config
74 -)
75 -
76 -PATCHES=(
77 - # Custom changes for gentoo
78 - "${FILESDIR}/${PN}-3.28-gentoo-fixups.patch"
79 - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
80 - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
81 -)
82 -
83 -src_unpack() {
84 - unpack ${A}
85 - if use nss-pem ; then
86 - mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
87 - fi
88 -}
89 -
90 -src_prepare() {
91 - if use nss-pem ; then
92 - PATCHES+=(
93 - "${FILESDIR}/${PN}-3.21-enable-pem.patch"
94 - )
95 - fi
96 - if use cacert ; then #521462
97 - PATCHES+=(
98 - "${DISTDIR}/${PN}-cacert-class1-class3.patch"
99 - )
100 - fi
101 -
102 - default
103 -
104 - pushd coreconf >/dev/null || die
105 - # hack nspr paths
106 - echo 'INCLUDES += -I$(DIST)/include/dbm' \
107 - >> headers.mk || die "failed to append include"
108 -
109 - # modify install path
110 - sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
111 - -i source.mk || die
112 -
113 - # Respect LDFLAGS
114 - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
115 - popd >/dev/null || die
116 -
117 - # Fix pkgconfig file for Prefix
118 - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
119 - config/Makefile || die
120 -
121 - # use host shlibsign if need be #436216
122 - if tc-is-cross-compiler ; then
123 - sed -i \
124 - -e 's:"${2}"/shlibsign:shlibsign:' \
125 - cmd/shlibsign/sign.sh || die
126 - fi
127 -
128 - # dirty hack
129 - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
130 - lib/ssl/config.mk || die
131 - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
132 - cmd/platlibs.mk || die
133 -
134 - multilib_copy_sources
135 -
136 - strip-flags
137 -}
138 -
139 -multilib_src_configure() {
140 - # Ensure we stay multilib aware
141 - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
142 -}
143 -
144 -nssarch() {
145 - # Most of the arches are the same as $ARCH
146 - local t=${1:-${CHOST}}
147 - case ${t} in
148 - aarch64*)echo "aarch64";;
149 - hppa*) echo "parisc";;
150 - i?86*) echo "i686";;
151 - x86_64*) echo "x86_64";;
152 - *) tc-arch ${t};;
153 - esac
154 -}
155 -
156 -nssbits() {
157 - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
158 - if [[ ${1} == BUILD_ ]]; then
159 - cc=$(tc-getBUILD_CC)
160 - else
161 - cc=$(tc-getCC)
162 - fi
163 - echo > "${T}"/test.c || die
164 - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
165 - case $(file "${T}/${1}test.o") in
166 - *32-bit*x86-64*) echo USE_X32=1;;
167 - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
168 - *32-bit*|*ppc*|*i386*) ;;
169 - *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
170 - esac
171 -}
172 -
173 -multilib_src_compile() {
174 - # use ABI to determine bit'ness, or fallback if unset
175 - local buildbits mybits
176 - case "${ABI}" in
177 - n32) mybits="USE_N32=1";;
178 - x32) mybits="USE_X32=1";;
179 - s390x|*64) mybits="USE_64=1";;
180 - ${DEFAULT_ABI})
181 - einfo "Running compilation test to determine bit'ness"
182 - mybits=$(nssbits)
183 - ;;
184 - esac
185 - # bitness of host may differ from target
186 - if tc-is-cross-compiler; then
187 - buildbits=$(nssbits BUILD_)
188 - fi
189 -
190 - local makeargs=(
191 - CC="$(tc-getCC)"
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 - nssutils="addbuiltin atob baddbdir btoa certcgi certutil
330 - cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
331 - nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
332 - pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
333 - symkeyutil tstclnt vfychain vfyserv"
334 - # install man-pages for utils (bug #516810)
335 - doman doc/nroff/*.1
336 - fi
337 - pushd dist/*/bin >/dev/null || die
338 - for f in ${nssutils}; do
339 - dobin ${f}
340 - done
341 - popd >/dev/null || die
342 - fi
343 -
344 - # Prelink breaks the CHK files. We don't have any reliable way to run
345 - # shlibsign after prelink.
346 - dodir /etc/prelink.conf.d
347 - printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
348 - > "${ED}"/etc/prelink.conf.d/nss.conf
349 -}
350 -
351 -pkg_postinst() {
352 - multilib_pkg_postinst() {
353 - # We must re-sign the libraries AFTER they are stripped.
354 - local shlibsign="${EROOT}/usr/bin/shlibsign"
355 - # See if we can execute it (cross-compiling & such). #436216
356 - "${shlibsign}" -h >&/dev/null
357 - if [[ $? -gt 1 ]] ; then
358 - shlibsign="shlibsign"
359 - fi
360 - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
361 - }
362 -
363 - multilib_foreach_abi multilib_pkg_postinst
364 -}
365 -
366 -pkg_postrm() {
367 - multilib_pkg_postrm() {
368 - cleanup_chk "${EROOT}"/usr/$(get_libdir)
369 - }
370 -
371 - multilib_foreach_abi multilib_pkg_postrm
372 -}