From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-libs/nss/Manifest | 7 +- dev-libs/nss/files/nss-3.21-enable-pem.patch | 11 - dev-libs/nss/files/nss-3.32-gentoo-fixups.patch | 274 ------------ dev-libs/nss/files/nss-3.36.7-fix-cms.patch | 531 ------------------------ dev-libs/nss/nss-3.49.1.ebuild | 375 +++++++++++++++++ dev-libs/nss/nss-3.49.ebuild | 375 +++++++++++++++++ 6 files changed, 754 insertions(+), 819 deletions(-) delete mode 100644 dev-libs/nss/files/nss-3.21-enable-pem.patch delete mode 100644 dev-libs/nss/files/nss-3.32-gentoo-fixups.patch delete mode 100644 dev-libs/nss/files/nss-3.36.7-fix-cms.patch create mode 100644 dev-libs/nss/nss-3.49.1.ebuild create mode 100644 dev-libs/nss/nss-3.49.ebuild (limited to 'dev-libs/nss') diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index acaba2be79d4..5ef7a1372d9a 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,14 +1,15 @@ -AUX nss-3.21-enable-pem.patch 172 BLAKE2B dbb07fc3122ec7b108ba9cbfaa78870a3690a626fd37d4de065ef03e4cdbe27cd2a816af067678d9b9af55836e3caed291e8de7ca1835ab64b2e802752c132b8 SHA512 fd40fd3b5724f01dd94c2dcf1311d6ab207e59869e5b531fddf35c716bfb1b5cb95c8869fc4ad365b676667598319460de99bf314f529e90415096437f3e610f AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a -AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03 -AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72 AUX nss-3.47-enable-pem.patch 167 BLAKE2B 2b0b5e93ef43303008786280fe3b31d4ea5d92385134bf5574eef7a6fc3fb3e93b94b3a39857dd7ff5cb0f788af6b3c23a77164046b30a349666d0b050c715b2 SHA512 0fbcb0d2f0bce5fad6dadfe3d63288db98394384b901fbcabe98e86765bf029fac26eef96be5858113dd916fcf57595a3890904fe99573a652cfab4c13a112b7 AUX nss-3.47-gentoo-fixups.patch 5365 BLAKE2B e439dbf10b560369fda15ce21ede20d243373f1d93e111af75ebec029816c2ddd1c41f209bfa9f86e9272ef3ec5116530a7653e774fc8a16906adf0c57d22daa SHA512 b9a984697f71cb263eb6955e20584689325f1eb99ca124494944194bb0a57f20184a4c11ea862edaf564930ecb2e0f2f9317245e1c782d88b598a5a0587cd66d DIST nss-3.47.1.tar.gz 76462846 BLAKE2B a26e858e06c494adb4059f8cc73993b0f3cff90a0785ed7eed3760931aa6b4ae5706cf7994c6c1421d9ed8bc36d1a4c199988bd9c59c06bb95fd03521c20f141 SHA512 ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9 DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7d87b3f95e86ba10717d30da25632e60753b5cf7a24fbfef8fab6529ae373eea25d633d8164164bac97357c SHA512 71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a +DIST nss-3.49.1.tar.gz 76489134 BLAKE2B 4b1ceb6e1a366f506d13ceaa88663fba400318bff872305993369c2caa1e1aef654fa02308957bc2a2774b7e0b4bafd097ad16831d38d7da53753991419839b7 SHA512 e463c9d71537ac30dbd2998cbdbc0cadc734768a6f3a316c57b6a6d01ad6d26ca732dff65e9c88555a834ae7d71fc857e4cbc1799438069f544a1e27f75985e8 +DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 EBUILD nss-3.47.1-r1.ebuild 9421 BLAKE2B c68d6f35beafa76d0a661d05d3f2588f42749d8ebd66611330763a1e3d6877dc7ddef88177cd6449c1dc7317ff37f1b5ab4c085eda7c5ba79f655998c5bef78b SHA512 3f501ecda5ee130a4f26eee0dee1c00e951892e9bf20b09908e1684d823eb47d8779957afd2bea6deaf5f75c8c6a3aaa0638c4786edd883179a6e3c35edbfc8b EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41f975d5562a166c69d30cda9d4f15a2f1e8e85533faa4b511186670138e63356b93ef34fc13df7ac58955534 SHA512 32a79a4bb10a5b60ff8fbedb541e72ac248b0b5cdbcb98b6a7371b984420e735838ac86495e058c937a593870b0f49053033dc999d1ac3879504433ed5885b64 +EBUILD nss-3.49.1.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6 +EBUILD nss-3.49.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0 diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.21-enable-pem.patch deleted file mode 100644 index e6de275787dc..000000000000 --- a/dev-libs/nss/files/nss-3.21-enable-pem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nss/lib/ckfw/manifest.mn -+++ nss/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.32-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch deleted file mode 100644 index 1773da98819c..000000000000 --- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001 -From: "Jory A. Pratt" -Date: Fri, 28 Jul 2017 14:00:41 -0500 -Subject: [PATCH] add pkg-config file - -Signed-off-by: Jory A. Pratt ---- - 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 -+++ b/config/Makefile -@@ -0,0 +1,40 @@ -+CORE_DEPTH = .. -+DEPTH = .. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/lib64," \ -+ -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 -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../config/nss-config $(DIST)/bin -+ -+libs: -+ -+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 -+++ b/config/nss-config.in -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=$optarg -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=$optarg -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=$optarg -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=$optarg -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "$exec_prefix"; then -+ exec_prefix=`pkg-config --variable=exec_prefix nss` -+fi -+if test -z "$includedir"; then -+ includedir=`pkg-config --variable=includedir nss` -+fi -+if test -z "$libdir"; then -+ libdir=`pkg-config --variable=libdir nss` -+fi -+ -+if test "$echo_prefix" = "yes"; then -+ echo $prefix -+fi -+ -+if test "$echo_exec_prefix" = "yes"; then -+ echo $exec_prefix -+fi -+ -+if test "$echo_includedir" = "yes"; then -+ echo $includedir -+fi -+ -+if test "$echo_libdir" = "yes"; then -+ echo $libdir -+fi -+ -+if test "$echo_cflags" = "yes"; then -+ echo -I$includedir -+fi -+ -+if test "$echo_libs" = "yes"; then -+ libdirs="" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${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}" -+ fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" -+ fi -+ echo $libdirs -+fi -+ -diff --git a/config/nss.pc.in b/config/nss.pc.in -new file mode 100644 -index 0000000..df9e2cf ---- /dev/null -+++ b/config/nss.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+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 -+Cflags: -I${includedir} -+ -diff --git a/manifest.mn b/manifest.mn -index 500a5ad..87c905e 100644 ---- a/manifest.mn -+++ b/manifest.mn -@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ - - RELEASE = nss - --DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cmd cpputil config --- -2.13.3 - diff --git a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch deleted file mode 100644 index 57b4cdaf5a5d..000000000000 --- a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch +++ /dev/null @@ -1,531 +0,0 @@ -From d54a1f812ae23ec11d2af6ed93ba1a11609421a8 Mon Sep 17 00:00:00 2001 -From: "J.C. Jones" -Date: Mon, 14 Jan 2019 10:35:25 -0700 -Subject: [PATCH] Bug 1507135 - Add additional null checks to CMS message - functions r=mt - -Differential review: https://phabricator.services.mozilla.com//D16488 - ---HG-- -branch : NSS_3_36_BRANCH -extra : transplant_source : 1%02%80%21%BE%C8B%D5%21%D7%0CR%00%ED%B6%EA%84a%FA%23 ---- - lib/smime/cmsmessage.c | 69 ++++++++++++++++++++++++++++++++++++------ - 1 file changed, 59 insertions(+), 10 deletions(-) - -diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c -index 27d1256ec..f41a432b1 100644 ---- a/lib/smime/cmsmessage.c -+++ b/lib/smime/cmsmessage.c -@@ -29,8 +29,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) - - if (poolp == NULL) { - poolp = PORT_NewArena(1024); /* XXX what is right value? */ -- if (poolp == NULL) -+ if (poolp == NULL) { - return NULL; -+ } - poolp_is_ours = PR_TRUE; - } - -@@ -44,8 +45,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) - if (mark) { - PORT_ArenaRelease(poolp, mark); - } -- } else -+ } else { - PORT_FreeArena(poolp, PR_FALSE); -+ } - return NULL; - } - -@@ -53,8 +55,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) - cmsg->poolp_is_ours = poolp_is_ours; - cmsg->refCount = 1; - -- if (mark) -+ if (mark) { - PORT_ArenaUnmark(poolp, mark); -+ } - - return cmsg; - } -@@ -73,8 +76,13 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg, - NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg, - SECAlgorithmID **detached_digestalgs, SECItem **detached_digests) - { -- if (pwfn) -+ if (cmsg == NULL) { -+ return; -+ } -+ if (pwfn) { - PK11_SetPasswordFunc(pwfn); -+ } -+ - cmsg->pwfn_arg = pwfn_arg; - cmsg->decrypt_key_cb = decrypt_key_cb; - cmsg->decrypt_key_cb_arg = decrypt_key_cb_arg; -@@ -89,18 +97,21 @@ void - NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) - { - PORT_Assert(cmsg->refCount > 0); -- if (cmsg->refCount <= 0) /* oops */ -+ if (cmsg->refCount <= 0) { /* oops */ - return; -+ } - - cmsg->refCount--; /* thread safety? */ -- if (cmsg->refCount > 0) -+ if (cmsg->refCount > 0) { - return; -+ } - - NSS_CMSContentInfo_Destroy(&(cmsg->contentInfo)); - - /* if poolp is not NULL, cmsg is the owner of its arena */ -- if (cmsg->poolp_is_ours) -+ if (cmsg->poolp_is_ours) { - PORT_FreeArena(cmsg->poolp, PR_FALSE); /* XXX clear it? */ -+ } - } - - /* -@@ -112,8 +123,9 @@ NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) - NSSCMSMessage * - NSS_CMSMessage_Copy(NSSCMSMessage *cmsg) - { -- if (cmsg == NULL) -+ if (cmsg == NULL) { - return NULL; -+ } - - PORT_Assert(cmsg->refCount > 0); - -@@ -127,6 +139,10 @@ NSS_CMSMessage_Copy(NSSCMSMessage *cmsg) - PLArenaPool * - NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg) - { -+ if (cmsg == NULL) { -+ return NULL; -+ } -+ - return cmsg->poolp; - } - -@@ -136,6 +152,10 @@ NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg) - NSSCMSContentInfo * - NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg) - { -+ if (cmsg == NULL) { -+ return NULL; -+ } -+ - return &(cmsg->contentInfo); - } - -@@ -147,6 +167,10 @@ NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg) - SECItem * - NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg) - { -+ if (cmsg == NULL) { -+ return NULL; -+ } -+ - /* this is a shortcut */ - NSSCMSContentInfo *cinfo = NSS_CMSMessage_GetContentInfo(cmsg); - SECItem *pItem = NSS_CMSContentInfo_GetInnerContent(cinfo); -@@ -164,6 +188,10 @@ NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg) - int count = 0; - NSSCMSContentInfo *cinfo; - -+ if (cmsg == NULL) { -+ return 0; -+ } -+ - /* walk down the chain of contentinfos */ - for (cinfo = &(cmsg->contentInfo); cinfo != NULL;) { - count++; -@@ -183,6 +211,10 @@ NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n) - int count = 0; - NSSCMSContentInfo *cinfo; - -+ if (cmsg == NULL) { -+ return NULL; -+ } -+ - /* walk down the chain of contentinfos */ - for (cinfo = &(cmsg->contentInfo); cinfo != NULL && count < n; - cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { -@@ -200,6 +232,10 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg) - { - NSSCMSContentInfo *cinfo; - -+ if (cmsg == NULL) { -+ return PR_FALSE; -+ } -+ - /* descend into CMS message */ - for (cinfo = &(cmsg->contentInfo); cinfo != NULL; - cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { -@@ -221,6 +257,10 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg) - { - NSSCMSContentInfo *cinfo; - -+ if (cmsg == NULL) { -+ return PR_FALSE; -+ } -+ - /* walk down the chain of contentinfos */ - for (cinfo = &(cmsg->contentInfo); cinfo != NULL; - cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { -@@ -251,13 +291,21 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg) - { - NSSCMSContentInfo *cinfo; - -+ if (cmsg == NULL) { -+ return PR_FALSE; -+ } -+ - /* walk down the chain of contentinfos */ - for (cinfo = &(cmsg->contentInfo); cinfo != NULL; - cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { - switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) { - case SEC_OID_PKCS7_SIGNED_DATA: -- if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) -+ if (cinfo->content.signedData == NULL) { -+ return PR_FALSE; -+ } -+ if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) { - return PR_TRUE; -+ } - break; - default: - /* callback here for generic wrappers? */ -@@ -278,8 +326,9 @@ NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen) - { - SECItem *item = NULL; - -- if (cmsg == NULL) -+ if (cmsg == NULL) { - return PR_TRUE; -+ } - - item = NSS_CMSContentInfo_GetContent(NSS_CMSMessage_GetContentInfo(cmsg)); - -From fa26771e9515cc82c941fcef689dd797a3e308c3 Mon Sep 17 00:00:00 2001 -From: "J.C. Jones" -Date: Fri, 11 Jan 2019 22:33:16 -0700 -Subject: [PATCH] Bug 1507174 - Add additional null checks to other CMS - functions r=mt - -Differential review: https://phabricator.services.mozilla.com//D16383 - ---HG-- -branch : NSS_3_36_BRANCH -extra : transplant_source : %B5%A8su%96%5B%BE%F9%CD%93%E0%EE%93a4c%1BYp%09 ---- - lib/smime/cmscinfo.c | 92 ++++++++++++++++++++++++++++++++++++------ - lib/smime/cmsdigdata.c | 4 +- - lib/smime/cmsencdata.c | 4 +- - lib/smime/cmsenvdata.c | 5 +++ - lib/smime/cmsmessage.c | 3 ++ - lib/smime/cmsudf.c | 2 +- - 6 files changed, 95 insertions(+), 15 deletions(-) - -diff --git a/lib/smime/cmscinfo.c b/lib/smime/cmscinfo.c -index 08db662f8..453ccaada 100644 ---- a/lib/smime/cmscinfo.c -+++ b/lib/smime/cmscinfo.c -@@ -51,6 +51,10 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo) - { - SECOidTag kind; - -+ if (cinfo == NULL) { -+ return; -+ } -+ - kind = NSS_CMSContentInfo_GetContentTypeTag(cinfo); - switch (kind) { - case SEC_OID_PKCS7_ENVELOPED_DATA: -@@ -86,6 +90,11 @@ NSSCMSContentInfo * - NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo) - { - NSSCMSContentInfo *ccinfo = NULL; -+ -+ if (cinfo == NULL) { -+ return NULL; -+ } -+ - SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo); - switch (tag) { - case SEC_OID_PKCS7_SIGNED_DATA: -@@ -127,6 +136,9 @@ SECStatus - NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream) - { - SECStatus rv; -+ if (cinfo == NULL) { -+ return SECFailure; -+ } - - rv = NSS_CMSContentInfo_Private_Init(cinfo); - if (rv != SECSuccess) { -@@ -145,15 +157,20 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, - SECOidTag type, void *ptr) - { - SECStatus rv; -+ if (cinfo == NULL || cmsg == NULL) { -+ return SECFailure; -+ } - - cinfo->contentTypeTag = SECOID_FindOIDByTag(type); -- if (cinfo->contentTypeTag == NULL) -+ if (cinfo->contentTypeTag == NULL) { - return SECFailure; -+ } - - /* do not copy the oid, just create a reference */ - rv = SECITEM_CopyItem(cmsg->poolp, &(cinfo->contentType), &(cinfo->contentTypeTag->oid)); -- if (rv != SECSuccess) -+ if (rv != SECSuccess) { - return SECFailure; -+ } - - cinfo->content.pointer = ptr; - -@@ -185,8 +202,9 @@ SECStatus - NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, - SECItem *data, PRBool detached) - { -- if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) -+ if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) { - return SECFailure; -+ } - if (detached) { - cinfo->rawContent = NULL; - } -@@ -230,6 +248,10 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn - void * - NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo) - { -+ if (cinfo == NULL) { -+ return NULL; -+ } -+ - SECOidTag tag = cinfo->contentTypeTag - ? cinfo->contentTypeTag->offset - : SEC_OID_UNKNOWN; -@@ -260,6 +282,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo) - SECOidTag tag; - SECItem *pItem = NULL; - -+ if (cinfo == NULL) { -+ return NULL; -+ } -+ - tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo); - if (NSS_CMSType_IsData(tag)) { - pItem = cinfo->content.data; -@@ -282,6 +308,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo) - SECOidTag - NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo) - { -+ if (cinfo == NULL) { -+ return SEC_OID_UNKNOWN; -+ } -+ - if (cinfo->contentTypeTag == NULL) - cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType)); - -@@ -294,11 +324,17 @@ NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo) - SECItem * - NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo) - { -- if (cinfo->contentTypeTag == NULL) -+ if (cinfo == NULL) { -+ return NULL; -+ } -+ -+ if (cinfo->contentTypeTag == NULL) { - cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType)); -+ } - -- if (cinfo->contentTypeTag == NULL) -+ if (cinfo->contentTypeTag == NULL) { - return NULL; -+ } - - return &(cinfo->contentTypeTag->oid); - } -@@ -310,8 +346,13 @@ NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo) - SECOidTag - NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo) - { -- if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) -+ if (cinfo == NULL) { -+ return SEC_OID_UNKNOWN; -+ } -+ -+ if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) { - cinfo->contentEncAlgTag = SECOID_GetAlgorithmTag(&(cinfo->contentEncAlg)); -+ } - - return cinfo->contentEncAlgTag; - } -@@ -322,6 +363,10 @@ NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo) - SECAlgorithmID * - NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo) - { -+ if (cinfo == NULL) { -+ return NULL; -+ } -+ - return &(cinfo->contentEncAlg); - } - -@@ -330,10 +375,14 @@ NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo - SECOidTag bulkalgtag, SECItem *parameters, int keysize) - { - SECStatus rv; -+ if (cinfo == NULL) { -+ return SECFailure; -+ } - - rv = SECOID_SetAlgorithmID(poolp, &(cinfo->contentEncAlg), bulkalgtag, parameters); -- if (rv != SECSuccess) -+ if (rv != SECSuccess) { - return SECFailure; -+ } - cinfo->keysize = keysize; - return SECSuccess; - } -@@ -343,27 +392,42 @@ NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cin - SECAlgorithmID *algid, int keysize) - { - SECStatus rv; -+ if (cinfo == NULL) { -+ return SECFailure; -+ } - - rv = SECOID_CopyAlgorithmID(poolp, &(cinfo->contentEncAlg), algid); -- if (rv != SECSuccess) -+ if (rv != SECSuccess) { - return SECFailure; -- if (keysize >= 0) -+ } -+ if (keysize >= 0) { - cinfo->keysize = keysize; -+ } - return SECSuccess; - } - - void - NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey) - { -- cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey); -- cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg)); -+ if (cinfo == NULL) { -+ return; -+ } -+ -+ if (bulkkey == NULL) { -+ cinfo->bulkkey = NULL; -+ cinfo->keysize = 0; -+ } else { -+ cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey); -+ cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg)); -+ } - } - - PK11SymKey * - NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo) - { -- if (cinfo->bulkkey == NULL) -+ if (cinfo == NULL || cinfo->bulkkey == NULL) { - return NULL; -+ } - - return PK11_ReferenceSymKey(cinfo->bulkkey); - } -@@ -371,5 +435,9 @@ NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo) - int - NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo) - { -+ if (cinfo == NULL) { -+ return 0; -+ } -+ - return cinfo->keysize; - } -diff --git a/lib/smime/cmsdigdata.c b/lib/smime/cmsdigdata.c -index 9ea22702e..a249686bb 100644 ---- a/lib/smime/cmsdigdata.c -+++ b/lib/smime/cmsdigdata.c -@@ -56,7 +56,9 @@ void - NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd) - { - /* everything's in a pool, so don't worry about the storage */ -- NSS_CMSContentInfo_Destroy(&(digd->contentInfo)); -+ if (digd != NULL) { -+ NSS_CMSContentInfo_Destroy(&(digd->contentInfo)); -+ } - return; - } - -diff --git a/lib/smime/cmsencdata.c b/lib/smime/cmsencdata.c -index c3a4549ad..8b520b439 100644 ---- a/lib/smime/cmsencdata.c -+++ b/lib/smime/cmsencdata.c -@@ -87,7 +87,9 @@ void - NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd) - { - /* everything's in a pool, so don't worry about the storage */ -- NSS_CMSContentInfo_Destroy(&(encd->contentInfo)); -+ if (encd != NULL) { -+ NSS_CMSContentInfo_Destroy(&(encd->contentInfo)); -+ } - return; - } - -diff --git a/lib/smime/cmsenvdata.c b/lib/smime/cmsenvdata.c -index f2c8e171d..9bc77be8b 100644 ---- a/lib/smime/cmsenvdata.c -+++ b/lib/smime/cmsenvdata.c -@@ -144,6 +144,11 @@ NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd) - poolp = envd->cmsg->poolp; - cinfo = &(envd->contentInfo); - -+ if (cinfo == NULL) { -+ PORT_SetError(SEC_ERROR_BAD_DATA); -+ goto loser; -+ } -+ - recipientinfos = envd->recipientInfos; - if (recipientinfos == NULL) { - PORT_SetError(SEC_ERROR_BAD_DATA); -diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c -index f41a432b1..366b71aba 100644 ---- a/lib/smime/cmsmessage.c -+++ b/lib/smime/cmsmessage.c -@@ -96,6 +96,9 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg, - void - NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) - { -+ if (cmsg == NULL) -+ return; -+ - PORT_Assert(cmsg->refCount > 0); - if (cmsg->refCount <= 0) { /* oops */ - return; -diff --git a/lib/smime/cmsudf.c b/lib/smime/cmsudf.c -index 3ef4268d4..5c8a81e6d 100644 ---- a/lib/smime/cmsudf.c -+++ b/lib/smime/cmsudf.c -@@ -239,7 +239,7 @@ NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd) - { - const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type); - -- if (typeInfo && typeInfo->destroy) { -+ if (typeInfo && (typeInfo->destroy) && (gd != NULL)) { - (*typeInfo->destroy)(gd); - } - } diff --git a/dev-libs/nss/nss-3.49.1.ebuild b/dev-libs/nss/nss-3.49.1.ebuild new file mode 100644 index 000000000000..bec0e4b6e2f6 --- /dev/null +++ b/dev-libs/nss/nss-3.49.1.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal + +NSPR_VER="4.24" +RTM_NAME="NSS_${PV//./_}_RTM" +# Rev of https://git.fedorahosted.org/cgit/nss-pem.git +PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" +PEM_P="${PN}-pem-20160329" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz + cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) + nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" + +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-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="cacert +nss-pem utils" +BDEPEND=" + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" +RDEPEND=" + >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +S="${WORKDIR}/${P}/${PN}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nss-config +) + +PATCHES=( + # Custom changes for gentoo + "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" + "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" +) + +src_unpack() { + unpack ${A} + if use nss-pem ; then + mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die + fi +} + +src_prepare() { + if use nss-pem ; then + PATCHES+=( + "${FILESDIR}/${PN}-3.47-enable-pem.patch" + ) + fi + if use cacert ; then #521462 + PATCHES+=( + "${DISTDIR}/${PN}-cacert-class1-class3.patch" + ) + fi + + default + + pushd coreconf >/dev/null || die + # hack nspr paths + echo 'INCLUDES += -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + popd >/dev/null || die + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + config/Makefile || die + + # use host shlibsign if need be #436216 + if tc-is-cross-compiler ; then + sed -i \ + -e 's:"${2}"/shlibsign:shlibsign:' \ + cmd/shlibsign/sign.sh || die + fi + + # dirty hack + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die + + multilib_copy_sources + + strip-flags +} + +multilib_src_configure() { + # Ensure we stay multilib aware + sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die +} + +nssarch() { + # Most of the arches are the same as $ARCH + local t=${1:-${CHOST}} + case ${t} in + aarch64*)echo "aarch64";; + hppa*) echo "parisc";; + i?86*) echo "i686";; + x86_64*) echo "x86_64";; + *) tc-arch ${t};; + esac +} + +nssbits() { + local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" + if [[ ${1} == BUILD_ ]]; then + cc=$(tc-getBUILD_CC) + else + cc=$(tc-getCC) + fi + echo > "${T}"/test.c || die + ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die + case $(file "${T}/${1}test.o") in + *32-bit*x86-64*) echo USE_X32=1;; + *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; + esac +} + +multilib_src_compile() { + # use ABI to determine bit'ness, or fallback if unset + local buildbits mybits + case "${ABI}" in + n32) mybits="USE_N32=1";; + x32) mybits="USE_X32=1";; + s390x|*64) mybits="USE_64=1";; + ${DEFAULT_ABI}) + einfo "Running compilation test to determine bit'ness" + mybits=$(nssbits) + ;; + esac + # bitness of host may differ from target + if tc-is-cross-compiler; then + buildbits=$(nssbits BUILD_) + fi + + local makeargs=( + CC="$(tc-getCC)" + CCC="$(tc-getCXX)" + AR="$(tc-getAR) rc \$@" + RANLIB="$(tc-getRANLIB)" + OPTIMIZER= + ${mybits} + ) + + # Take care of nspr settings #436216 + local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" + unset NSPR_INCLUDE_DIR + + # Do not let `uname` be used. + if use kernel_linux ; then + makeargs+=( + OS_TARGET=Linux + OS_RELEASE=2.6 + OS_TEST="$(nssarch)" + ) + fi + + export NSS_ALLOW_SSLKEYLOGFILE=1 + export NSS_ENABLE_WERROR=0 #567158 + 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="" + + local d + + # Build the host tools first. + LDFLAGS="${BUILD_LDFLAGS}" \ + XCFLAGS="${BUILD_CFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 -C coreconf \ + CC="$(tc-getBUILD_CC)" \ + ${buildbits:-${mybits}} + makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) + + # Then build the target tools. + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" \ + XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 "${makeargs[@]}" -C ${d} + done +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +multilib_src_install() { + pushd dist >/dev/null || die + + dodir /usr/$(get_libdir) + cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" + local i + for i in crmf freebl nssb nssckfw ; do + cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" + done + + # Install nss-config and pkgconfig file + dodir /usr/bin + cp -L */bin/nss-config "${ED}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die + + # create an nss-softokn.pc from nss.pc for libfreebl and some private headers + # bug 517266 + sed -e 's#Libs:#Libs: -lfreebl#' \ + -e 's#Cflags:#Cflags: -I${includedir}/private#' \ + */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ + || die "could not create nss-softokn.pc" + + # all the include files + insinto /usr/include/nss + doins public/nss/*.{h,api} + insinto /usr/include/nss/private + doins private/nss/{blapi,alghmac}.h + + popd >/dev/null || die + + local f nssutils + # Always enabled because we need it for chk generation. + nssutils=( shlibsign ) + + if multilib_is_native_abi ; then + if use utils; then + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + # checkcert utils has been removed in nss-3.22: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870 + # certcgi has been removed in nss-3.36: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 + nssutils+=( + addbuiltin + atob + baddbdir + btoa + certutil + cmsutil + conflict + crlutil + derdump + digest + makepqg + mangle + modutil + multinit + nonspr10 + ocspclnt + oidcalc + p7content + p7env + p7sign + p7verify + pk11mode + pk12util + pp + rsaperf + selfserv + signtool + signver + ssltap + strsclnt + symkeyutil + tstclnt + vfychain + vfyserv + ) + # install man-pages for utils (bug #516810) + doman doc/nroff/*.1 + fi + pushd dist/*/bin >/dev/null || die + for f in ${nssutils[@]}; do + dobin ${f} + done + popd >/dev/null || die + fi + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + dodir /etc/prelink.conf.d + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ + > "${ED}"/etc/prelink.conf.d/nss.conf +} + +pkg_postinst() { + multilib_pkg_postinst() { + # We must re-sign the libraries AFTER they are stripped. + local shlibsign="${EROOT}/usr/bin/shlibsign" + # See if we can execute it (cross-compiling & such). #436216 + "${shlibsign}" -h >&/dev/null + if [[ $? -gt 1 ]] ; then + shlibsign="shlibsign" + fi + generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postinst +} + +pkg_postrm() { + multilib_pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postrm +} diff --git a/dev-libs/nss/nss-3.49.ebuild b/dev-libs/nss/nss-3.49.ebuild new file mode 100644 index 000000000000..bec0e4b6e2f6 --- /dev/null +++ b/dev-libs/nss/nss-3.49.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal + +NSPR_VER="4.24" +RTM_NAME="NSS_${PV//./_}_RTM" +# Rev of https://git.fedorahosted.org/cgit/nss-pem.git +PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" +PEM_P="${PN}-pem-20160329" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz + cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) + nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" + +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-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="cacert +nss-pem utils" +BDEPEND=" + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" +RDEPEND=" + >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +S="${WORKDIR}/${P}/${PN}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nss-config +) + +PATCHES=( + # Custom changes for gentoo + "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" + "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" +) + +src_unpack() { + unpack ${A} + if use nss-pem ; then + mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die + fi +} + +src_prepare() { + if use nss-pem ; then + PATCHES+=( + "${FILESDIR}/${PN}-3.47-enable-pem.patch" + ) + fi + if use cacert ; then #521462 + PATCHES+=( + "${DISTDIR}/${PN}-cacert-class1-class3.patch" + ) + fi + + default + + pushd coreconf >/dev/null || die + # hack nspr paths + echo 'INCLUDES += -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + popd >/dev/null || die + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + config/Makefile || die + + # use host shlibsign if need be #436216 + if tc-is-cross-compiler ; then + sed -i \ + -e 's:"${2}"/shlibsign:shlibsign:' \ + cmd/shlibsign/sign.sh || die + fi + + # dirty hack + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die + + multilib_copy_sources + + strip-flags +} + +multilib_src_configure() { + # Ensure we stay multilib aware + sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die +} + +nssarch() { + # Most of the arches are the same as $ARCH + local t=${1:-${CHOST}} + case ${t} in + aarch64*)echo "aarch64";; + hppa*) echo "parisc";; + i?86*) echo "i686";; + x86_64*) echo "x86_64";; + *) tc-arch ${t};; + esac +} + +nssbits() { + local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" + if [[ ${1} == BUILD_ ]]; then + cc=$(tc-getBUILD_CC) + else + cc=$(tc-getCC) + fi + echo > "${T}"/test.c || die + ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die + case $(file "${T}/${1}test.o") in + *32-bit*x86-64*) echo USE_X32=1;; + *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; + esac +} + +multilib_src_compile() { + # use ABI to determine bit'ness, or fallback if unset + local buildbits mybits + case "${ABI}" in + n32) mybits="USE_N32=1";; + x32) mybits="USE_X32=1";; + s390x|*64) mybits="USE_64=1";; + ${DEFAULT_ABI}) + einfo "Running compilation test to determine bit'ness" + mybits=$(nssbits) + ;; + esac + # bitness of host may differ from target + if tc-is-cross-compiler; then + buildbits=$(nssbits BUILD_) + fi + + local makeargs=( + CC="$(tc-getCC)" + CCC="$(tc-getCXX)" + AR="$(tc-getAR) rc \$@" + RANLIB="$(tc-getRANLIB)" + OPTIMIZER= + ${mybits} + ) + + # Take care of nspr settings #436216 + local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" + unset NSPR_INCLUDE_DIR + + # Do not let `uname` be used. + if use kernel_linux ; then + makeargs+=( + OS_TARGET=Linux + OS_RELEASE=2.6 + OS_TEST="$(nssarch)" + ) + fi + + export NSS_ALLOW_SSLKEYLOGFILE=1 + export NSS_ENABLE_WERROR=0 #567158 + 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="" + + local d + + # Build the host tools first. + LDFLAGS="${BUILD_LDFLAGS}" \ + XCFLAGS="${BUILD_CFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 -C coreconf \ + CC="$(tc-getBUILD_CC)" \ + ${buildbits:-${mybits}} + makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) + + # Then build the target tools. + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" \ + XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 "${makeargs[@]}" -C ${d} + done +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +multilib_src_install() { + pushd dist >/dev/null || die + + dodir /usr/$(get_libdir) + cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" + local i + for i in crmf freebl nssb nssckfw ; do + cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" + done + + # Install nss-config and pkgconfig file + dodir /usr/bin + cp -L */bin/nss-config "${ED}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die + + # create an nss-softokn.pc from nss.pc for libfreebl and some private headers + # bug 517266 + sed -e 's#Libs:#Libs: -lfreebl#' \ + -e 's#Cflags:#Cflags: -I${includedir}/private#' \ + */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ + || die "could not create nss-softokn.pc" + + # all the include files + insinto /usr/include/nss + doins public/nss/*.{h,api} + insinto /usr/include/nss/private + doins private/nss/{blapi,alghmac}.h + + popd >/dev/null || die + + local f nssutils + # Always enabled because we need it for chk generation. + nssutils=( shlibsign ) + + if multilib_is_native_abi ; then + if use utils; then + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + # checkcert utils has been removed in nss-3.22: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870 + # certcgi has been removed in nss-3.36: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 + nssutils+=( + addbuiltin + atob + baddbdir + btoa + certutil + cmsutil + conflict + crlutil + derdump + digest + makepqg + mangle + modutil + multinit + nonspr10 + ocspclnt + oidcalc + p7content + p7env + p7sign + p7verify + pk11mode + pk12util + pp + rsaperf + selfserv + signtool + signver + ssltap + strsclnt + symkeyutil + tstclnt + vfychain + vfyserv + ) + # install man-pages for utils (bug #516810) + doman doc/nroff/*.1 + fi + pushd dist/*/bin >/dev/null || die + for f in ${nssutils[@]}; do + dobin ${f} + done + popd >/dev/null || die + fi + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + dodir /etc/prelink.conf.d + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ + > "${ED}"/etc/prelink.conf.d/nss.conf +} + +pkg_postinst() { + multilib_pkg_postinst() { + # We must re-sign the libraries AFTER they are stripped. + local shlibsign="${EROOT}/usr/bin/shlibsign" + # See if we can execute it (cross-compiling & such). #436216 + "${shlibsign}" -h >&/dev/null + if [[ $? -gt 1 ]] ; then + shlibsign="shlibsign" + fi + generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postinst +} + +pkg_postrm() { + multilib_pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postrm +} -- cgit v1.2.3