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=ca3de3....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit ca3de31d0b8e810e170caeab1cf9ded6a46d38f5
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Tue Sep 12 13:18:35 2017 +0200
Disable SSE2 when building freebl on i686
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 220c853..500d1b3 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -32,7 +32,7 @@ Name: nss-softokn
Version: 3.32.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 5%{?dist}
+Release: 6%{?dist}
License: MPLv2.0
URL:
http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -168,6 +168,11 @@ export BUILD_OPT=1
# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
+# In Fedora 27, we still don't allow SSE2 on i686
+# architecture. Disable it as well as hardware GCM which depends on SSE2.
+%ifarch i686
+XCFLAGS="$XCFLAGS -DDISABLE_HW_GCM -mno-sse2"
+%endif
export XCFLAGS
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -439,6 +444,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Mon Sep 11 2017 Daiki Ueno <dueno(a)redhat.com> - 3.32.0-6
+- Disable SSE2 when building freebl on i686
+
* Wed Aug 30 2017 Daiki Ueno <dueno(a)redhat.com> - 3.32.0-5
- Update iquote.patch to really prefer in-tree headers over system headers
commit 02da3ecc814f20716343d0423012b73d4d91d05a
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Wed Aug 30 15:23:19 2017 +0200
Prefer in-tree headers over system headers
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.spec b/nss-softokn.spec
index 1e84591..220c853 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -32,7 +32,7 @@ Name: nss-softokn
Version: 3.32.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 4%{?dist}
+Release: 5%{?dist}
License: MPLv2.0
URL:
http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -67,14 +67,17 @@ 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
@@ -132,9 +135,9 @@ 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
+# activate if needed when doing a major update with new apis
+%patch10 -p1 -b .iquote
%patch11 -p0 -b .add_encrypt_derive
%patch12 -p1 -b .aligned_alloc
popd
@@ -436,6 +439,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Wed Aug 30 2017 Daiki Ueno <dueno(a)redhat.com> - 3.32.0-5
+- 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-4
- Restore missing portions of add encrypt derive patch