nmav pushed to gnutls (master). "updated default policy patch"

[notifications at fedoraproject.org]

>From a5e0426bc9e3cf72939b10140add8a015a990ccf Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date: Mon, 4 May 2015 13:01:32 +0200
Subject: updated default policy patch


diff --git a/gnutls-3.3.6-default-policy.patch b/gnutls-3.3.6-default-policy.patch
deleted file mode 100644
index 94185e8..0000000
--- a/gnutls-3.3.6-default-policy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur gnutls-3.3.6.orig/lib/gnutls_priority.c gnutls-3.3.6/lib/gnutls_priority.c
---- gnutls-3.3.6.orig/lib/gnutls_priority.c	2014-07-22 23:43:41.000000000 +0200
-+++ gnutls-3.3.6/lib/gnutls_priority.c	2014-07-23 10:13:30.456310043 +0200
-@@ -1110,6 +1110,7 @@
- 	int algo;
- 	rmadd_func *fn;
- 	bulk_rmadd_func *bulk_fn;
-+	unsigned dset = 0;
- 
- 	if (err_pos)
- 		*err_pos = priorities;
-@@ -1129,10 +1130,16 @@
- 
- 	(*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;
-Only in gnutls-3.3.6/lib: gnutls_priority.c.orig
diff --git a/gnutls-3.4.1-default-policy.patch b/gnutls-3.4.1-default-policy.patch
new file mode 100644
index 0000000..083b133
--- /dev/null
+++ b/gnutls-3.4.1-default-policy.patch
@@ -0,0 +1,31 @@
+diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
+index 06e6cf4..17d830e 100644
+--- a/lib/gnutls_priority.c
++++ b/lib/gnutls_priority.c
+@@ -1060,6 +1060,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
+ 	bulk_rmadd_func *bulk_fn;
+ 	bulk_rmadd_func *bulk_given_fn;
+ 	const cipher_entry_st *centry;
++	unsigned dset = 0;
+ 
+ 	if (err_pos)
+ 		*err_pos = priorities;
+@@ -1077,10 +1078,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
+ 	(*priority_cache)->sr = SR_PARTIAL;
+ 	(*priority_cache)->min_record_version = 1;
+ 
+-	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 4c1ac3d..08886a0 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -7,7 +7,7 @@ Release: 1%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
-BuildRequires: p11-kit-devel >= 0.21.3, gettext
+BuildRequires: p11-kit-devel >= 0.21.3, gettext-devel
 BuildRequires: zlib-devel, readline-devel, libtasn1-devel >= 4.3
 BuildRequires: libtool, automake, autoconf, texinfo
 BuildRequires: autogen-libopts-devel >= 5.18 autogen
@@ -34,7 +34,7 @@ Source1: libgnutls-config
 Source2: hobble-gnutls
 Patch1: gnutls-3.2.7-rpath.patch
 Patch3: gnutls-3.1.11-nosrp.patch
-Patch4: gnutls-3.3.6-default-policy.patch
+Patch4: gnutls-3.4.1-default-policy.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnutls.git/commit/?h=master&id=a5e0426bc9e3cf72939b10140add8a015a990ccf