From 2a720675d82b098bd4cde83ba64b831653acd2c5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 14 2018 13:00:09 +0000 Subject: import nss-util-3.36.0-1.el7_5 --- diff --git a/.gitignore b/.gitignore index b386124..839452c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nss-util-3.34.0.tar.gz +SOURCES/nss-util-3.36.0.tar.gz diff --git a/.nss-util.metadata b/.nss-util.metadata index 96a9507..62e7ea4 100644 --- a/.nss-util.metadata +++ b/.nss-util.metadata @@ -1 +1 @@ -a614a976a848d65b840e65a58d73529dffcf25d4 SOURCES/nss-util-3.34.0.tar.gz +7ab0a46211636f0bc2e449cbd4276bbc0f7a4e5b SOURCES/nss-util-3.36.0.tar.gz diff --git a/SOURCES/nss-util-ecc-defaults.patch b/SOURCES/nss-util-ecc-defaults.patch deleted file mode 100644 index f4cd5bb..0000000 --- a/SOURCES/nss-util-ecc-defaults.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# User Bob Relyea -# Date 1513864398 -3600 -# Thu Dec 21 14:53:18 2017 +0100 -# Node ID e577b1df8dabb31466cebad07fdbe0883290bede -# Parent 481de926f1fa18b7b62e80b59f28f2aef7ab3034 -Bug 1312142, Softoken still does not handle login state correctly for user db slots in FIPS mode, r=kaie - -diff --git a/lib/util/utilpars.c b/lib/util/utilpars.c ---- a/lib/util/utilpars.c -+++ b/lib/util/utilpars.c -@@ -589,6 +589,7 @@ struct nssutilArgSlotFlagTable { - } - static struct nssutilArgSlotFlagTable nssutil_argSlotFlagTable[] = { - NSSUTIL_ARG_ENTRY(RSA, SECMOD_RSA_FLAG), -+ NSSUTIL_ARG_ENTRY(ECC, SECMOD_ECC_FLAG), - NSSUTIL_ARG_ENTRY(DSA, SECMOD_RSA_FLAG), - NSSUTIL_ARG_ENTRY(RC2, SECMOD_RC4_FLAG), - NSSUTIL_ARG_ENTRY(RC4, SECMOD_RC2_FLAG), -diff --git a/lib/util/utilparst.h b/lib/util/utilparst.h ---- a/lib/util/utilparst.h -+++ b/lib/util/utilparst.h -@@ -43,7 +43,7 @@ - #define NSSUTIL_DEFAULT_INTERNAL_INIT3 \ - " askpw=any timeout=30})\"" - #define NSSUTIL_DEFAULT_SFTKN_FLAGS \ -- "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" -+ "slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" - - #define NSSUTIL_DEFAULT_CIPHER_ORDER 0 - #define NSSUTIL_DEFAULT_TRUST_ORDER 50 diff --git a/SOURCES/nss-util-sql-default.patch b/SOURCES/nss-util-sql-default.patch new file mode 100644 index 0000000..2d33460 --- /dev/null +++ b/SOURCES/nss-util-sql-default.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User Kai Engert +# Date 1511548994 -3600 +# Fri Nov 24 19:43:14 2017 +0100 +# Node ID b0658ed367633e505d38c0c0f63b801ddbbb21a4 +# Parent 807662e6ba57db5be05036511ac8634466ed473f +Bug 1377940, Change NSS default storage file format (currently DBM), when no prefix is given, to SQL, r=rrelyea, r=fkiefer + +diff --git a/lib/util/utilpars.c b/lib/util/utilpars.c +--- a/lib/util/utilpars.c ++++ b/lib/util/utilpars.c +@@ -1110,12 +1110,8 @@ const char * + NSSDBType dbType; + PRBool checkEnvDefaultDB = PR_FALSE; + *appName = NULL; +-/* force the default */ +-#ifdef NSS_DISABLE_DBM ++ /* force the default */ + dbType = NSS_DB_TYPE_SQL; +-#else +- dbType = NSS_DB_TYPE_LEGACY; +-#endif + if (configdir == NULL) { + checkEnvDefaultDB = PR_TRUE; + } else if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS) - 1) == 0) { diff --git a/SPECS/nss-util.spec b/SPECS/nss-util.spec index 2bc4044..f170c87 100644 --- a/SPECS/nss-util.spec +++ b/SPECS/nss-util.spec @@ -1,11 +1,11 @@ -%global nspr_version 4.17.0 +%global nspr_version 4.19.0 # adjust to the very latest build needed %global nspr_build_version -1 Summary: Network Security Services Utilities Library Name: nss-util -Version: 3.34.0 -Release: 2%{?dist} +Version: 3.36.0 +Release: 1%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -39,8 +39,9 @@ Patch7: pkcs1sig-include-prtypes.patch # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=951455 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=923089 Patch8: nss-util-3.19.1-tls12-mechanisms.patch -# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1312142 -Patch9: nss-util-ecc-defaults.patch +# To revert the change in: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1377940 +Patch9: nss-util-sql-default.patch %description Utilities for Network Security Services and the Softoken module @@ -65,7 +66,7 @@ Header and library files for doing development with Network Security Services. %patch7 -p0 -b .include_prtypes %patch8 -p1 -b .tls12_mechs pushd nss -%patch9 -p1 -b .ecc_defaults +%patch9 -p1 -R -b .sql-default popd @@ -239,6 +240,12 @@ done %{_includedir}/nss3/templates/templates.c %changelog +* Mon Mar 5 2018 Daiki Ueno - 3.36.0-1 +- Rebase to NSS 3.36 + +* Thu Mar 1 2018 Daiki Ueno - 3.36.0-0.1.beta +- Rebase to NSS 3.36 BETA + * Tue Jan 16 2018 Daiki Ueno - 3.34.0-2 - Recognize "ECC" flag in slotFlags