[nss-softokn/f19] Resolves: Bug 1071679 - Define -DMP_USE_UINT_DIGIT in lib/freebl/Makefile for Linux x86
Elio Maldonado
emaldonado at fedoraproject.org
Sun Mar 2 22:12:02 UTC 2014
commit ce48c23d9b233bd5b0ec45bafac104a874a7881b
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Mar 2 13:36:11 2014 -0800
Resolves: Bug 1071679 - Define -DMP_USE_UINT_DIGIT in lib/freebl/Makefile for
Linux x86
- Patch contributed by Stephan Bergmann
- Fixes segmentation fault when signing on i686 that occurs in Rawhide
.gitignore | 2 +-
mozbug-972450.patch | 22 ++++++++++++++++++++++
nss-softokn.spec | 32 +++++++++++++++++++++++++++++---
sources | 2 +-
4 files changed, 53 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37ee959..4c9b03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.15.4.tar.gz
+/nss-softokn-3.15.5.tar.gz
diff --git a/mozbug-972450.patch b/mozbug-972450.patch
new file mode 100644
index 0000000..5be84a1
--- /dev/null
+++ b/mozbug-972450.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -190,17 +190,17 @@ ifeq ($(CPU_ARCH),x86_64)
+ ASFILES += intel-aes.s intel-gcm.s
+ EXTRA_SRCS += intel-gcm-wrap.c
+ INTEL_GCM = 1
+ MPI_SRCS += mpi_amd64.c mp_comba.c
+ endif
+ ifeq ($(CPU_ARCH),x86)
+ ASFILES = mpi_x86.s
+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
++ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+ # The floating point ECC code doesn't work on Linux x86 (bug 311432).
+ #ECL_USE_FP = 1
+ endif
+ ifeq ($(CPU_ARCH),arm)
+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+ DEFINES += -DMP_USE_UINT_DIGIT
+ DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
diff --git a/nss-softokn.spec b/nss-softokn.spec
index a0121d6..59e56db 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
%global nspr_version 4.10.2
%global nss_name nss
-%global nss_util_version 3.15.4
+%global nss_util_version 3.15.5
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
@@ -24,8 +24,8 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.15.4
-Release: 1%{?dist}
+Version: 3.15.5
+Release: 2%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -71,6 +71,12 @@ Patch9: nss-versus-softoken-tests.patch
# 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
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=972450
+# Define -DMP_USE_UINT_DIGIT for Linux x86 because mpi_x86.s
+# requires mp_digit to be an unsigned int. The MP_USE_UINT_DIGIT macro
+# ensures that. We were previously relying on ULLONG_MAX being undefined
+# in the compilation environment, which isn't true in C99 mode.
+Patch11: mozbug-972450.patch
%description
Network Security Services Softoken Cryptographic Module
@@ -125,6 +131,9 @@ Header and library files for doing development with Network Security Services.
%patch9 -p0 -b .cryptotests
# activate if needed when doing a major update with new apis
%patch10 -p0 -b .iquote
+pushd nss
+%patch11 -p1 -b .fixsegfault
+popd
%build
@@ -189,6 +198,12 @@ export IN_TREE_FREEBL_HEADERS_FIRST=1
# Use only the basicutil subset for sectools.a
export NSS_BUILD_SOFTOKEN_ONLY=1
+# display processor information
+CPU_INFO=`cat /proc/cpuinfo`
+echo "############## CPU INFO ##################"
+echo "${CPU_INFO}"
+echo "##########################################"
+
# Compile softokn plus needed support
%{__make} -C ./nss/coreconf
%{__make} -C ./nss/lib/dbm
@@ -386,6 +401,17 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Sun Mar 02 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.5-2
+- Resolves: Bug 1071679 - Define -DMP_USE_UINT_DIGIT in lib/freebl/Makefile for Linux x86
+- Patch contributed by Stephan Bergmann
+- Fixes segmentation fault when signing on i686 that occurs in Rawhide
+
+* Fri Feb 28 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.5-1
+- Update to nss-3.15.1 - Resolves: Bug 1066877
+
+* Fri Feb 28 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.4-2
+- Display processor information as part of the build
+
* Tue Jan 07 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.3-2
- Update to NSS_3_15_4_RTM
- Resolves: Bug 1049229 - nss-3.15.4 is available
diff --git a/sources b/sources
index 058c4c5..ab20ecc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-909690188688c915ba6891bd11ee610b nss-softokn-3.15.4.tar.gz
+661993eb7db44a52c0eff63bfdc819ca nss-softokn-3.15.5.tar.gz
More information about the scm-commits
mailing list