- updated to 3.24

- updated x32 patch

diff --git a/nss.spec b/nss.spec
index 080109652c88032c4bc5b8526ad5573fbc382133..385743fcd7552bc7d17fccdf64987c539a14f59b 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,13 +3,13 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.23
+Version:       3.24
 Release:       1
 Epoch:         1
 License:       MPL v2.0
 Group:         Libraries
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: 21c3fed84441b2ab4c50ac626f6517e7
+# Source0-md5: 35854c549cb02100d0f90a6ef328e2e8
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
@@ -182,7 +182,6 @@ sed -e "s,%%libdir%%,%{_libdir},g" \
        -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
        $RPM_BUILD_ROOT%{_pkgconfigdir}/nss-softokn.pc
 
-
 NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
 NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
 NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
@@ -201,10 +200,17 @@ chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 ln -s /%{_lib}/libfreebl3.so $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk $RPM_BUILD_ROOT/%{_lib}
 ln -s /%{_lib}/libfreebl3.chk $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.so $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreeblpriv3.so $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.so
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk
 
 # conflict with openssl-static
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
+# unit tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest
+
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
        echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc"
        exit 1
@@ -221,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
 # COPYING beside MPL v2.0 text contains GPL/LGPL compatibility notes
 %doc nss/{COPYING,trademarks.txt}
 %attr(755,root,root) %{_libdir}/libfreebl3.so
+%attr(755,root,root) %{_libdir}/libfreeblpriv3.so
 %attr(755,root,root) %{_libdir}/libnss3.so
 %attr(755,root,root) %{_libdir}/libnssckbi.so
 %attr(755,root,root) %{_libdir}/libnssdbm3.so
@@ -229,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libsoftokn3.so
 %attr(755,root,root) %{_libdir}/libssl3.so
 %{_libdir}/libfreebl3.chk
+%{_libdir}/libfreeblpriv3.chk
 %{_libdir}/libnssdbm3.chk
 %{_libdir}/libsoftokn3.chk
 
@@ -347,4 +355,6 @@ rm -rf $RPM_BUILD_ROOT
 %files softokn-freebl
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libfreebl3.so
+%attr(755,root,root) /%{_lib}/libfreeblpriv3.so
 /%{_lib}/libfreebl3.chk
+/%{_lib}/libfreeblpriv3.chk

diff --git a/x32.patch b/x32.patch
index 2f0ef7b318030e768935fd7f31f511a3a7dd6f21..f6f49e1b80960b9bd2c7ed8a49cec25fa6db1d4b 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,27 +1,11 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=966596
-
---- nss-3.15/nss/lib/freebl/Makefile
-+++ nss-3.15/nss/lib/freebl/Makefile
-@@ -193,12 +193,16 @@
-     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 -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
-+    ifeq ($(USE_X32),1)
-+      DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
-+    else
-+      ASFILES  = mpi_x86.s
-+      DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
-+      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
- endif
- ifeq ($(CPU_ARCH),arm)
-     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
+--- nss-3.24/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c.orig  2016-05-17 09:58:45.000000000 +0200
++++ nss-3.24/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c       2016-05-21 08:20:41.271989390 +0200
+@@ -79,7 +79,7 @@
+ 
+ static poly1305_state_internal INLINE
+ *poly1305_aligned_state(poly1305_state *state) {
+-      return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63);
++      return (poly1305_state_internal *)(((uintptr_t)state + 63) & ~63);
+ }
+ 
+ /* copy 0-63 bytes */