[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2024-08-02 Thread Joonas Niilola
commit: 6ddeb6dd95cf0c75ec02179600ef72f5ed22230f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Aug  2 13:18:49 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug  2 13:18:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ddeb6dd

dev-libs/nss: add 3.103

 - rebase nss-3.53-gentoo-fixups.patch to apply on 3.103,
 - update comment about 'standard' and 'full' test cycle differences.

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/nss/Manifest  |   1 +
 ...ss-3.103-gentoo-fixes-add-pkgconfig-files.patch | 268 +
 dev-libs/nss/nss-3.103.ebuild  | 419 +
 3 files changed, 688 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 40e2084d85bf..12673537ba54 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,5 +3,6 @@ DIST nss-3.101.1.tar.gz 76462490 BLAKE2B 
578a5ce6c9157c25db801a3fe37e094d8005130
 DIST nss-3.101.2.tar.gz 76462495 BLAKE2B 
3a0dfd7aa68bc11f332decfc9cb7003b8d8fa6a9dad556ad736229d7d3847e68aeaf5b74e68989a0483bd1b9e2e3afd3bdf8df3d428ebc815eda9a255f5695aa
 SHA512 
65ac338ee1b13ecc2b190f1ea39c987110a06f3b67610e094ffc1ef4117d487c34af1e11b90de0c28035bfc5cb10ca7996ed991d9afce7985973fabb48cd7ac8
 DIST nss-3.102.1.tar.gz 76460182 BLAKE2B 
47e61d13bf4d6615ecc830d7c745a7a736fe5f1b4de7375f4cf9274db8f42b5ea7cd737e03f6a83e26579cfec1ff1b349e24e548a57fd2d0950b955bfd208851
 SHA512 
1df10aab1f37c1d00dc3b81aaa341f99c2bac22997aae412ee639e0959ffa37e35cbc21b0f90c2612401aadb119bab4202209186f54fb8d58cf7c3123456e90f
 DIST nss-3.102.tar.gz 76455599 BLAKE2B 
78eb95279640dcc46c29decd35fc4c2a2a591c5a39b8dbfcb232d72a08d1ee44d836ce8ee06fff2fe677d3ea19a8b6219a1fe9296f9b56ebfbab7295583e71fe
 SHA512 
2706f15447afd6c26f6784e56c01e8328456523b464a2df2b054f230b6e6b5db2fdeccac74f4f4f0d683d7d4471a8ec1321102082d8a22d91887153a60ffac5b
+DIST nss-3.103.tar.gz 76470174 BLAKE2B 
0d57ad2479f26d0ff8f3021b435ee936e82408e5f3f213804397934f1d01c2178f641247cfc84de36616eb92d06fb002fb77a4285ff84a86a3217e960d175475
 SHA512 
bc7680fc34d84de7953b27f1a220681f3f5c5a501a82be210ec6134894313f6a2c9bfcc350f4802152a5e3a1fc2defc74d700445ade338d6c86a923ac8b4dc75
 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 
74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222
 SHA512 
048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git 
a/dev-libs/nss/files/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch 
b/dev-libs/nss/files/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch
new file mode 100644
index ..85676f8d9eaa
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch
@@ -0,0 +1,268 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2024-08-01 16:24:30.0 +0300
 b/Makefile 2024-08-02 10:27:34.449032964 +0300
+@@ -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/.
+ 
++default: nss_build_all
++
+ ###
+ # (1) Include initial platform-independent assignments (MANDATORY).   #
+ ###
+@@ -48,12 +50,9 @@
+ ###
+ 
+ nss_build_all:
+-  $(MAKE) build_nspr
+   $(MAKE) all
+-  $(MAKE) latest
+ 
+ nss_clean_all:
+-  $(MAKE) clobber_nspr
+   $(MAKE) clobber
+ 
+ NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+@@ -138,21 +137,6 @@
+   --prefix='$(NSS_GYP_PREFIX)'
+ endif
+ 
+-ifndef NSS_DISABLE_NSPR_TESTS
+-build_nspr: $(NSPR_CONFIG_STATUS)
+-  $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-  $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
+-else
+-build_nspr: $(NSPR_CONFIG_STATUS)
+-  $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-endif
+-
+-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 -Naur a/config/Makefile b/config/Makefile
+--- /dev/null
 b/config/Makefile
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH  = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = $(shell grep -F "NSS_VMAJOR" ../lib/nss/nss.h | awk 
'{print $$3}')
++NSS_MINOR_VERSION = $(shell grep -F 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2024-04-15 Thread Joonas Niilola
commit: 53f7db69d823842e9ab24aae0107928ae794fb33
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Apr 15 06:40:00 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 15 06:40:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f7db69

dev-libs/nss: revbump 3.90.2 ESR with a patch from upstream

Bug: https://bugs.gentoo.org/928401
Bug: https://bugs.gentoo.org/928403
Signed-off-by: Joonas Niilola  gentoo.org>

 .../nss-3.90-remove-support-of-curve25519.patch|  78 
 dev-libs/nss/nss-3.90.2-r1.ebuild  | 420 +
 2 files changed, 498 insertions(+)

diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch 
b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
new file mode 100644
index ..d883db8181d1
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
@@ -0,0 +1,78 @@
+# HG changeset patch
+# User Natalia Kulatova 
+# Date 1687519432 0
+#  Fri Jun 23 11:23:52 2023 +
+# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72
+# Parent  f095bf91ffaa273ea38ca6df34c905e5442de012
+Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers
+
+Differential Revision: https://phabricator.services.mozilla.com/D180068
+
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile
+--- a/lib/freebl/Makefile  Fri Jun 23 08:56:27 2023 +
 b/lib/freebl/Makefile  Fri Jun 23 11:23:52 2023 +
+@@ -568,9 +568,6 @@
+ HAVE_INT128_SUPPORT = 1
+ DEFINES += -DHAVE_INT128_SUPPORT
+ else ifeq (1,$(CC_IS_GCC))
+-ifeq ($(CPU_ARCH),x86_64)
+-SUPPORTS_VALE_CURVE25519 = 1
+-endif
+ ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 
2,$(GCC_VERSION
+ HAVE_INT128_SUPPORT = 1
+ DEFINES += -DHAVE_INT128_SUPPORT
+@@ -595,11 +592,6 @@
+ DEFINES += -DKRML_VERIFIED_UINT128
+ endif
+ 
+-ifdef SUPPORTS_VALE_CURVE25519
+-VERIFIED_SRCS += Hacl_Curve25519_64.c
+-DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
+-endif
+-
+ ifndef NSS_DISABLE_CHACHAPOLY
+ ifeq ($(CPU_ARCH),x86_64)
+ ifndef NSS_DISABLE_AVX2
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp
+--- a/lib/freebl/freebl.gypFri Jun 23 08:56:27 2023 +
 b/lib/freebl/freebl.gypFri Jun 23 11:23:52 2023 +
+@@ -866,12 +866,6 @@
+   }],
+ ],
+   }],
+-  [ 'supports_vale_curve25519==1', {
+-'defines': [
+-  # The Makefile does version-tests on GCC, but we're not doing that 
here.
+-  'HACL_CAN_COMPILE_INLINE_ASM',
+-],
+-  }],
+   [ 'OS=="linux" or OS=="android"', {
+ 'conditions': [
+   [ 'target_arch=="x64"', {
+@@ -934,11 +928,6 @@
+   'variables': {
+ 'module': 'nss',
+ 'conditions': [
+-  [ 'target_arch=="x64" and cc_is_gcc==1', {
+-'supports_vale_curve25519%': 1,
+-  }, {
+-'supports_vale_curve25519%': 0,
+-  }],
+   [ 'target_arch=="x64" or target_arch=="arm64" or 
target_arch=="aarch64"', {
+ 'have_int128_support%': 1,
+   }, {
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi
+--- a/lib/freebl/freebl_base.gypi  Fri Jun 23 08:56:27 2023 +
 b/lib/freebl/freebl_base.gypi  Fri Jun 23 11:23:52 2023 +
+@@ -154,11 +154,6 @@
+ 'ecl/curve25519_32.c',
+   ],
+ }],
+-['supports_vale_curve25519==1', {
+-  'sources': [
+-'verified/Hacl_Curve25519_64.c',
+-  ],
+-}],
+ ['(target_arch!="ppc64" and target_arch!="ppc64le") or 
disable_altivec==1', {
+   'sources': [
+ # Gyp does not support per-file cflags, so working around like this.

diff --git a/dev-libs/nss/nss-3.90.2-r1.ebuild 
b/dev-libs/nss/nss-3.90.2-r1.ebuild
new file mode 100644
index ..f1b7e6697ccc
--- /dev/null
+++ b/dev-libs/nss/nss-3.90.2-r1.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI 
support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+   cacert? ( 
https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 
cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+   

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2024-03-17 Thread Joonas Niilola
commit: 31089ae8f5885ba9b6f2fef5c1bc195614f634d2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar 17 08:17:37 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 17 08:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31089ae8

dev-libs/nss: fix 3.90.2esr on arm64 with an upstream patch

Closes: https://bugs.gentoo.org/926625
Signed-off-by: Joonas Niilola  gentoo.org>

 ...-1885749-disable-ASM-C25519-on-non-X86_64.patch | 35 ++
 dev-libs/nss/nss-3.90.2.ebuild |  1 +
 2 files changed, 36 insertions(+)

diff --git 
a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
 
b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
new file mode 100644
index ..e5769308144c
--- /dev/null
+++ 
b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Natalia Kulatova 
+# Date 1685981398 0
+# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a
+# Parent  52969cff7db635e0ee10fad66eed2c0cfdcf999b
+Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers
+
+Differential Revision: https://phabricator.services.mozilla.com/D179969
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
 b/lib/freebl/Makefile
+@@ -563,17 +563,19 @@ endif # target == SunO
+ ifdef USE_64
+ # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
+ # NB: CC_NAME is not defined here
+ ifneq ($(shell $(CC) -? 2>&1 >/dev/null 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2023-02-10 Thread Joonas Niilola
commit: b1252dba7fd5da0686396d7138f601740116b8b0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Feb 10 08:55:06 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 10 08:57:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1252dba

dev-libs/nss: add 3.88.1

Closes: https://bugs.gentoo.org/892686
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/nss/Manifest  |   1 +
 .../files/nss-3.87-use-clang-as-bgo892686.patch|  85 +
 dev-libs/nss/nss-3.88.1.ebuild | 394 +
 3 files changed, 480 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 7dea4ccdf2ed..5ca3926c8ee3 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,4 @@
 DIST nss-3.79.2.tar.gz 84825187 BLAKE2B 
9589095a0f3af5201662fe96ba4dac73c661db3abde534941ea61d597dce1016dc06f8559e26fafc940f2b123987381e1faa22ff6a995ef3cc0a9dc4ebe7a4ad
 SHA512 
52ca7574d2bb6e2fd874ac40f3e75d58135b103d8bd4b964a9262b5c302b4668ff7c8f5dabbef46e413fd72faeddc44057bc7b489946813331cc9a481d078181
 DIST nss-3.87.tar.gz 71435408 BLAKE2B 
0d69e18b1e2c4ccfc86db8f3afba94d5000e8ab2a4e766eb6f99f13f57d78b62dd711a0f5f70a24378a3cf1e435cc8ecb7e6fbeae18d5db0176660a0ea35dac2
 SHA512 
4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110
+DIST nss-3.88.1.tar.gz 71607211 BLAKE2B 
ff84d3153a01519a52e83be5327453d8e6a81e1f62ccd69906b549fe42ec5ebf075b403395a67bc75f3c7f7dd33ef49f3b1f33558652ff75ee87e2970b2e06a4
 SHA512 
d15289803a4c3caa1b7a8872b761a95b4f571688c8b8ffaf2a1478e032a356fbcf8a9239ebe1777561503329f63dd237384e1d8af9ca70fb48b40e70954b455a
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git a/dev-libs/nss/files/nss-3.87-use-clang-as-bgo892686.patch 
b/dev-libs/nss/files/nss-3.87-use-clang-as-bgo892686.patch
new file mode 100644
index ..633d251868a8
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.87-use-clang-as-bgo892686.patch
@@ -0,0 +1,85 @@
+diff -Naur a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi
+--- a/lib/freebl/freebl_base.gypi  2023-02-10 09:25:24.750840063 +0200
 b/lib/freebl/freebl_base.gypi  2023-02-10 09:28:01.621413675 +0200
+@@ -72,19 +72,6 @@
+ 'mpi/mpi_amd64_common.S',
+ 'mpi/mp_comba.c',
+   ],
+-  'conditions': [
+-[ 'cc_is_clang==1 and fuzz!=1 and coverage!=1 and 
force_integrated_as!=1', {
+-  'cflags': [
+-'-no-integrated-as',
+-  ],
+-  'cflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-  'asflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-}],
+-  ],
+ }],
+ [ 'target_arch=="ia32"', {
+   'sources': [
+diff -Naur a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp
+--- a/lib/freebl/freebl.gyp2023-02-10 09:25:24.750840063 +0200
 b/lib/freebl/freebl.gyp2023-02-10 09:27:43.549117181 +0200
+@@ -16,19 +16,6 @@
+   'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+   ],
+-  'conditions': [
+-[ 'cc_is_clang==1 and force_integrated_as!=1', {
+-  'cflags': [
+-'-no-integrated-as',
+-  ],
+-  'cflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-  'asflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-}],
+-  ],
+ },
+ {
+   'target_name': 'intel-gcm-wrap_c_lib',
+@@ -325,19 +312,6 @@
+   'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+   ],
+-  'conditions': [
+-[ 'cc_is_clang==1 and force_integrated_as!=1', {
+-  'cflags': [
+-'-no-integrated-as',
+-  ],
+-  'cflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-  'asflags_mozilla': [
+-'-no-integrated-as',
+-  ],
+-}],
+-  ],
+ },
+ {
+   'target_name': 'ppc-gcm-wrap-nodepend_c_lib',
+diff -Naur a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile  2023-02-10 09:25:24.749840047 +0200
 b/lib/freebl/Makefile  2023-02-10 09:26:23.932810998 +0200
+@@ -731,15 +731,6 @@
+ # GCM binary needs -mssse3
+ #
+ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3
+-
+-# The integrated assembler in Clang 3.2 does not support % in the
+-# expression of a .set directive. intel-gcm.s uses .set to give
+-# symbolic names to registers, for example,
+-# .set  Htbl, %rdi
+-# So we can't use Clang's integrated assembler with 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2022-11-01 Thread Joonas Niilola
commit: 04b9c445ff45199ad6440a218d015bf58f02b72b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Nov  1 08:39:27 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov  1 08:49:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b9c445

dev-libs/nss: add 3.79.2

Bug: https://bugs.gentoo.org/877169
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/nss/Manifest  |   1 +
 .../nss/files/nss-3.79-fix-client-cert-crash.patch |  23 ++
 dev-libs/nss/nss-3.79.2.ebuild | 391 +
 3 files changed, 415 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index a0b5d5d0b745..dd8aeff08fed 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,4 @@
 DIST nss-3.79.1.tar.gz 84694831 BLAKE2B 
209a502ba4b808bb4cb9b8775328fa26e36c55147ee5da7b8f661349129250f09685dd69919e24d7ff72cc55a2e9cbbbc9c059e543cf1b0a6a08e809be262d4c
 SHA512 
e841efe9d0300d99b50e54c159c75df76c09c34c74bbc9b6ca007ad017b2cb91a8d33f6f4195e52bd8f3ed7be5d53f3ce7ce10825fa21abbf5dbba3db109e037
+DIST nss-3.79.2.tar.gz 84825187 BLAKE2B 
9589095a0f3af5201662fe96ba4dac73c661db3abde534941ea61d597dce1016dc06f8559e26fafc940f2b123987381e1faa22ff6a995ef3cc0a9dc4ebe7a4ad
 SHA512 
52ca7574d2bb6e2fd874ac40f3e75d58135b103d8bd4b964a9262b5c302b4668ff7c8f5dabbef46e413fd72faeddc44057bc7b489946813331cc9a481d078181
 DIST nss-3.84.tar.gz 84851235 BLAKE2B 
5dead5ae336998db97acc6dc2a59b387aac9baeba0f2fad6eaf921bdc894867f6177179545378091d9b50b295b71409781b5ef5044222afe7a1cd2f920a7d15f
 SHA512 
b4ed4b2e44d9f896a4a4c33f92813a84825dc4502f4e14e047f3583666c453138515e6edbcd71144c4b02a8ee16b3443803f1ff12458fd82c338ee1dd911b175
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git a/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch 
b/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
new file mode 100644
index ..5f80fdc09b7e
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.79-fix-client-cert-crash.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/ssl/authcert.c b/lib/ssl/authcert.c
+--- a/lib/ssl/authcert.c
 b/lib/ssl/authcert.c
+@@ -212,17 +212,17 @@ NSS_GetClientAuthData(void *arg,
+pw_arg);
+ } else {
+ int nnames = 0;
+ char **names = ssl_DistNamesToStrings(caNames, );
+ rv = CERT_FilterCertListByCANames(certList, nnames, names,
+   certUsageSSLClient);
+ ssl_FreeDistNamesStrings(names, nnames);
+ }
+-if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) {
++if ((rv != SECSuccess) || (certList && CERT_LIST_EMPTY(certList))) {
+ CERT_DestroyCertList(certList);
+ certList = NULL;
+ }
+ }
+ if (certList == NULL) {
+ /* no user certs meeting the nickname/usage requirements found */
+ return SECFailure;
+ }
+

diff --git a/dev-libs/nss/nss-3.79.2.ebuild b/dev-libs/nss/nss-3.79.2.ebuild
new file mode 100644
index ..7f2b0be9c181
--- /dev/null
+++ b/dev-libs/nss/nss-3.79.2.ebuild
@@ -0,0 +1,391 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.34.1"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI 
support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS;
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+   cacert? ( 
https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+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}]
+   virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/nss-config
+)
+
+PATCHES=(
+   # Custom changes for gentoo
+   "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+   "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+   "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+   

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2021-04-16 Thread Thomas Deutschmann
commit: d81e6654725a8f93a3046cdd1c018612bffe7b2e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Apr 16 10:54:22 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Apr 16 11:34:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81e6654

dev-libs/nss: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/nss/Manifest  |   2 -
 .../nss/files/nss-3.53-fix-building-on-ppc.patch   |  39 ---
 ...8-always-tolerate-the-first-CCS-in-TLS1.3.patch | 200 
 dev-libs/nss/nss-3.58-r2.ebuild| 360 -
 dev-libs/nss/nss-3.62.ebuild   | 359 
 5 files changed, 960 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c54a531abad..94f7cbcc143 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,2 @@
-DIST nss-3.58.tar.gz 81846254 BLAKE2B 
f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9
 SHA512 
03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.62.tar.gz 82159506 BLAKE2B 
9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007
 SHA512 
7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
 DIST nss-3.63.tar.gz 82167087 BLAKE2B 
3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9
 SHA512 
2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 
9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68
 SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0

diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch 
b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
deleted file mode 100644
index 962b9cb1eed..000
--- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
-
-From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
-From: Lauri Kasanen 
-Date: Mon, 1 Jun 2020 12:11:45 +0300
-Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: 
OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
- ABI version 2 is not compatible with ABI version 1 output
-
-Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
-
-Currently make only, I don't have enough gyp-fu to do that side.
-However, the reporters of 1642174 and 1635625 both used make, not gyp.
-
-Signed-off-by: Lauri Kasanen 

- lib/freebl/Makefile | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
-index 5f7384429..e0461c7d3 100644
 a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
- endif
- ifeq ($(CPU_ARCH),ppc)
- EXTRA_SRCS += gcm-ppc.c
--ASFILES += sha512-p8.s
- ifdef USE_64
- DEFINES += -DNSS_NO_INIT_SUPPORT
-+PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" 
{print $$3}')
-+ifeq ($(PPC_ABI),2)
-+ASFILES += sha512-p8.s
-+endif
- endif # USE_64
- endif # ppc
- endif # Linux
--- 
-2.19.1
-

diff --git 
a/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 
b/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
deleted file mode 100644
index a92c0389936..000
--- a/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-
-# HG changeset patch
-# User Daiki Ueno 
-# Date 1603691171 -3600
-# Node ID b03a4fc5b902498414b02640dcb2717dfef9682f
-# Parent  6f79a76958129dc09c353c288f115fd9a51ab7d4
-Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
-
-Summary:
-This flips the meaning of the flag for checking excessive CCS
-messages, so it only rejects multiple CCS messages while the first CCS
-message is always accepted.
-
-Reviewers: mt
-
-Reviewed By: mt
-
-Bug #: 1672703
-
-Differential Revision: https://phabricator.services.mozilla.com/D94603
-
 a/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-+++ b/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-@@ -343,29 +343,28 @@ TEST_F(TlsConnectStreamTls13, ChangeCiph
-   // Client sends CCS before starting the handshake.
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-   ConnectExpectAlert(server_, 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2021-01-09 Thread Lars Wendler
commit: d48f363a93e6caf204fb0447c7a35a7288c82ee1
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan  9 13:49:38 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan  9 13:53:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48f363a

dev-libs/nss: Removed old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/nss/Manifest  |   1 -
 ...t-hold-slot-lock-when-taking-session-lock.patch |  93 --
 dev-libs/nss/nss-3.59-r1.ebuild| 360 -
 3 files changed, 454 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d5daaa19eb3..7b74a4a17fd 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,4 @@
 DIST nss-3.58.tar.gz 81846254 BLAKE2B 
f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9
 SHA512 
03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.59.tar.gz 82141516 BLAKE2B 
74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779
 SHA512 
8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 
71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3
 SHA512 
ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
 DIST nss-3.60.tar.gz 82035831 BLAKE2B 
fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873
 SHA512 
6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 
9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68
 SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0

diff --git 
a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
 
b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
deleted file mode 100644
index be4ebfe4796..000
--- 
a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-# HG changeset patch
-# User Kevin Jacobs 
-# Date 1606813429 0
-# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9
-# Parent  f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e
-Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche
-
-[[ 
https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db
 | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race 
conditions related to NSSSlot member accesses. Unfortunately the locking order 
that was imposed by that patch has been found to cause problems for at least 
one PKCS11 module, libnsspem.
-
-This patch drops nested locking in favor of unlocking/re-locking. While this 
isn't perfect, the original problem in bug 1663661 was that `slot->token` could 
become NULL, which we can easily check after reacquiring.
-
-Differential Revision: https://phabricator.services.mozilla.com/D98247
-
-diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
 a/lib/dev/devslot.c
-+++ b/lib/dev/devslot.c
-@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent(
- if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) {
- if (!slot->token) {
- /* token was never present */
- isPresent = PR_FALSE;
- goto done; /* slot lock held */
- }
- session = nssToken_GetDefaultSession(slot->token);
- if (session) {
-+nssSlot_ExitMonitor(slot);
- nssSession_EnterMonitor(session);
- /* token is not present */
- if (session->handle != CK_INVALID_HANDLE) {
- /* session is valid, close and invalidate it */
- CKAPI(epv)
- ->C_CloseSession(session->handle);
- session->handle = CK_INVALID_HANDLE;
- }
- nssSession_ExitMonitor(session);
-+nssSlot_EnterMonitor(slot);
-+if (!slot->token) {
-+/* Check token presence after re-acquiring lock */
-+isPresent = PR_FALSE;
-+goto done; /* slot lock held */
-+}
- }
- if (slot->token->base.name[0] != 0) {
- /* notify the high-level cache that the token is removed */
- slot->token->base.name[0] = 0; /* XXX */
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2020-12-01 Thread Thomas Deutschmann
commit: d3f2cba10c86d044abad85e9b00b539e365eca8f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec  1 16:53:52 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec  1 16:56:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f2cba1

dev-libs/nss: don't hold slot lock when taking session lock

Closes: https://bugs.gentoo.org/756244
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...t-hold-slot-lock-when-taking-session-lock.patch | 93 ++
 .../nss/{nss-3.59.ebuild => nss-3.59-r1.ebuild}|  1 +
 2 files changed, 94 insertions(+)

diff --git 
a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
 
b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
new file mode 100644
index 000..be4ebfe4796
--- /dev/null
+++ 
b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
@@ -0,0 +1,93 @@
+
+# HG changeset patch
+# User Kevin Jacobs 
+# Date 1606813429 0
+# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9
+# Parent  f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e
+Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche
+
+[[ 
https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db
 | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race 
conditions related to NSSSlot member accesses. Unfortunately the locking order 
that was imposed by that patch has been found to cause problems for at least 
one PKCS11 module, libnsspem.
+
+This patch drops nested locking in favor of unlocking/re-locking. While this 
isn't perfect, the original problem in bug 1663661 was that `slot->token` could 
become NULL, which we can easily check after reacquiring.
+
+Differential Revision: https://phabricator.services.mozilla.com/D98247
+
+diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
+--- a/lib/dev/devslot.c
 b/lib/dev/devslot.c
+@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent(
+ if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) {
+ if (!slot->token) {
+ /* token was never present */
+ isPresent = PR_FALSE;
+ goto done; /* slot lock held */
+ }
+ session = nssToken_GetDefaultSession(slot->token);
+ if (session) {
++nssSlot_ExitMonitor(slot);
+ nssSession_EnterMonitor(session);
+ /* token is not present */
+ if (session->handle != CK_INVALID_HANDLE) {
+ /* session is valid, close and invalidate it */
+ CKAPI(epv)
+ ->C_CloseSession(session->handle);
+ session->handle = CK_INVALID_HANDLE;
+ }
+ nssSession_ExitMonitor(session);
++nssSlot_EnterMonitor(slot);
++if (!slot->token) {
++/* Check token presence after re-acquiring lock */
++isPresent = PR_FALSE;
++goto done; /* slot lock held */
++}
+ }
+ if (slot->token->base.name[0] != 0) {
+ /* notify the high-level cache that the token is removed */
+ slot->token->base.name[0] = 0; /* XXX */
+ nssToken_NotifyCertsNotVisible(slot->token);
+ }
+ slot->token->base.name[0] = 0; /* XXX */
+ /* clear the token cache */
+@@ -218,34 +225,41 @@ nssSlot_IsTokenPresent(
+ }
+ 
+ /* token is present, use the session info to determine if the card
+  * has been removed and reinserted.
+  */
+ session = nssToken_GetDefaultSession(slot->token);
+ if (session) {
+ PRBool tokenRemoved;
++nssSlot_ExitMonitor(slot);
+ nssSession_EnterMonitor(session);
+ if (session->handle != CK_INVALID_HANDLE) {
+ CK_SESSION_INFO sessionInfo;
+ ckrv = CKAPI(epv)->C_GetSessionInfo(session->handle, 
);
+ if (ckrv != CKR_OK) {
+ /* session is screwy, close and invalidate it */
+ CKAPI(epv)
+ ->C_CloseSession(session->handle);
+ session->handle = CK_INVALID_HANDLE;
+ }
+ }
+ tokenRemoved = (session->handle == CK_INVALID_HANDLE);
+ nssSession_ExitMonitor(session);
++nssSlot_EnterMonitor(slot);
+ /* token not removed, finished */
+ if (!tokenRemoved) {
+ isPresent = PR_TRUE;
+ goto done; /* slot lock held */
+ }
++if (!slot->token) {
++/* Check token presence after re-acquiring lock */
++isPresent = PR_FALSE;
++goto done; /* slot lock held */
++}
+ }
+ /* the token has been removed, and reinserted, or the slot contains
+  * a token it doesn't recognize. invalidate all the old
+  * information we had on this token, if we can't refresh, clear
+  * the present flag */
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2020-08-30 Thread Thomas Deutschmann
commit: 9522aa465f097bca10a2e9ee5c3e2586d3fcd26e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug 30 22:56:35 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug 30 22:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9522aa46

dev-libs/nss: security cleanup

Bug: https://bugs.gentoo.org/734986
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/nss/Manifest   |   4 -
 dev-libs/nss/files/nss-3.47-gentoo-fixups.patch | 242 
 dev-libs/nss/nss-3.51.ebuild| 357 ---
 dev-libs/nss/nss-3.52.1-r1.ebuild   | 361 
 dev-libs/nss/nss-3.53.1.ebuild  | 351 ---
 dev-libs/nss/nss-3.54-r1.ebuild | 351 ---
 6 files changed, 1666 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index e2468639f8b..a4426510d65 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,7 +1,3 @@
-DIST nss-3.51.tar.gz 78305125 BLAKE2B 
2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c
 SHA512 
9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
-DIST nss-3.52.1.tar.gz 81222116 BLAKE2B 
e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528
 SHA512 
be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
-DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 
7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e
 SHA512 
5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
-DIST nss-3.54.tar.gz 81190188 BLAKE2B 
bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2
 SHA512 
9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b
 DIST nss-3.55.tar.gz 81759883 BLAKE2B 
5b663d2b1861eb74cf070f2711b4db1afbfbc40b08e1f117e6b4a62e9f997de06889de3afc654cf6547c371ab2a1183904a1a014d1dc4b3e94f734107c81e1cf
 SHA512 
acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 
84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173
 SHA512 
f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 
9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68
 SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0

diff --git a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch 
b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
deleted file mode 100644
index 29b3a2a7232..000
--- a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
+++ /dev/null
@@ -1,242 +0,0 @@
 a/config/Makefile
-+++ 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:
-+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2020-06-28 Thread Thomas Deutschmann
commit: 893f2d565c0bc752426907f28a641bec6828574c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun 28 19:05:08 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jun 28 19:05:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893f2d56

dev-libs/nss: fix building on PPC

Closes: https://bugs.gentoo.org/722110
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../nss/files/nss-3.53-fix-building-on-ppc.patch   | 39 ++
 dev-libs/nss/nss-3.52.1-r1.ebuild  |  1 +
 dev-libs/nss/nss-3.53.1.ebuild |  1 +
 3 files changed, 41 insertions(+)

diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch 
b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
new file mode 100644
index 000..be2d4802c4c
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
@@ -0,0 +1,39 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
+
+From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001
+From: Lauri Kasanen 
+Date: Mon, 1 Jun 2020 12:11:45 +0300
+Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: 
OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
+ ABI version 2 is not compatible with ABI version 1 output
+
+Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
+
+Currently make only, I don't have enough gyp-fu to do that side.
+However, the reporters of 1642174 and 1635625 both used make, not gyp.
+
+Signed-off-by: Lauri Kasanen 
+---
+ lib/freebl/Makefile | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+index 5f7384429..d01587c7a 100644
+--- a/lib/freebl/Makefile
 b/lib/freebl/Makefile
+@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
+ endif
+ ifeq ($(CPU_ARCH),ppc)
+ EXTRA_SRCS += gcm-ppc.c
+-ASFILES += sha512-p8.s
++PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ 
print $3 }')
+ ifdef USE_64
+ DEFINES += -DNSS_NO_INIT_SUPPORT
++ifeq ($(PPC_ABI),2)
++ASFILES += sha512-p8.s
++endif
+ endif # USE_64
+ endif # ppc
+ endif # Linux
+-- 
+2.19.1
+

diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild 
b/dev-libs/nss/nss-3.52.1-r1.ebuild
index fcd9c6e73a8..56359ce5955 100644
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.52.1-r1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+   "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
 )
 
 src_prepare() {

diff --git a/dev-libs/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild
index df2971ed709..d94d193dbe9 100644
--- a/dev-libs/nss/nss-3.53.1.ebuild
+++ b/dev-libs/nss/nss-3.53.1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+   "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2019-10-20 Thread Lars Wendler
commit: 90a14e747543cb7cdaa0c30a21aae01030fd98fa
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Oct 20 14:53:56 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Oct 20 14:54:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a14e74

dev-libs/nss: Bump to version 3.47

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/nss/Manifest   |   1 +
 dev-libs/nss/files/nss-3.47-enable-pem.patch|  11 +
 dev-libs/nss/files/nss-3.47-gentoo-fixups.patch | 242 +++
 dev-libs/nss/nss-3.47.ebuild| 373 
 4 files changed, 627 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 1c9580a8742..108988a7784 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,6 @@
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 
9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca
 SHA512 
464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
 DIST nss-3.46.1.tar.gz 76417797 BLAKE2B 
c65679a7eb50991958858afe2a20824dd9ff4c0f554f3c1964ccec269c2da9de1fa674a6ebf24fd3c8465315e491a9b50188382d1032b0cfe74c289d49049926
 SHA512 
f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
 DIST nss-3.46.tar.gz 76417155 BLAKE2B 
18e22a60df185764f434779211289a78d05270d8493766100e378e2ecfdb3013feb73359088d53667fb3c57a5b29633c9f800d29739cff5aab2af81e7ddbe2d7
 SHA512 
de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
+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.47-enable-pem.patch 
b/dev-libs/nss/files/nss-3.47-enable-pem.patch
new file mode 100644
index 000..47a01c322bb
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.47-enable-pem.patch
@@ -0,0 +1,11 @@
+--- 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.47-gentoo-fixups.patch
new file mode 100644
index 000..9bf9e016357
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
@@ -0,0 +1,242 @@
+--- a/config/Makefile
 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
++
+--- a/config/nss-config.in
 b/config/nss-config.in
+@@ -0,0 +1,145 @@

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2019-01-22 Thread Ian Stakenvicius
commit: 78717184c7294a8a8a444c6a957f7a15358c39b9
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Tue Jan 22 16:46:07 2019 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Tue Jan 22 20:03:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78717184

dev-libs/nss: patch to fix a rare CMS related crash

Patch forward-ported from 3.36.7 (will also be included in 3.42)

Signed-off-by: Ian Stakenvicius  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-libs/nss/files/nss-3.36.7-fix-cms.patch| 531 +
 .../nss/{nss-3.41.ebuild => nss-3.40.1-r1.ebuild}  |   4 +-
 .../nss/{nss-3.41.ebuild => nss-3.41-r1.ebuild}|   4 +-
 3 files changed, 537 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000..57b4cdaf5a5
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch
@@ -0,0 +1,531 @@
+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) {
++

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2019-01-18 Thread Lars Wendler
commit: df02357fdc345dcb1f32ba05cede11a94036ff54
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 18 15:16:38 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 18 15:16:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df02357f

dev-libs/nss: Removed old.

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/nss/Manifest   |   3 -
 dev-libs/nss/files/nss-3.28-gentoo-fixups.patch | 241 ---
 dev-libs/nss/nss-3.29.5.ebuild  | 334 -
 dev-libs/nss/nss-3.37.3.ebuild  | 371 
 dev-libs/nss/nss-3.40.ebuild| 371 
 5 files changed, 1320 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index aa72e5cc2a6..f0a8a67af27 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,7 +1,4 @@
-DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 
9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50
 SHA512 
ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
-DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 
3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b
 SHA512 
11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 
9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca
 SHA512 
464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
-DIST nss-3.40.tar.gz 23308315 BLAKE2B 
02cc3ea9589f888e108bd3a6a99d5f52927bb4c63b2d9e03df88b7c1a188b6f2cd47d281dd5234b141b41684043e71d9fbee8f99223d0f5ae9778a4e1cfaa1ce
 SHA512 
3781c94595126757c95ea82c3134eb3f06f4c3814e9ed2bfceae22623a413d622349d08c6779e1230b2dbebd1f07aba58094fe83dcddebb3e043481e7a478239
 DIST nss-3.41.tar.gz 23319563 BLAKE2B 
76636b704cd572f9b840c7699c29697a4a882e66afcc3895ceb7b59a7af7af2513074e1abc6a028a13126d44e0cf722ab29e52a4c69640a2247814292efa282d
 SHA512 
b5a43fe86ded664002fd714c493d9222a64539cd6139b64720625d1742fec5100712cbe401c90c79196e9cbad9ec07d9b4f0f517ce34e4b207beaa3e01c9e114
 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.28-gentoo-fixups.patch 
b/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
deleted file mode 100644
index 69aa6528961..000
--- a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
+++ /dev/null
@@ -1,241 +0,0 @@
 nss/config/Makefile
-+++ nss/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
-+
 nss/config/nss-config.in
-+++ nss/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2018-03-05 Thread Ian Stakenvicius
commit: 6a151dad6741ecc70051f8269f78ebfe7dcbe0d3
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Mon Mar  5 20:22:35 2018 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Mon Mar  5 20:47:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a151dad

dev-libs/nss: fix compilation on amd64 of v3.35

Upstream fixed in 3.36 and backported to 3.35 (unreleased) via
https://bugzilla.mozilla.org/show_bug.cgi?id=1432455

Bug: http://bugs.gentoo.org/646382
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/nss-3.35-Hacl_Poly1305_64-aarch64.patch  | 36 ++
 dev-libs/nss/nss-3.35.ebuild   |  3 ++
 2 files changed, 39 insertions(+)

diff --git a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch 
b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
new file mode 100644
index 000..c05d103e25b
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User Daiki Ueno 
+# Date 1516710574 -3600
+# Node ID 74e679158d1bfe05c173e995ae7dc5a05ae02fe0
+# Parent  b3feffd76f4714139f72369f82b28619a704dbd6
+Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
 b/lib/freebl/Makefile
+@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY
+ 
+ ifneq (1,$(CC_IS_GCC))
+ EXTRA_SRCS += chacha20.c
+ VERIFIED_SRCS += Hacl_Chacha20.c
+ else
+ EXTRA_SRCS += chacha20_vec.c
+ endif
+ else
+-EXTRA_SRCS += poly1305.c
++ifeq ($(CPU_ARCH),aarch64)
++EXTRA_SRCS += Hacl_Poly1305_64.c
++else
++EXTRA_SRCS += poly1305.c
++endif
++
+ EXTRA_SRCS += chacha20.c
+ VERIFIED_SRCS += Hacl_Chacha20.c
+ endif # x86_64
+ endif # NSS_DISABLE_CHACHAPOLY
+ 
+ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
+ # All intel architectures get the 64 bit version
+ # With custom uint128 if necessary (faster than generic 32 bit version).
+

diff --git a/dev-libs/nss/nss-3.35.ebuild b/dev-libs/nss/nss-3.35.ebuild
index d21c8184ed4..dac240facdf 100644
--- a/dev-libs/nss/nss-3.35.ebuild
+++ b/dev-libs/nss/nss-3.35.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
"${DISTDIR}/${PN}-cacert-class1-class3.patch"
)
fi
+   # bug 646382
+   # https://bugzilla.mozilla.org/show_bug.cgi?id=1432455
+   PATCHES+=( "${FILESDIR}"/${P}-Hacl_Poly1305_64-aarch64.patch )
 
default
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2017-07-30 Thread Jory Pratt
commit: 655ceca26319d33003ad981b3202c31233777dd8
Author: Jory A. Pratt  gentoo  org>
AuthorDate: Sun Jul 30 14:31:24 2017 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sun Jul 30 14:32:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655ceca2

dev-libs/nss: Upstream version bump, rebase gentoo pkgconfig patch

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-libs/nss/Manifest   |   1 +
 dev-libs/nss/files/nss-3.32-gentoo-fixups.patch | 274 +++
 dev-libs/nss/nss-3.32.ebuild| 340 
 3 files changed, 615 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index ec8d2813098..dca6632a35b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,5 @@
 DIST nss-3.29.5.tar.gz 7480246 SHA256 
5df483b73535d726207483f6349df23fe56aee83382b94b13298aec2e254d985 SHA512 
ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 WHIRLPOOL 
ca341bc9e76208e01ee9b1b1fa8a67dd502676d1a2062468722ad80ed81fa3e4b0958907892871249b3596b310aa813259cf47b5bc64ec37b05613dc9d31323f
 DIST nss-3.31.tar.gz 9537011 SHA256 
e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d SHA512 
2b56405b32d37cc4386cbbe54462cc57092e47b3418a743adbae14e1825ca69d07256fbfe16c0cfd7540c46cea67259151b42a0d95419c80964015eacdcafea1
 WHIRLPOOL 
b63b481436feaf48ef3acc03e7af3831b743e91fda802f1fb5d4e782cbefab979dda5b643766f3a600b16ff815a90dacabd0b06b79baa76386237b56e74676fb
+DIST nss-3.32.tar.gz 9493574 SHA256 
35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335 SHA512 
7a01f81e23ef9649fd26b8423b015f4df5878c94f6ff591727086644b01db3dbc36de4e131cf70a6f84564e46c8decb7c4f7780fca12270eb900de1f8a11ee3c
 WHIRLPOOL 
bd1a9a8da509143ba995c2a4aac43df991703c1170e2654a8e762fbaf1b26e4f95f85c9d06db45126247a6d52828060c5283fb9cf1e4328952bc518ee38316c4
 DIST nss-cacert-class1-class3.patch 22950 SHA256 
6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 WHIRLPOOL 
1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 DIST nss-pem-20160329.tar.xz 27732 SHA256 
6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 
5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 WHIRLPOOL 
16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836

diff --git a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch 
b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
new file mode 100644
index 000..1773da98819
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
@@ -0,0 +1,274 @@
+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 000..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 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2017-01-19 Thread Ian Stakenvicius
commit: 05c31f8cca591b3ce8219e4def7c26c7b1b130d6
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Thu Jan 19 15:40:12 2017 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Thu Jan 19 15:40:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c31f8c

dev-libs/nss: clean old, security bug 604916

Package-Manager: portage-2.3.0

 dev-libs/nss/Manifest |   7 -
 dev-libs/nss/files/nss-3.21-cacert-class3.patch   | 203 -
 dev-libs/nss/files/nss-3.21-gentoo-fixups.patch   | 238 ---
 dev-libs/nss/files/nss-3.21-hppa-byte_order.patch |  16 -
 dev-libs/nss/files/nss-3.21-pem-werror.patch  | 141 -
 dev-libs/nss/nss-3.22.2.ebuild| 331 -
 dev-libs/nss/nss-3.23.ebuild  | 340 --
 dev-libs/nss/nss-3.25-r1.ebuild   | 339 -
 dev-libs/nss/nss-3.26.1.ebuild| 338 -
 dev-libs/nss/nss-3.27.2.ebuild| 339 -
 10 files changed, 2292 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 51c832c..e485949 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,10 +1,3 @@
-DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 
82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 
2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00
 WHIRLPOOL 
c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.22.2.tar.gz 6982164 SHA256 
07d49287c527ac31200f02dcf8494cef19e936d8ed470802749c4dfc782d3650 SHA512 
0c73ba579cb697fe295bca2ee62315bc1830b542f607c1ecfbf591fa881d2ccfb5a6d830b47cd1434bdfbac07e03848b4fe9e6bda9c6d131a2c34973dc3b337c
 WHIRLPOOL 
37137526ffc6f583ba54615c5fadb1076a5c0830b8aef6db394fb1da02345d5b1cf394b6a3cac7b8ce5727bf23ed1053f3f0f2865f0eab7c922c8459d5768142
-DIST nss-3.23.tar.gz 7467001 SHA256 
94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf SHA512 
f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32
 WHIRLPOOL 
77e22bd7a525c5b10723e1d5fb6db1e9d2efebfcdf9828aa79296f71c441c065201ecda56291f37790333d9b1d1e38fef1391a033382a885b83da31a646d6243
-DIST nss-3.25.tar.gz 7338238 SHA256 
5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359 SHA512 
a33cff42d0d85eea091057648d598b7421de88f16ed357965ea08a8812de968c3f18d45452afd21afc90122f65c2c5bb2d7071357947b45e935aae55d28c4218
 WHIRLPOOL 
3857bffe7a58043612bbeaf0e596b3afdd4f0792441af667fb503dd2d354a535bb8523c258242b470d888ef2beff267b4480e6398a3328f0c44193b83f4a5934
-DIST nss-3.26.1.tar.gz 7387756 SHA256 
abebb079288e4b0d34648a1fcdba8564ac05b29f5f1d19b53021ccb3ac37ad25 SHA512 
f2a6754e4766cdf169b0abfc0ff47c469ae0e6ddc08c020ef154da7806e8ce31b49076af11b659bf19e9c4b5c6e53a0ac9e7855ee1c33b98a45cfeec446b93bd
 WHIRLPOOL 
9152e3c7430b3362647adb494d1983cc37659b1d8691f1f1e21470aab4f496f3aecd925b8e19d83fa3735e72eeb6d6579bcc304c30e48359d05cb6e052610b0f
-DIST nss-3.27.2.tar.gz 7397599 SHA256 
dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 
699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8
 WHIRLPOOL 
08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf
 DIST nss-3.28.1.tar.gz 7451477 SHA256 
58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad SHA512 
f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b
 WHIRLPOOL 
e1a6b9886759159294c4d8e47e693a2e790703e368ede18425c9a9130df72ac56a6e717cb794607c7bcfc68c82df9aec8771bc74e729f5bbd70fdcd8ce0fed3b
 DIST nss-cacert-class1-class3.patch 22950 SHA256 
6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 WHIRLPOOL 
1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
-DIST nss-pem-20140125.tar.bz2 28805 SHA256 
62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 
352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39
 WHIRLPOOL 
3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62
 DIST nss-pem-20160329.tar.xz 27732 SHA256 
6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2016-12-23 Thread Lars Wendler
commit: f1941b3190d2accaef1639ccf407f94a2a12f647
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 23 09:52:32 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 23 09:52:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1941b31

dev-libs/nss: Bump to version 3.28

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/nss/Manifest   |   1 +
 dev-libs/nss/files/nss-3.28-gentoo-fixups.patch | 241 +
 dev-libs/nss/nss-3.28.ebuild| 339 
 3 files changed, 581 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 998387a..fa1784d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,6 +7,7 @@ DIST nss-3.26.1.tar.gz 7387756 SHA256 
abebb079288e4b0d34648a1fcdba8564ac05b29f5f
 DIST nss-3.27.1.tar.gz 7397737 SHA256 
fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b SHA512 
b52bc18e42cab78a325a8c4fcf2894ca879cecbb657a852baf460551ed9727f145bc328ebb61a43a1605b457f923a1495707ac4aee27be70220463818ed8db8d
 WHIRLPOOL 
17174b7d43bd82b9e805d653a7ea8b79bc2647a5891806c1cb77e2ac99e40eb64ffee03e105a41c375ba37e26cafeff4bd4bad27c48e94ed388d0215d0545364
 DIST nss-3.27.2.tar.gz 7397599 SHA256 
dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 
699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8
 WHIRLPOOL 
08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf
 DIST nss-3.27.tar.gz 7397210 SHA256 
021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa SHA512 
a79c31d3ade72897928cdb1cfbf9236ea781fb1951904f2f5d9688afc4e55722ba75ea5a46622d1fa45d55bb2666d05a0df3a2c2ac16ce53335722618523c272
 WHIRLPOOL 
16277ba6cb3c71afeab7a5ce92ba0b3c0ec8622edc87bb1fe48dad86a910fa71a09db4c83ec8a973a048c5b925dbad2bc9d6361a66b94744479c47364e7ad5c5
+DIST nss-3.28.tar.gz 7440502 SHA256 
c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 SHA512 
dd442c6d04edd0507cc49a1e3c2bfaa64555f7cde5cb9e512ccf33f14de458dddbb17efddd83271056ed6e6e32327e6e1b6f6609e1910a05e625b08e6f0965df
 WHIRLPOOL 
d013972f18d75e83da03c3903b712ef1094e6b8543c1755ea2b7ed7f6335e39ac20112808c86bb9df74cda4a8c5c1159401ecd05d1d8b07b3ecdca85f7f0ac82
 DIST nss-cacert-class1-class3.patch 22950 SHA256 
6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 WHIRLPOOL 
1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 
50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 
0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501
 WHIRLPOOL 
279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
 DIST nss-pem-20140125.tar.bz2 28805 SHA256 
62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 
352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39
 WHIRLPOOL 
3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62

diff --git a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch 
b/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
new file mode 100644
index ..69aa652
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
@@ -0,0 +1,241 @@
+--- nss/config/Makefile
 nss/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 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2016-12-23 Thread Lars Wendler
commit: 03b621dc695b5fa65be2cd713b51bbc22957efd3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 23 09:56:52 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 23 09:56:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b621dc

dev-libs/nss: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/nss/Manifest  |   4 -
 dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch|  24 --
 .../nss/files/nss-3.15-gentoo-fixup-warnings.patch |  10 -
 dev-libs/nss/files/nss-3.15.4-enable-pem.patch |  13 -
 dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch  | 241 ---
 dev-libs/nss/files/nss-cacert-class3.patch | 204 -
 dev-libs/nss/nss-3.20.ebuild   | 326 
 dev-libs/nss/nss-3.27.1.ebuild | 338 -
 dev-libs/nss/nss-3.27.ebuild   | 338 -
 9 files changed, 1498 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index fa1784d..c5f1d3b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,14 +1,10 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 
82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 
2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00
 WHIRLPOOL 
c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.20.tar.gz 692 SHA256 
5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 
50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366
 WHIRLPOOL 
84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de
 DIST nss-3.22.2.tar.gz 6982164 SHA256 
07d49287c527ac31200f02dcf8494cef19e936d8ed470802749c4dfc782d3650 SHA512 
0c73ba579cb697fe295bca2ee62315bc1830b542f607c1ecfbf591fa881d2ccfb5a6d830b47cd1434bdfbac07e03848b4fe9e6bda9c6d131a2c34973dc3b337c
 WHIRLPOOL 
37137526ffc6f583ba54615c5fadb1076a5c0830b8aef6db394fb1da02345d5b1cf394b6a3cac7b8ce5727bf23ed1053f3f0f2865f0eab7c922c8459d5768142
 DIST nss-3.23.tar.gz 7467001 SHA256 
94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf SHA512 
f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32
 WHIRLPOOL 
77e22bd7a525c5b10723e1d5fb6db1e9d2efebfcdf9828aa79296f71c441c065201ecda56291f37790333d9b1d1e38fef1391a033382a885b83da31a646d6243
 DIST nss-3.25.tar.gz 7338238 SHA256 
5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359 SHA512 
a33cff42d0d85eea091057648d598b7421de88f16ed357965ea08a8812de968c3f18d45452afd21afc90122f65c2c5bb2d7071357947b45e935aae55d28c4218
 WHIRLPOOL 
3857bffe7a58043612bbeaf0e596b3afdd4f0792441af667fb503dd2d354a535bb8523c258242b470d888ef2beff267b4480e6398a3328f0c44193b83f4a5934
 DIST nss-3.26.1.tar.gz 7387756 SHA256 
abebb079288e4b0d34648a1fcdba8564ac05b29f5f1d19b53021ccb3ac37ad25 SHA512 
f2a6754e4766cdf169b0abfc0ff47c469ae0e6ddc08c020ef154da7806e8ce31b49076af11b659bf19e9c4b5c6e53a0ac9e7855ee1c33b98a45cfeec446b93bd
 WHIRLPOOL 
9152e3c7430b3362647adb494d1983cc37659b1d8691f1f1e21470aab4f496f3aecd925b8e19d83fa3735e72eeb6d6579bcc304c30e48359d05cb6e052610b0f
-DIST nss-3.27.1.tar.gz 7397737 SHA256 
fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b SHA512 
b52bc18e42cab78a325a8c4fcf2894ca879cecbb657a852baf460551ed9727f145bc328ebb61a43a1605b457f923a1495707ac4aee27be70220463818ed8db8d
 WHIRLPOOL 
17174b7d43bd82b9e805d653a7ea8b79bc2647a5891806c1cb77e2ac99e40eb64ffee03e105a41c375ba37e26cafeff4bd4bad27c48e94ed388d0215d0545364
 DIST nss-3.27.2.tar.gz 7397599 SHA256 
dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 
699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8
 WHIRLPOOL 
08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf
-DIST nss-3.27.tar.gz 7397210 SHA256 
021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa SHA512 
a79c31d3ade72897928cdb1cfbf9236ea781fb1951904f2f5d9688afc4e55722ba75ea5a46622d1fa45d55bb2666d05a0df3a2c2ac16ce53335722618523c272
 WHIRLPOOL 
16277ba6cb3c71afeab7a5ce92ba0b3c0ec8622edc87bb1fe48dad86a910fa71a09db4c83ec8a973a048c5b925dbad2bc9d6361a66b94744479c47364e7ad5c5
 DIST nss-3.28.tar.gz 7440502 SHA256 
c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 SHA512 
dd442c6d04edd0507cc49a1e3c2bfaa64555f7cde5cb9e512ccf33f14de458dddbb17efddd83271056ed6e6e32327e6e1b6f6609e1910a05e625b08e6f0965df
 WHIRLPOOL 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/, dev-libs/nss/files/

2015-11-26 Thread Jory Pratt
commit: ce1156e0cc0094ecf6a62693e3f38980ecf3d023
Author: Jory A. Pratt  gentoo  org>
AuthorDate: Thu Nov 26 21:55:27 2015 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Thu Nov 26 21:55:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1156e0

dev-libs/nss - basic version bump 3.21

 dev-libs/nss/Manifest  |   2 +
 dev-libs/nss/files/nss-3.21-cacert-class3.patch| 204 +
 dev-libs/nss/files/nss-3.21-enable-pem.patch   |  12 +
 .../nss/files/nss-3.21-gentoo-fixup-warnings.patch |  11 +
 dev-libs/nss/files/nss-3.21-gentoo-fixups.patch| 243 +++
 dev-libs/nss/files/nss-3.21-pem-werror.patch   | 146 +
 dev-libs/nss/nss-3.21.ebuild   | 326 +
 7 files changed, 944 insertions(+)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 5ce5b51..670c75d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,4 +2,6 @@ DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 
82ca25982828fd7153ad
 DIST nss-3.19.2.tar.gz 6953657 SHA256 
1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae SHA512 
d3c45010f8dace58f9da9efe0f9792f8b8a69384e100663f33c949685cdd1ce70e5131f279bc82336622841c41dbc0a4d70a7cc6839a1782dbe8b3c3fd8bc59d
 WHIRLPOOL 
d69ab02e12f6b22f47df7be7925343c58e68a69b33833b85d6f2ca70f652d9d159accea45f2c141fa89245ab64d0f1289129427564203fe2faf3af1c11e3
 DIST nss-3.20.1.tar.gz 6958956 SHA256 
ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97 SHA512 
c8db693a81b8ddb4d2a742c2fce3f23dd40736e54c55c0de072f84572fcdad8fb7646e4b8ea696e4c97ea6c9cb0fa144f573f8776c2839eb25c4075b50d01d74
 WHIRLPOOL 
3d4667b243ba6ac596ea7e9936bf9cba7aa1b9767fd19b53352c3a9a9eef0f1a0a9e7da719634dbc9dfcc087d187d5e774ae351c1e57545e8b8c1f40e41e42e6
 DIST nss-3.20.tar.gz 692 SHA256 
5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 
50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366
 WHIRLPOOL 
84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de
+DIST nss-3.21.tar.gz 6978112 SHA256 
3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 
0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53
 WHIRLPOOL 
7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 
50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 
0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501
 WHIRLPOOL 
279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
+DIST nss-pem-20140125.tar.bz2 28805 SHA256 
62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 
352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39
 WHIRLPOOL 
3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62

diff --git a/dev-libs/nss/files/nss-3.21-cacert-class3.patch 
b/dev-libs/nss/files/nss-3.21-cacert-class3.patch
new file mode 100644
index 000..565f3e6
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.21-cacert-class3.patch
@@ -0,0 +1,204 @@
+diff -urN a/nss/lib/ckfw/builtins/certdata.txt 
b/nss/lib/ckfw/builtins/certdata.txt
+--- a/nss/lib/ckfw/builtins/certdata.txt   2015-11-15 09:25:06.142786072 
-0600
 b/nss/lib/ckfw/builtins/certdata.txt   2015-11-15 09:36:02.976756787 
-0600
+@@ -30351,3 +30351,200 @@
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
++# Certificate "CAcert Inc."
++#
++# Issuer: E=supp...@cacert.org,CN=CA Cert Signing 
Authority,OU=http://www.cacert.org,O=Root CA
++# Serial Number: 672138 (0xa418a)
++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc.
++# Not Valid Before: Mon May 23 17:48:02 2011
++# Not Valid After : Thu May 20 17:48:02 2021
++# Fingerprint (SHA-256): 
4E:DD:E9:E5:5C:A4:53:B3:88:88:7C:AA:25:D5:C5:C5:BC:CF:28:91:D7:3B:87:49:58:08:29:3D:5F:AC:83:C8
++# Fingerprint (SHA1): 
AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert Inc."
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143