updated to 3.3.22

Resolves: rhbz#1310103

.gitignore

@@ -48,3 +48,13 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.3.10-hobbled.tar.xz
 /gnutls-3.3.11-hobbled.tar.xz
 /gnutls-3.3.12-hobbled.tar.xz
+/gnutls-3.3.13-hobbled.tar.xz
+/gnutls-3.3.14-hobbled.tar.xz
+/gnutls-3.3.15-hobbled.tar.xz
+/gnutls-3.3.16-hobbled.tar.xz
+/gnutls-3.3.17-hobbled.tar.xz
+/gnutls-3.3.18-hobbled.tar.xz
+/gnutls-3.3.19-hobbled.tar.xz
+/gnutls-3.3.20-hobbled.tar.xz
+/gnutls-3.3.21-hobbled.tar.xz
+/gnutls-3.3.22-hobbled.tar.xz

gnutls-3.3.19-default-policy.patch

@@ -1,15 +1,16 @@
-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;
+diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
+index c71237f..1a6fbef 100644
+--- a/lib/gnutls_priority.c
++++ b/lib/gnutls_priority.c
+@@ -1114,6 +1114,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
  	rmadd_func *fn;
  	bulk_rmadd_func *bulk_fn;
+ 	const cipher_entry_st *centry;
 +	unsigned dset = 0;
  
  	if (err_pos)
  		*err_pos = priorities;
-@@ -1129,10 +1130,16 @@
+@@ -1133,10 +1134,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
  
  	(*priority_cache)->max_empty_records = DEFAULT_MAX_EMPTY_RECORDS;
  
@@ -28,4 +29,3 @@ diff -ur gnutls-3.3.6.orig/lib/gnutls_priority.c gnutls-3.3.6/lib/gnutls_priorit
  	if (darg == NULL) {
  		gnutls_assert();
  		goto error;
-Only in gnutls-3.3.6/lib: gnutls_priority.c.orig

gnutls.spec

@@ -2,13 +2,13 @@
 %bcond_without guile
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 3.3.12
+Version: 3.3.22
 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: zlib-devel, readline-devel, libtasn1-devel >= 3.1
+BuildRequires: zlib-devel, readline-devel, libtasn1-devel >= 4.3
 BuildRequires: libtool, automake, autoconf, texinfo
 BuildRequires: autogen-libopts-devel >= 5.18 autogen
 BuildRequires: nettle-devel >= 2.7.1
@@ -17,6 +17,7 @@ BuildRequires: libidn-devel
 BuildRequires: gperf
 Requires: crypto-policies
 Requires: p11-kit-trust
+Requires: libtasn1 >= 4.3
 
 %if %{with dane}
 BuildRequires: unbound-devel unbound-libs
@@ -33,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.3.19-default-policy.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -136,11 +137,13 @@ This package contains Guile bindings for the library.
 %patch1 -p1 -b .rpath
 %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
 rm -f lib/minitasn1/*.c lib/minitasn1/*.h
 rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/*.h 
 sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
+chmod 755 tests/slow/test-hash-large
 
 %{SOURCE2} -e
 
@@ -167,8 +170,10 @@ export LDFLAGS="-Wl,--no-add-needed"
 %else
            --disable-dane \
 %endif
+	   --with-arcfour128 \
+	   --with-ssl3 \
            --disable-rpath
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -223,7 +228,8 @@ fi
 %files -f gnutls.lang
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls.so.28*
-%doc COPYING COPYING.LESSER README AUTHORS NEWS THANKS
+%doc README AUTHORS NEWS THANKS
+%license COPYING COPYING.LESSER
 
 %files c++
 %{_libdir}/libgnutlsxx.so.*
@@ -268,6 +274,43 @@ fi
 %endif
 
 %changelog
+* Fri Mar 11 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.22-1
+- updated to 3.3.22
+
+* Fri Feb 19 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.21-2
+- Fix issue with hash truncation on large input (#1310103)
+
+* Wed Feb  3 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.21-1
+- updated to 3.3.21
+- Fix broken key usage flags introduced in 3.3.20 (#1303355)
+
+* Mon Jan 11 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.20-1
+- updated to 3.3.20
+
+* Mon Nov 23 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.19-1
+- updated to 3.3.19
+
+* Mon Sep 14 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.18-1
+- updated to 3.3.18
+
+* Mon Jul 13 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.17-1
+- updated to 3.3.17
+
+* Mon Jul 13 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.16-1
+- updated to 3.3.16
+
+* Mon May  4 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.3.15-1
+- updated to 3.3.15 (#1218426,#1218513)
+
+* Mon Mar 30 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.14-1
+- new upstream release
+- improved BER decoding of PKCS #12 structures (#1131461)
+
+* Thu Feb 26 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.13-1
+- new upstream release
+- Make build verbose
+- Use %%license
+
 * Mon Jan 19 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.12-1
 - new upstream release
 

sources

@@ -1 +1 @@
-d8b3988eacb63d7b84fe459d55313eff  gnutls-3.3.12-hobbled.tar.xz
+922001010708a3cf99b7e5fbbc8dcc72  gnutls-3.3.22-hobbled.tar.xz