new upstream release

This commit is contained in:
Nikos Mavrogiannopoulos 2014-07-23 10:06:07 +02:00
parent 5560d4eeaa
commit 471707576f
4 changed files with 16 additions and 12 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ gnutls-2.10.1-nosrp.tar.bz2
/gnutls-3.3.3-hobbled.tar.xz
/gnutls-3.3.4-hobbled.tar.xz
/gnutls-3.3.5-hobbled.tar.xz
/gnutls-3.3.6-hobbled.tar.xz

View File

@ -1,16 +1,15 @@
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,
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;
*priority_cache =
gnutls_calloc(1, sizeof(struct gnutls_priority_st));
@@ -1126,10 +1127,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
if (err_pos)
*err_pos = priorities;
@@ -1129,10 +1130,16 @@
(*priority_cache)->max_empty_records = DEFAULT_MAX_EMPTY_RECORDS;
@ -29,3 +28,4 @@ index 769eed1..3a94b20 100644
if (darg == NULL) {
gnutls_assert();
goto error;
Only in gnutls-3.3.6/lib: gnutls_priority.c.orig

View File

@ -2,8 +2,8 @@
%bcond_with guile
Summary: A TLS protocol implementation
Name: gnutls
Version: 3.3.5
Release: 2%{?dist}
Version: 3.3.6
Release: 1%{?dist}
# The libraries are LGPLv2.1+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
Group: System Environment/Libraries
@ -35,7 +35,7 @@ Patch1: gnutls-3.2.7-rpath.patch
# Use only FIPS approved ciphers in the FIPS mode
Patch2: gnutls-2.12.21-fips-algorithms.patch
Patch3: gnutls-3.1.11-nosrp.patch
Patch4: gnutls-3.3.1-default-policy.patch
Patch4: gnutls-3.3.6-default-policy.patch
# Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib) = 20130424
@ -278,6 +278,9 @@ fi
%endif
%changelog
* Mon Jul 23 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.6-1
- new upstream release
* Tue Jul 01 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.5-2
- Added work-around for s390 builds with gcc 4.9 (#1102324)

View File

@ -1 +1 @@
01ffa603f8af390748bdf743a35ddc3f gnutls-3.3.5-hobbled.tar.xz
656f56e3cf1021efe8543dc06a7f10c6 gnutls-3.3.6-hobbled.tar.xz