Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/
Date: Fri, 16 Apr 2021 11:35:05
Message-Id: 1618572841.c2cc6f938e7d434886140bba6c0e96e27d09384a.whissi@gentoo
1 commit: c2cc6f938e7d434886140bba6c0e96e27d09384a
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 16 11:15:41 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 11:34:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cc6f93
7
8 dev-libs/nss: update cacert certificate
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-libs/nss/Manifest | 4 ++--
14 dev-libs/nss/{nss-3.63.ebuild => nss-3.63.1.ebuild} | 12 +++++-------
15 2 files changed, 7 insertions(+), 9 deletions(-)
16
17 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
18 index 94f7cbcc143..6d44c3bca5b 100644
19 --- a/dev-libs/nss/Manifest
20 +++ b/dev-libs/nss/Manifest
21 @@ -1,2 +1,2 @@
22 -DIST nss-3.63.tar.gz 82167087 BLAKE2B 3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9 SHA512 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
23 -DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
24 +DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
25 +DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
26
27 diff --git a/dev-libs/nss/nss-3.63.ebuild b/dev-libs/nss/nss-3.63.1.ebuild
28 similarity index 98%
29 rename from dev-libs/nss/nss-3.63.ebuild
30 rename to dev-libs/nss/nss-3.63.1.ebuild
31 index 447c0480c7d..106c5b77225 100644
32 --- a/dev-libs/nss/nss-3.63.ebuild
33 +++ b/dev-libs/nss/nss-3.63.1.ebuild
34 @@ -11,7 +11,7 @@ RTM_NAME="NSS_${PV//./_}_RTM"
35 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
36 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
37 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
38 - cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
39 + cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )"
40
41 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
42 SLOT="0"
43 @@ -42,14 +42,12 @@ PATCHES=(
44 )
45
46 src_prepare() {
47 - if use cacert ; then #521462
48 - PATCHES+=(
49 - "${DISTDIR}/${PN}-cacert-class1-class3.patch"
50 - )
51 - fi
52 -
53 default
54
55 + if use cacert ; then
56 + eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
57 + fi
58 +
59 pushd coreconf >/dev/null || die
60 # hack nspr paths
61 echo 'INCLUDES += -I$(DIST)/include/dbm' \