up to 3.37

- x32 patch no longer needed (poly1305 implementation replaced with one
  from HACL*)

diff --git a/nss.spec b/nss.spec
index 15b61a3626ef18c3d1535869331bf4befb1b7600..1b78838062d7540c8ee9ed727ec2b15d61de89dd 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,20 +3,19 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.36.1
+Version:       3.37
 Release:       1
 Epoch:         1
 License:       MPL v2.0
 Group:         Libraries
 Source0:       http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: 814d8fe3ec89006cf62078e2a56cf2f9
+# Source0-md5: f86a8c5b15aa12a1deb05995726257dd
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Source4:       nss-softokn.pc.in
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
-Patch0:                x32.patch
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires: nspr-devel >= %{nspr_ver}
 BuildRequires: nss-tools
@@ -103,7 +102,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing

diff --git a/x32.patch b/x32.patch
deleted file mode 100644 (file)
index feda224..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
-     *
-     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 */