The package rpms/nss-softokn.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss-softokn.git/commit/?id=adde27....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit adde27e55ecda414c684728b31dd4b7a049bac5e
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Tue Oct 3 13:55:18 2017 +0200
Update to NSS 3.33.0
diff --git a/.gitignore b/.gitignore
index efa7ada..5f0af4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/nss-softokn-3.30.2.tar.gz
/nss-softokn-3.31.0.tar.gz
/nss-softokn-3.32.0.tar.gz
+/nss-softokn-3.33.0.tar.gz
diff --git a/iquote.patch b/iquote.patch
index f87f10e..8cd372a 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -1,39 +1,13 @@
-diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
---- ./nss/cmd/bltest/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/cmd/bltest/Makefile 2016-06-24 15:04:36.742545266 -0700
-@@ -45,6 +45,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (6) Execute "component" rules. (OPTIONAL) #
- #######################################################################
-
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
-
-
- #######################################################################
-diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
---- ./nss/coreconf/location.mk.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/coreconf/location.mk 2016-06-24 15:04:36.820545264 -0700
-@@ -45,6 +45,10 @@ endif
-
- ifdef NSS_INCLUDE_DIR
- INCLUDES += -I$(NSS_INCLUDE_DIR)
-+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
-+ INCLUDES += -iquote $(DIST)/../public/nss
-+ INCLUDES += -iquote $(DIST)/../private/nss
-+ endif
- endif
-
- ifndef NSS_LIB_DIR
-diff -up ./nss/lib/softoken/Makefile.iquote ./nss/lib/softoken/Makefile
---- ./nss/lib/softoken/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/lib/softoken/Makefile 2016-06-24 15:04:36.820545264 -0700
-@@ -52,6 +52,9 @@ ifdef NSS_DISABLE_DBM
- DIRS=
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote 2017-07-27 16:09:32.000000000 +0200
++++ nss/coreconf/location.mk 2017-08-30 15:17:56.553361830 +0200
+@@ -75,4 +75,9 @@ ifndef SQLITE_LIB_NAME
+ SQLITE_LIB_NAME = sqlite3
endif
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
++# Prefer in-tree headers over system headers
++ifdef IN_TREE_FREEBL_HEADERS_FIRST
++ INCLUDES += -iquote $(DIST)/../public/nss -iquote $(DIST)/../private/nss
++endif
+
- #######################################################################
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
+ MK_LOCATION = included
diff --git a/nss-softokn-add_encrypt_derive.patch b/nss-softokn-add_encrypt_derive.patch
index 89cc516..e6a04db 100644
--- a/nss-softokn-add_encrypt_derive.patch
+++ b/nss-softokn-add_encrypt_derive.patch
@@ -1,7 +1,7 @@
-diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive ./lib/softoken/pkcs11.c
---- ./lib/softoken/pkcs11.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11.c 2017-08-11 09:34:37.633756798 -0700
-@@ -423,11 +423,22 @@ static const struct mechanismList mechan
+diff -up nss/lib/softoken/pkcs11.c.add_encrypt_derive nss/lib/softoken/pkcs11.c
+--- nss/lib/softoken/pkcs11.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11.c 2017-10-03 13:48:02.077083318 +0200
+@@ -421,11 +421,22 @@ static const struct mechanismList mechan
#endif
/* --------------------- Secret Key Operations ------------------------ */
{ CKM_GENERIC_SECRET_KEY_GEN, { 1, 32, CKF_GENERATE }, PR_TRUE },
@@ -28,11 +28,11 @@ diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive
./lib/softoken/pkcs11.c
/* ---------------------- SSL Key Derivations ------------------------- */
{ CKM_SSL3_PRE_MASTER_KEY_GEN, { 48, 48, CKF_GENERATE }, PR_FALSE },
{ CKM_SSL3_MASTER_KEY_DERIVE, { 48, 48, CKF_DERIVE }, PR_FALSE },
-diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
---- ./lib/softoken/pkcs11c.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11c.c 2017-08-11 09:45:01.285575175 -0700
-@@ -6269,6 +6269,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
- #endif /* NSS_DISABLE_ECC */
+diff -up nss/lib/softoken/pkcs11c.c.add_encrypt_derive nss/lib/softoken/pkcs11c.c
+--- nss/lib/softoken/pkcs11c.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11c.c 2017-10-03 13:48:40.428235402 +0200
+@@ -6242,6 +6242,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
+ }
/*
+ * Handle The derive from a block encryption cipher
@@ -76,7 +76,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive
./lib/softoken/pkcs11c.c
* SSL Key generation given pre master secret
*/
#define NUM_MIXERS 9
-@@ -6313,6 +6351,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6286,6 +6324,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
CK_KEY_TYPE keyType = CKK_GENERIC_SECRET;
CK_OBJECT_CLASS classType = CKO_SECRET_KEY;
CK_KEY_DERIVATION_STRING_DATA *stringPtr;
@@ -86,7 +86,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive
./lib/softoken/pkcs11c.c
CK_MECHANISM_TYPE mechanism = pMechanism->mechanism;
PRBool isTLS = PR_FALSE;
PRBool isDH = PR_FALSE;
-@@ -6322,6 +6363,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6295,6 +6336,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
unsigned int outLen;
unsigned char sha_out[SHA1_LENGTH];
unsigned char key_block[NUM_MIXERS * SFTK_MAX_MAC_LENGTH];
@@ -94,7 +94,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive
./lib/softoken/pkcs11c.c
PRBool isFIPS;
HASH_HashType hashType;
PRBool extractValue = PR_TRUE;
-@@ -6926,6 +6968,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6899,6 +6941,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
break;
}
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 66199c1..b429078 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.16.0
+%global nspr_version 4.17.0
%global nss_name nss
-%global nss_util_version 3.32.0
+%global nss_util_version 3.33.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
%global prelink_conf_dir %{_sysconfdir}/prelink.conf.d/
@@ -29,10 +29,10 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.32.0
+Version: 3.33.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 1.2%{?dist}
+Release: 1.0%{?dist}
License: MPLv2.0
URL:
http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -67,23 +67,23 @@ Source4: nss-softokn-prelink.conf
Source5: nss-softokn-dracut-module-setup.sh
Source6: nss-softokn-dracut.conf
-# Select the tests to run based on the type of build
-# This patch uses the gcc-iquote dir option documented at
+# This patch uses the GCC -iquote option documented at
#
http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
-# to place the in-tree directories at the head of the list on list of directories
-# to be searched for for header files. This ensures a build even when system freebl
-# headers are older. Such is the case when we are starting a major update.
-# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers.
-# Once has been bootstapped the patch may be removed, but it doesn't hurt to keep
it.
+# to give the in-tree headers a higher priority over the system headers,
+# when they are included through the quote form (#include "file.h").
+#
+# This ensures a build even when system freebl headers are older. Such
+# is the case when we are starting a major update.
+#
+# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl
+# headers. Once has been bootstapped the patch may be removed, but it
+# doesn't hurt to keep it.
Patch10: iquote.patch
# Patch adapted from rhel-7
# Upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1236720
Patch11: nss-softokn-add_encrypt_derive.patch
-# Upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1389052
-Patch12: nss-softokn-aligned_alloc.patch
-
%description
Network Security Services Softoken Cryptographic Module
@@ -132,11 +132,10 @@ Header and library files for doing development with Network Security
Services.
%prep
%setup -q
-# activate if needed when doing a major update with new apis
-%patch10 -p0 -b .iquote
pushd nss
-%patch11 -p0 -b .add_encrypt_derive
-%patch12 -p1 -b .aligned_alloc
+# activate if needed when doing a major update with new apis
+%patch10 -p1 -b .iquote
+%patch11 -p1 -b .add_encrypt_derive
popd
%build
@@ -165,6 +164,13 @@ export BUILD_OPT=1
# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
+# In Fedora 27, we still don't allow SSE2 on i686
+%ifarch i686
+XCFLAGS="$XCFLAGS -mno-sse2"
+export NSS_DISABLE_PCLMUL=1
+export NSS_DISABLE_HW_AES=1
+export NSS_DISABLE_AVX=1
+%endif
export XCFLAGS
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -436,6 +442,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Tue Oct 3 2017 Daiki Ueno <dueno(a)redhat.com> - 3.33.0-1.0
+- Update to NSS 3.33.0
+- Update iquote.patch to really prefer in-tree headers over system headers
+
* Fri Aug 11 2017 Elio Maldonado <elio.maldonado.batiz(a)gmail.com> - 3.32.0-1.2
- Restore missing portions of add encrypt derive patch
diff --git a/sources b/sources
index 5b1aaa5..3b5bf3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nss-softokn-3.32.0.tar.gz) =
3c2deaa1bfe4509efd1f2c65cc4a7b4dc8178cc80124b0279b9ecd0cbea7b13b71dffa9027750b70a5a9ef094eb2e1827f214f953945cc00790fba867d8b7887
+SHA512 (nss-softokn-3.33.0.tar.gz) =
16688e71ee775b1a4ffaa93577b1f46664204b698e574198bc204a9d3451180f6962a73ada9b3427e9f0c094e3d1b1a86c1a9261e4e36f42959aef6ebb51452c