| 1 |
commit: 2442149e91df742392f18730028de394ff464c88 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 17:44:36 2020 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 10 17:44:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=2442149e |
| 7 |
|
| 8 |
dev-libs/nss: include cmac.h, drop pem support in favor of standalone |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/nss/Manifest | 1 - |
| 14 |
dev-libs/nss/metadata.xml | 1 - |
| 15 |
.../nss/{nss-3.50.ebuild => nss-3.50-r1.ebuild} | 22 +++------------------- |
| 16 |
3 files changed, 3 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
| 19 |
index 1df0b84..2478d16 100644 |
| 20 |
--- a/dev-libs/nss/Manifest |
| 21 |
+++ b/dev-libs/nss/Manifest |
| 22 |
@@ -1,3 +1,2 @@ |
| 23 |
DIST nss-3.50.tar.gz 78041630 BLAKE2B 4d21a1cac475936e153b22829f8b4b2f6f6a57c41e14d091b287aba633a8d4c80c045882ce6f1cb7a2f9ce760d616b13389f90e59f60250c41080ed1f5a4900a SHA512 d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1 |
| 24 |
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 |
| 25 |
-DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 |
| 26 |
|
| 27 |
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml |
| 28 |
index 009a097..c76b165 100644 |
| 29 |
--- a/dev-libs/nss/metadata.xml |
| 30 |
+++ b/dev-libs/nss/metadata.xml |
| 31 |
@@ -9,7 +9,6 @@ |
| 32 |
<flag name="cacert"> |
| 33 |
Include root/class3 certs from CAcert (http://www.cacert.org/) |
| 34 |
</flag> |
| 35 |
- <flag name="nss-pem">Add support for libnsspem</flag> |
| 36 |
<flag name="utils">Install utilities included with the library</flag> |
| 37 |
</use> |
| 38 |
<upstream> |
| 39 |
|
| 40 |
diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50-r1.ebuild |
| 41 |
similarity index 94% |
| 42 |
rename from dev-libs/nss/nss-3.50.ebuild |
| 43 |
rename to dev-libs/nss/nss-3.50-r1.ebuild |
| 44 |
index c3b9fde..b6a9c7b 100644 |
| 45 |
--- a/dev-libs/nss/nss-3.50.ebuild |
| 46 |
+++ b/dev-libs/nss/nss-3.50-r1.ebuild |
| 47 |
@@ -7,20 +7,16 @@ inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal |
| 48 |
|
| 49 |
NSPR_VER="4.25" |
| 50 |
RTM_NAME="NSS_${PV//./_}_RTM" |
| 51 |
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git |
| 52 |
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" |
| 53 |
-PEM_P="${PN}-pem-20160329" |
| 54 |
|
| 55 |
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" |
| 56 |
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" |
| 57 |
SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz |
| 58 |
- cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) |
| 59 |
- nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" |
| 60 |
+ cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )" |
| 61 |
|
| 62 |
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 65 |
-IUSE="cacert +nss-pem utils" |
| 66 |
+IUSE="cacert utils" |
| 67 |
BDEPEND=" |
| 68 |
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 69 |
" |
| 70 |
@@ -46,19 +42,7 @@ PATCHES=( |
| 71 |
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" |
| 72 |
) |
| 73 |
|
| 74 |
-src_unpack() { |
| 75 |
- unpack ${A} |
| 76 |
- if use nss-pem ; then |
| 77 |
- mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die |
| 78 |
- fi |
| 79 |
-} |
| 80 |
- |
| 81 |
src_prepare() { |
| 82 |
- if use nss-pem ; then |
| 83 |
- PATCHES+=( |
| 84 |
- "${FILESDIR}/${PN}-3.47-enable-pem.patch" |
| 85 |
- ) |
| 86 |
- fi |
| 87 |
if use cacert ; then #521462 |
| 88 |
PATCHES+=( |
| 89 |
"${DISTDIR}/${PN}-cacert-class1-class3.patch" |
| 90 |
@@ -280,7 +264,7 @@ multilib_src_install() { |
| 91 |
insinto /usr/include/nss |
| 92 |
doins public/nss/*.{h,api} |
| 93 |
insinto /usr/include/nss/private |
| 94 |
- doins private/nss/{blapi,alghmac}.h |
| 95 |
+ doins private/nss/{blapi,alghmac,cmac}.h |
| 96 |
|
| 97 |
popd >/dev/null || die |
Archives