diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/nss/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/nss/files/nss-3.47-enable-pem.patch (renamed from dev-libs/nss/files/nss-3.21-enable-pem.patch) | 6 | ||||
| -rw-r--r-- | dev-libs/nss/files/nss-3.47-gentoo-fixups.patch (renamed from dev-libs/nss/files/nss-3.32-gentoo-fixups.patch) | 96 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.47.ebuild (renamed from dev-libs/nss/nss-3.46.1.ebuild) | 6 |
4 files changed, 39 insertions, 71 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 47f0862d..9067d17e 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,3 +1,3 @@ -DIST nss-3.46.1.tar.gz 76417797 BLAKE2B c65679a7eb50991958858afe2a20824dd9ff4c0f554f3c1964ccec269c2da9de1fa674a6ebf24fd3c8465315e491a9b50188382d1032b0cfe74c289d49049926 SHA512 f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b +DIST nss-3.47.tar.gz 76461837 BLAKE2B 8b11b5330cf134f2f94c2b4a07d52e153ff40006770e31cbba379ff623b822778bd8ae4510493912263299bbb8f6e0706f30d59633256a3141cbd8faedd1f257 SHA512 99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.47-enable-pem.patch index e6de2757..47a01c32 100644 --- a/dev-libs/nss/files/nss-3.21-enable-pem.patch +++ b/dev-libs/nss/files/nss-3.47-enable-pem.patch @@ -1,10 +1,10 @@ ---- nss/lib/ckfw/manifest.mn -+++ nss/lib/ckfw/manifest.mn +--- a/lib/ckfw/manifest.mn ++++ b/lib/ckfw/manifest.mn @@ -5,7 +5,7 @@ CORE_DEPTH = ../.. --DIRS = builtins +-DIRS = builtins +DIRS = builtins pem PRIVATE_EXPORTS = \ diff --git a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch index 1773da98..9bf9e016 100644 --- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch +++ b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch @@ -1,53 +1,4 @@ -From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001 -From: "Jory A. Pratt" <anarchy@gentoo.org> -Date: Fri, 28 Jul 2017 14:00:41 -0500 -Subject: [PATCH] add pkg-config file - -Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> ---- - Makefile | 11 +--- - config/Makefile | 40 ++++++++++++++ - config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ - config/nss.pc.in | 12 +++++ - manifest.mn | 2 +- - 5 files changed, 199 insertions(+), 11 deletions(-) - create mode 100644 config/Makefile - create mode 100644 config/nss-config.in - create mode 100644 config/nss.pc.in - -diff --git a/Makefile b/Makefile -index 48bae37..9850883 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_nspr all latest -+nss_build_all: all latest - - nss_clean_all: clobber_nspr clobber - -@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) - --prefix='$(NSS_GYP_PREFIX)' - endif - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) -- --install_nspr: build_nspr -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber -- - build_docs: - $(MAKE) -C $(CORE_DEPTH)/doc - -diff --git a/config/Makefile b/config/Makefile -new file mode 100644 -index 0000000..600fe48 ---- /dev/null +--- a/config/Makefile +++ b/config/Makefile @@ -0,0 +1,40 @@ +CORE_DEPTH = .. @@ -90,10 +41,7 @@ index 0000000..600fe48 + +dummy: all export libs + -diff --git a/config/nss-config.in b/config/nss-config.in -new file mode 100644 -index 0000000..1d7c444 ---- /dev/null +--- a/config/nss-config.in +++ b/config/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh @@ -241,10 +189,7 @@ index 0000000..1d7c444 + echo $libdirs +fi + -diff --git a/config/nss.pc.in b/config/nss.pc.in -new file mode 100644 -index 0000000..df9e2cf ---- /dev/null +--- a/config/nss.pc.in +++ b/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ @@ -259,16 +204,39 @@ index 0000000..df9e2cf +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + -diff --git a/manifest.mn b/manifest.mn -index 500a5ad..87c905e 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_nspr all latest ++nss_build_all: all latest + + nss_clean_all: clobber_nspr clobber + +@@ -133,16 +133,6 @@ + --prefix='$(NSS_GYP_PREFIX)' + endif + +-build_nspr: $(NSPR_CONFIG_STATUS) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests +- +-install_nspr: build_nspr +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber +- + build_docs: + $(MAKE) -C $(CORE_DEPTH)/doc + --- a/manifest.mn +++ b/manifest.mn -@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ +@@ -10,4 +10,4 @@ RELEASE = nss -DIRS = coreconf lib cmd cpputil gtests +DIRS = coreconf lib cmd cpputil config --- -2.13.3 - diff --git a/dev-libs/nss/nss-3.46.1.ebuild b/dev-libs/nss/nss-3.47.ebuild index 96e09a43..938eb5bd 100644 --- a/dev-libs/nss/nss-3.46.1.ebuild +++ b/dev-libs/nss/nss-3.47.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$ 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" +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" IUSE="cacert +nss-pem utils" CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" @@ -40,7 +40,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( # Custom changes for gentoo - "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" ) @@ -55,7 +55,7 @@ src_unpack() { src_prepare() { if use nss-pem ; then PATCHES+=( - "${FILESDIR}/${PN}-3.21-enable-pem.patch" + "${FILESDIR}/${PN}-3.47-enable-pem.patch" ) fi if use cacert ; then #521462 |