[gnutls] new upstream release.

[Nikos Mavrogiannopoulos]

commit eaa875629e0525e0daa4518c8053ba422e22142a
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri May 9 10:52:07 2014 +0200

    new upstream release.

 .gitignore                                         |    1 +
 ...ery-weak-certificate-verification-profile.patch |   80 ----------------
 gnutls-3.3.1-default-policy.patch                  |   31 ++++++
 gnutls-global-deinit.patch                         |   99 --------------------
 gnutls-othername.patch                             |   27 ------
 gnutls.spec                                        |   23 ++---
 sources                                            |    2 +-
 7 files changed, 44 insertions(+), 219 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0efc727..f558b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.2.13-hobbled.tar.xz
 /gnutls-3.3.0-hobbled.tar.xz
 /gnutls-3.3.1-hobbled.tar.xz
+/gnutls-3.3.2-hobbled.tar.xz
diff --git a/gnutls-3.3.1-default-policy.patch b/gnutls-3.3.1-default-policy.patch
new file mode 100644
index 0000000..631ad72
--- /dev/null
+++ b/gnutls-3.3.1-default-policy.patch
@@ -0,0 +1,31 @@
+diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
+index 769eed1..3a94b20 100644
+--- a/lib/gnutls_priority.c
++++ b/lib/gnutls_priority.c
+@@ -1107,6 +1107,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
+ 	int algo;
+ 	rmadd_func *fn;
+ 	bulk_rmadd_func *bulk_fn;
++	unsigned dset = 0;
+ 
+ 	*priority_cache =
+ 	    gnutls_calloc(1, sizeof(struct gnutls_priority_st));
+@@ -1126,10 +1127,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
+ 
+ 	(*priority_cache)->max_empty_records = DEFAULT_MAX_EMPTY_RECORDS;
+ 
+-	if (priorities == NULL)
+-		priorities = "NORMAL";
++	if (priorities == NULL) {
++		priorities = "@SYSTEM";
++		dset = 1;
++	}
+ 
+ 	darg = resolve_priorities(priorities);
++	if (darg == NULL && dset == 1) {
++		priorities = "NORMAL";
++		darg = resolve_priorities(priorities);
++	}
+ 	if (darg == NULL) {
+ 		gnutls_assert();
+ 		goto error;
diff --git a/gnutls.spec b/gnutls.spec
index 937c71b..31ee380 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -2,8 +2,8 @@
 %bcond_with guile
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 3.3.1
-Release: 4%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -30,11 +30,9 @@ Source1: libgnutls-config
 Source2: hobble-gnutls
 Patch1: gnutls-3.2.7-rpath.patch
 # Use only FIPS approved ciphers in the FIPS mode
-Patch7: gnutls-2.12.21-fips-algorithms.patch
-Patch8: gnutls-3.1.11-nosrp.patch
-Patch9: gnutls-othername.patch
-Patch10: gnutls-global-deinit.patch
-Patch11: 0001-Added-the-very-weak-certificate-verification-profile.patch
+Patch2: gnutls-2.12.21-fips-algorithms.patch
+Patch3: gnutls-3.1.11-nosrp.patch
+Patch4: gnutls-3.3.1-default-policy.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -137,11 +135,9 @@ This package contains Guile bindings for the library.
 %patch1 -p1 -b .rpath
 # This patch is not applicable as we use nettle now but some parts will be
 # later reused.
-#%patch7 -p1 -b .fips
-%patch8 -p1 -b .nosrp
-%patch9 -p1 -b .othername
-%patch10 -p1 -b .global-deinit
-%patch11 -p1 -b .very-weak
+#%patch2 -p1 -b .fips
+%patch3 -p1 -b .nosrp
+%patch4 -p1 -b .default-policy
 sed 's/gnutls_srp.c//g' -i lib/Makefile.in
 sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
 
@@ -275,6 +271,9 @@ fi
 %endif
 
 %changelog
+* Fri May 09 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.3.2-1
+- new upstream release
+
 * Mon May 05 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.3.1-4
 - Replaced /etc/crypto-profiles/apps with /etc/crypto-policies/back-ends.
 - Added support for "very weak" profile.
diff --git a/sources b/sources
index 779f5aa..bca435d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14b004be63ef286edcce5d0f7aa10d6f  gnutls-3.3.1-hobbled.tar.xz
+4a729f47d5b87f484b0f16e92e5d30e5  gnutls-3.3.2-hobbled.tar.xz