diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2016-02-16 08:27:45 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-02-16 08:27:45 +0100 |
| commit | f6571fd0ebb29a8f1694af80215ae8cf2dc29ed1 (patch) | |
| tree | 6e3da8fdcfc45037d6f50e4ad99becd6b7d6dd64 | |
| parent | www-client/firefox - Update to latest firefox-44.0.2 (diff) | |
| download | mozilla-f6571fd0ebb29a8f1694af80215ae8cf2dc29ed1.tar.gz mozilla-f6571fd0ebb29a8f1694af80215ae8cf2dc29ed1.tar.bz2 mozilla-f6571fd0ebb29a8f1694af80215ae8cf2dc29ed1.zip | |
dev-libs/nss: Bump to version 3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
| -rw-r--r-- | dev-libs/nss/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.22.ebuild (renamed from dev-libs/nss/nss-3.21.ebuild) | 31 |
2 files changed, 19 insertions, 14 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 1c840750..bba98d40 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,3 +1,3 @@ DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 -DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4 +DIST nss-3.22.tar.gz 6992347 SHA256 30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611 SHA512 f97251a17ad4ea889878ffeba64f19560978cf82c512b84c301be248ee4fe764345838fb8a88233b0fe12abe7bf78ce521a6ac64fa8d16bd0e1283eac9c17be1 WHIRLPOOL 8e128f3c8eb411c6569bd6d4d1edb55041e214913669687a5481d16f9aff245d3fc827f9a8c96e4723b3f0ec127d4461a1cda247dc296d9dce34513c7ab7e43d DIST nss-pem-20140125.tar.bz2 28805 SHA256 62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39 WHIRLPOOL 3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62 diff --git a/dev-libs/nss/nss-3.21.ebuild b/dev-libs/nss/nss-3.22.ebuild index c3b279ac..bcdddb18 100644 --- a/dev-libs/nss/nss-3.21.ebuild +++ b/dev-libs/nss/nss-3.22.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ +# $Id: 5729f0b5310702f605ac6451514cc150b8d7fad6 $ + +EAPI="5" -EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal NSPR_VER="4.10.8" @@ -52,10 +53,14 @@ src_prepare() { # Custom changes for gentoo epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch" epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" - use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" + epatch "${FILESDIR}/${PN}-3.21-hppa-byte_order.patch" + + if use cacert ; then + epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" + epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462 + fi use nss-pem && epatch "${FILESDIR}/${PN}-3.21-enable-pem.patch" \ "${FILESDIR}/${PN}-3.21-pem-werror.patch" - epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" # 521462 pushd coreconf >/dev/null || die # hack nspr paths @@ -164,6 +169,7 @@ multilib_src_compile() { ) fi + export NSS_ENABLE_WERROR=0 #567158 export BUILD_OPT=1 export NSS_USE_SYSTEM_SQLITE=1 export NSDISTMODE=copy @@ -276,7 +282,10 @@ multilib_src_install() { # The tests we do not need to install. #nssutils_test="bltest crmftest dbtest dertimetest #fipstest remtest sdrtest" - nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert + # checkcert utils has been removed in nss-3.22: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870 + nssutils="addbuiltin atob baddbdir btoa certcgi certutil cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt @@ -293,13 +302,9 @@ multilib_src_install() { # Prelink breaks the CHK files. We don't have any reliable way to run # shlibsign after prelink. - local l libs=() liblist - for l in ${NSS_CHK_SIGN_LIBS} ; do - libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") - done - liblist=$(printf '%s:' "${libs[@]}") - echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}" - doenvd "${T}/90nss-${ABI}" + dodir /etc/prelink.conf.d + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ + > "${ED}"/etc/prelink.conf.d/nss.conf } pkg_postinst() { |