commit: 0b007c174774f6ea9d22e3ff0c683170f35287c8
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 02:59:28 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 02:59:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0b007c17
dev-libs/nss - sync with gentoo repo
dev-libs/nss/Manifest | 3 +-
dev-libs/nss/metadata.xml | 3 +-
.../nss/{nss-3.22.ebuild => nss-3.25-r1.ebuild} | 40 +++++++++++++---------
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index bba98d4..3b4257a 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,2 @@
-DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256
82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512
2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00
WHIRLPOOL
c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.22.tar.gz 6992347 SHA256
30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611 SHA512
f97251a17ad4ea889878ffeba64f19560978cf82c512b84c301be248ee4fe764345838fb8a88233b0fe12abe7bf78ce521a6ac64fa8d16bd0e1283eac9c17be1
WHIRLPOOL
8e128f3c8eb411c6569bd6d4d1edb55041e214913669687a5481d16f9aff245d3fc827f9a8c96e4723b3f0ec127d4461a1cda247dc296d9dce34513c7ab7e43d
+DIST nss-3.25.tar.gz 7338238 SHA256
5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359 SHA512
a33cff42d0d85eea091057648d598b7421de88f16ed357965ea08a8812de968c3f18d45452afd21afc90122f65c2c5bb2d7071357947b45e935aae55d28c4218
WHIRLPOOL
3857bffe7a58043612bbeaf0e596b3afdd4f0792441af667fb503dd2d354a535bb8523c258242b470d888ef2beff267b4480e6398a3328f0c44193b83f4a5934
DIST nss-pem-20140125.tar.bz2 28805 SHA256
62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512
352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39
WHIRLPOOL
3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index 684532a..6301531 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -7,8 +7,7 @@
</maintainer>
<use>
<flag name='cacert'>
- Include root certs from CAcert (http://http://www.cacert.org/) and
- Software in the Public Interest (http://www.spi-inc.org/)
+ Include root certs from CAcert (http://http://www.cacert.org/)
</flag>
<flag name='nss-pem'>Add support for libnsspem</flag>
<flag name='utils'>Install utilities included with the library</flag>
diff --git a/dev-libs/nss/nss-3.22.ebuild b/dev-libs/nss/nss-3.25-r1.ebuild
similarity index 92%
rename from dev-libs/nss/nss-3.22.ebuild
rename to dev-libs/nss/nss-3.25-r1.ebuild
index bcdddb1..ede1f3a 100644
--- a/dev-libs/nss/nss-3.22.ebuild
+++ b/dev-libs/nss/nss-3.25-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: 5729f0b5310702f605ac6451514cc150b8d7fad6 $
+# $Id$
-EAPI="5"
+EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-NSPR_VER="4.10.8"
+NSPR_VER="4.12"
RTM_NAME="NSS_${PV//./_}_RTM"
# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
@@ -14,14 +14,13 @@ PEM_P="${PN}-pem-20140125"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI
support"
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/";
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? (
https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
)
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
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"
-IUSE="+cacert +nss-pem utils"
+IUSE="cacert +nss-pem utils"
CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
@@ -42,6 +41,13 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/nss-config
)
+PATCHES=(
+ # Custom changes for gentoo
+ "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
+ "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+ "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
src_unpack() {
unpack ${A}
if use nss-pem ; then
@@ -50,17 +56,19 @@ src_unpack() {
}
src_prepare() {
- # Custom changes for gentoo
- epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
- epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.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
+ if use nss-pem ; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-3.21-enable-pem.patch"
+ "${FILESDIR}/${PN}-3.21-pem-werror.patch"
+ )
fi
- use nss-pem && epatch "${FILESDIR}/${PN}-3.21-enable-pem.patch" \
- "${FILESDIR}/${PN}-3.21-pem-werror.patch"
+ if use cacert ; then #521462
+ PATCHES+=(
+ "${FILESDIR}/${PN}-3.21-cacert-class3.patch"
+ )
+ fi
+
+ default
pushd coreconf >/dev/null || die
# hack nspr paths
