diff options
-rw-r--r-- | dev-libs/nss/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/nss/files/nss-3.47-enable-pem.patch | 11 | ||||
-rw-r--r-- | dev-libs/nss/files/nss-3.53-gentoo-fixups.patch (renamed from dev-libs/nss/files/nss-3.47-gentoo-fixups.patch) | 140 | ||||
-rw-r--r-- | dev-libs/nss/nss-3.53.ebuild (renamed from dev-libs/nss/nss-3.52.1.ebuild) | 7 |
4 files changed, 86 insertions, 74 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index c369683..05b21a8 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,2 +1,2 @@ -DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6 +DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 diff --git a/dev-libs/nss/files/nss-3.47-enable-pem.patch b/dev-libs/nss/files/nss-3.47-enable-pem.patch deleted file mode 100644 index 47a01c3..0000000 --- a/dev-libs/nss/files/nss-3.47-enable-pem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/ckfw/manifest.mn -+++ b/lib/ckfw/manifest.mn -@@ -5,7 +5,7 @@ - - CORE_DEPTH = ../.. - --DIRS = builtins -+DIRS = builtins pem - - PRIVATE_EXPORTS = \ - ck.h \ diff --git a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch index 29b3a2a..1531f0d 100644 --- a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch +++ b/dev-libs/nss/files/nss-3.53-gentoo-fixups.patch @@ -1,5 +1,18 @@ ---- a/config/Makefile -+++ b/config/Makefile +Submitted By: Xi Ruoyao <xry111_AT_mengyan1223_DOT_wang> +Date: 2020-05-31 +Initial Package Version: 3.12.4 +Upstream Status: Not applicable +Origin: Self, rediffed for nss-3.53. +Description: Adds auto-generated nss.pc and nss-config script, and + allows building without nspr in the source tree. + For 3.40.1, Requires: updated to nspr >= 4.20. + For 3.46.1, Requires: updated to nspr >= 4.21. + For 3.48, Requires: updated to nspr >= 4.24. + For 3.51.1, Requires: updated to nspr >= 4.25. + +diff -Nuar a/config/Makefile b/config/Makefile +--- a/config/Makefile 1970-01-01 08:00:00.000000000 +0800 ++++ b/config/Makefile 2020-05-31 13:48:14.423566855 +0800 @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -18,14 +31,14 @@ + mkdir -p $(DIST)/lib/pkgconfig + sed -e "s,@prefix@,$(PREFIX)," \ + -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/lib64," \ ++ -e "s,@libdir@,\$${prefix}/lib," \ + -e "s,@includedir@,\$${prefix}/include/nss," \ + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss.pc.in > nss.pc + chmod 0644 nss.pc -+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig ++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig + + # Create the nss-config script + mkdir -p $(DIST)/bin @@ -35,15 +48,16 @@ + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss-config.in > nss-config + chmod 0755 nss-config -+ ln -sf ../../../config/nss-config $(DIST)/bin ++ ln -sf ../../../nss/config/nss-config $(DIST)/bin + +libs: + +dummy: all export libs + ---- a/config/nss-config.in -+++ b/config/nss-config.in -@@ -0,0 +1,145 @@ +diff -Nuar a/config/nss-config.in b/config/nss-config.in +--- a/config/nss-config.in 1970-01-01 08:00:00.000000000 +0800 ++++ b/config/nss-config.in 2020-05-31 13:48:14.424566860 +0800 +@@ -0,0 +1,153 @@ +#!/bin/sh + +prefix=@prefix@ @@ -66,9 +80,10 @@ + [--cflags] +Dynamic Libraries: + nss -+ ssl -+ smime + nssutil ++ smime ++ ssl ++ softokn +EOF + exit $1 +} @@ -77,10 +92,11 @@ + usage 1 1>&2 +fi + -+lib_ssl=yes -+lib_smime=yes +lib_nss=yes +lib_nssutil=yes ++lib_smime=yes ++lib_ssl=yes ++lib_softokn=yes + +while test $# -gt 0; do + case "$1" in @@ -122,18 +138,21 @@ + --libs) + echo_libs=yes + ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; + nss) + lib_nss=yes + ;; + nssutil) + lib_nssutil=yes + ;; ++ smime) ++ lib_smime=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ softokn) ++ lib_softokn=yes ++ ;; + *) + usage 1 1>&2 + ;; @@ -173,24 +192,28 @@ +fi + +if test "$echo_libs" = "yes"; then -+ libdirs="" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${major_version}" ++ libdirs="-L$libdir" ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi -+ if test -n "$lib_nss"; then -+ libdirs="$libdirs -lnss${major_version}" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" + fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" ++ if test -n "$lib_softokn"; then ++ libdirs="$libdirs -lsoftokn${major_version}" + fi + echo $libdirs -+fi ++fi + ---- a/config/nss.pc.in -+++ b/config/nss.pc.in +diff -Nuar a/config/nss.pc.in b/config/nss.pc.in +--- a/config/nss.pc.in 1970-01-01 08:00:00.000000000 +0800 ++++ b/config/nss.pc.in 2020-05-31 13:48:14.424566860 +0800 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -200,43 +223,44 @@ +Name: NSS +Description: Network Security Services +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.8 -+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 ++Requires: nspr >= 4.25 ++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +Cflags: -I${includedir} + ---- 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 +diff -Nuar a/Makefile b/Makefile +--- a/Makefile 2020-05-30 04:34:42.000000000 +0800 ++++ b/Makefile 2020-05-31 13:48:51.500733022 +0800 +@@ -4,6 +4,8 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. - nss_clean_all: clobber_nspr clobber ++default: nss_build_all ++ + ####################################################################### + # (1) Include initial platform-independent assignments (MANDATORY). # + ####################################################################### +@@ -48,12 +50,10 @@ + ####################################################################### -@@ -133,16 +133,6 @@ - --prefix='$(NSS_GYP_PREFIX)' - endif + nss_build_all: +- $(MAKE) build_nspr + $(MAKE) all + $(MAKE) latest --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 + nss_clean_all: +- $(MAKE) clobber_nspr + $(MAKE) clobber ---- a/manifest.mn -+++ b/manifest.mn -@@ -10,4 +10,4 @@ + NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status +diff -Nuar a/manifest.mn b/manifest.mn +--- a/manifest.mn 2020-05-30 04:34:42.000000000 +0800 ++++ b/manifest.mn 2020-05-31 13:48:30.652640413 +0800 +@@ -10,7 +10,7 @@ RELEASE = nss -DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cmd cpputil config ++DIRS = coreconf lib cmd cpputil gtests config + + lib: coreconf + cmd: lib diff --git a/dev-libs/nss/nss-3.52.1.ebuild b/dev-libs/nss/nss-3.53.ebuild index b6e47c6..1b50cfc 100644 --- a/dev-libs/nss/nss-3.52.1.ebuild +++ b/dev-libs/nss/nss-3.53.ebuild @@ -36,7 +36,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( # Custom changes for gentoo - "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" ) @@ -154,13 +154,12 @@ multilib_src_compile() { export BUILD_OPT=1 export NSS_USE_SYSTEM_SQLITE=1 export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 export FREEBL_NO_DEPEND=1 export FREEBL_LOWHASH=1 export NSS_SEED_ONLY_DEV_URANDOM=1 - export ASFLAGS="" - export USE_SYSTEM_ZLIB=1 + export USE_SYSTEM_ZLIB=1 export ZLIB_LIBS=-lz + export ASFLAGS="" local d |