Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/
Date: Sat, 09 Jul 2016 02:54:52
Message-Id: 1468032857.0f07ec40931c5b549ddf9919a4f25b9101304487.axs@gentoo
1 commit: 0f07ec40931c5b549ddf9919a4f25b9101304487
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 9 02:54:17 2016 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 9 02:54:17 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f07ec40
7
8 dev-libs/nss: dropped SPI certificates and changed cacert default to off
9
10 Bug: http://bugs.gentoo.org/580722
11
12 Package-Manager: portage-2.2.28
13
14 dev-libs/nss/{nss-3.25.ebuild => nss-3.25-r1.ebuild} | 13 ++++++-------
15 1 file changed, 6 insertions(+), 7 deletions(-)
16
17 diff --git a/dev-libs/nss/nss-3.25.ebuild b/dev-libs/nss/nss-3.25-r1.ebuild
18 similarity index 96%
19 rename from dev-libs/nss/nss-3.25.ebuild
20 rename to dev-libs/nss/nss-3.25-r1.ebuild
21 index 8a72adc..ede1f3a 100644
22 --- a/dev-libs/nss/nss-3.25.ebuild
23 +++ b/dev-libs/nss/nss-3.25-r1.ebuild
24 @@ -15,13 +15,12 @@ PEM_P="${PN}-pem-20140125"
25 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
26 HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
27 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
28 - cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
29 nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
30
31 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
32 SLOT="0"
33 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"
34 -IUSE="+cacert +nss-pem utils"
35 +IUSE="cacert +nss-pem utils"
36 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
37 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
38 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
39 @@ -63,14 +62,14 @@ src_prepare() {
40 "${FILESDIR}/${PN}-3.21-pem-werror.patch"
41 )
42 fi
43 + if use cacert ; then #521462
44 + PATCHES+=(
45 + "${FILESDIR}/${PN}-3.21-cacert-class3.patch"
46 + )
47 + fi
48
49 default
50
51 - if use cacert ; then
52 - eapply -p4 "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
53 - eapply "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462
54 - fi
55 -
56 pushd coreconf >/dev/null || die
57 # hack nspr paths
58 echo 'INCLUDES += -I$(DIST)/include/dbm' \