[packages/nss] up to 3.18

[atler]

commit 20561596f4ff9ad85d3da714bb454ef0a617bd0a
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Mar 19 21:40:44 2015 +0100

    up to 3.18
    
    tls12.patch no longer required -- TLS 1.2 is now enabled upstream

 nss.spec    | 12 ++++--------
 tls12.patch | 36 ------------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 2a524b0..9a7a929 100644
--- a/nss.spec
+++ b/nss.spec
@@ -3,21 +3,20 @@
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.17.4
-Release:	3
+Version:	3.18
+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:	a77df26072cabf8afb26911b6fa9b755
+# Source0-md5:	17551e94e260967abe8918cf7ccdf863
 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:		tls12.patch
-Patch1:		x32.patch
+Patch0:		x32.patch
 URL:		http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires:	nspr-devel >= %{nspr_ver}
 BuildRequires:	nss-tools
@@ -98,10 +97,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-cd nss
 %patch0 -p1
-cd ..
-%patch1 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
diff --git a/tls12.patch b/tls12.patch
deleted file mode 100644
index 0293383..0000000
--- a/tls12.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User Martin Thomson <martin.thomson at gmail.com>
-# Date 1413479112 25200
-#      Thu Oct 16 10:05:12 2014 -0700
-# Node ID f7e1c2c652f4c2522a0a5ec232ecebae1983053d
-# Parent  24852c6f89ea7ed2b8f231320d9a0a03bdd706d4
-Bug 1083900 - Updating default maximum version to 1.2
-
-diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
---- a/lib/ssl/sslsock.c
-+++ b/lib/ssl/sslsock.c
-@@ -85,22 +85,22 @@ static sslOptions ssl_defaults = {
-     PR_FALSE    /* enableFallbackSCSV */
- };
- 
- /*
-  * default range of enabled SSL/TLS protocols
-  */
- static SSLVersionRange versions_defaults_stream = {
-     SSL_LIBRARY_VERSION_3_0,
--    SSL_LIBRARY_VERSION_TLS_1_0
-+    SSL_LIBRARY_VERSION_TLS_1_2
- };
- 
- static SSLVersionRange versions_defaults_datagram = {
-     SSL_LIBRARY_VERSION_TLS_1_1,
--    SSL_LIBRARY_VERSION_TLS_1_1
-+    SSL_LIBRARY_VERSION_TLS_1_2
- };
- 
- #define VERSIONS_DEFAULTS(variant) \
-     (variant == ssl_variant_stream ? &versions_defaults_stream : \
-                                      &versions_defaults_datagram)
- 
- sslSessionIDLookupFunc  ssl_sid_lookup;
- sslSessionIDCacheFunc   ssl_sid_cache;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/20561596f4ff9ad85d3da714bb454ef0a617bd0a