diff --git a/.gitignore b/.gitignore index 832d274..f37de1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nss-util-3.15.4.tar.gz +SOURCES/nss-util-3.16.2.tar.gz diff --git a/.nss-util.metadata b/.nss-util.metadata index e57f3e0..aa9ac64 100644 --- a/.nss-util.metadata +++ b/.nss-util.metadata @@ -1 +1 @@ -b7773277cb0c3e187cc8a4f4af4d4fd59b739650 SOURCES/nss-util-3.15.4.tar.gz +b0daf5ef12d60579867aaeccc52d1a772d6d45f7 SOURCES/nss-util-3.16.2.tar.gz diff --git a/SOURCES/nss-util-ecc-list-3.15.3.patch b/SOURCES/nss-util-ecc-list-3.15.3.patch deleted file mode 100644 index 288dbf2..0000000 --- a/SOURCES/nss-util-ecc-list-3.15.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up ./nss/lib/util/utilmodt.h.ecc_list ./nss/lib/util/utilmodt.h ---- ./nss/lib/util/utilmodt.h.ecc_list 2013-12-04 10:19:17.393804242 -0800 -+++ ./nss/lib/util/utilmodt.h 2013-12-04 10:22:28.541804170 -0800 -@@ -23,10 +23,11 @@ - #define SECMOD_SSL_FLAG 0x00000800L - #define SECMOD_TLS_FLAG 0x00001000L - #define SECMOD_AES_FLAG 0x00002000L --#define SECMOD_SHA256_FLAG 0x00004000L -+#define SECMOD_SHA256_FLAG 0x00004000L /* also for SHA224 */ - #define SECMOD_SHA512_FLAG 0x00008000L /* also for SHA384 */ - #define SECMOD_CAMELLIA_FLAG 0x00010000L /* = PUBLIC_MECH_CAMELLIA_FLAG */ - #define SECMOD_SEED_FLAG 0x00020000L -+#define SECMOD_ECC_FLAG 0x00040000L - /* reserved bit for future, do not use */ - #define SECMOD_RESERVED_FLAG 0X08000000L - #define SECMOD_FRIENDLY_FLAG 0x10000000L diff --git a/SPECS/nss-util.spec b/SPECS/nss-util.spec index adb9e8b..e8ada76 100644 --- a/SPECS/nss-util.spec +++ b/SPECS/nss-util.spec @@ -1,9 +1,9 @@ -%global nspr_version 4.10.2 +%global nspr_version 4.10.6 Summary: Network Security Services Utilities Library Name: nss-util -Version: 3.15.4 -Release: 2%{?dist} +Version: 3.16.2 +Release: 1%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -21,7 +21,7 @@ Source0: %{name}-%{version}.tar.gz # We use the nss-split-util.sh script for keeping only what we need # nss-util is produced via via nss-split-util.sh {version} # Detailed Steps: -# rhppkg clone nss-util +# rhpkg clone nss-util # cd nss-util # Make the source tarball for nss-util out of the nss one: # sh ./nss-split-util.sh ${version} @@ -33,7 +33,6 @@ Source3: nss-util-config.in Patch1: build-nss-util-only.patch Patch2: hasht-dont-include-prtypes.patch -Patch3: nss-util-ecc-list-3.15.3.patch %description Utilities for Network Security Services and the Softoken module @@ -56,7 +55,6 @@ Header and library files for doing development with Network Security Services. %setup -q %patch1 -p0 -b .utilonly %patch2 -p0 -b .prtypes -%patch3 -p0 -b .ecc_list %build @@ -222,6 +220,10 @@ done %{_includedir}/nss3/templates/templates.c %changelog +* Wed Jul 30 2014 Elio Maldonado - 3.16.2-1 +- Update to nss-3.16.2 +- Resolves: Bug 1124659 - Rebase RHEL-7.0 to at least NSS 3.16.1 (FF 31) + * Fri Jan 24 2014 Daniel Mach - 3.15.4-2 - Mass rebuild 2014-01-24