From 394e04cd5e25522f2265d0d16844c4e6f44b88c7 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Sun, 2 Oct 2016 10:53:35 +0200
Subject: [PATCH] up to 3.27

- bumped required nspr to 4.13
- grouped unit tests removal
- adjusted x32 patch
---
 nss.spec  | 13 ++++++++-----
 x32.patch | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nss.spec b/nss.spec
index bb717b0..420c9fa 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,15 +1,15 @@
-%define	nspr_ver	1:4.12
+%define	nspr_ver	1:4.13
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.26
+Version:	3.27
 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:	b71ab412cf07af436726679b204b0777
+# Source0-md5:	d11b3038db57b2acaf9a638cd41ce8d8
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	http://www.cacert.org/certs/root.der
@@ -154,8 +154,6 @@ cp -p ecc/dist/public/dbm/*	$RPM_BUILD_ROOT%{_includedir}/nss
 cp -p ecc/dist/public/nss/*	$RPM_BUILD_ROOT%{_includedir}/nss
 install -p ecc/dist/Linux*/bin/*	$RPM_BUILD_ROOT%{_bindir}
 install -p ecc/dist/Linux*/lib/*	$RPM_BUILD_ROOT%{_libdir}
-# exclude unit tests
-%{__rm} $RPM_BUILD_ROOT{%{_bindir}/{der,pk11,ssl}_gtest,%{_libdir}/libgtest*}
 
 # non-ECC version, we need only libnssdbm3, libsoftokn3, libfreebl3
 install -p noecc/dist/Linux*/lib/libnssdbm3.*	$RPM_BUILD_ROOT%{_libdir}
@@ -209,9 +207,14 @@ ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
 # unit tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/der_gtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/ectest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/gtests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/ssl_gtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
 
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
 	echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc"
diff --git a/x32.patch b/x32.patch
index f6f49e1..feda224 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,11 @@
 --- 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);
+     *
+     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 */
-- 
2.44.0