diff --git a/.gitignore b/.gitignore index ac2c7d2..b5b7120 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ gnutls-2.10.1-nosrp.tar.bz2 /gnutls-3.3.4-hobbled.tar.xz /gnutls-3.3.5-hobbled.tar.xz /gnutls-3.3.6-hobbled.tar.xz +/gnutls-3.3.7-hobbled.tar.xz diff --git a/gnutls-3.3.6-dane-test.patch b/gnutls-3.3.6-dane-test.patch deleted file mode 100644 index 0a41331..0000000 --- a/gnutls-3.3.6-dane-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/dane.c b/tests/dane.c -index d4112a8..3c8ca58 100644 ---- a/tests/dane.c -+++ b/tests/dane.c -@@ -57,7 +57,7 @@ static void dane_raw_check(void) - int secure; - int bogus; - -- ret = dane_state_init(&s, 0); -+ ret = dane_state_init(&s, DANE_F_IGNORE_LOCAL_RESOLVER); - if (ret < 0) { - fail("dane_state_init: %s\n", dane_strerror(ret)); - } diff --git a/gnutls.spec b/gnutls.spec index 4653a24..6184475 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -2,8 +2,8 @@ %bcond_with guile Summary: A TLS protocol implementation Name: gnutls -Version: 3.3.6 -Release: 2%{?dist} +Version: 3.3.7 +Release: 1%{?dist} # The libraries are LGPLv2.1+, utilities are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -32,7 +32,6 @@ Source0: %{name}-%{version}-hobbled.tar.xz Source1: libgnutls-config Source2: hobble-gnutls Patch1: gnutls-3.2.7-rpath.patch -Patch2: gnutls-3.3.6-dane-test.patch Patch3: gnutls-3.1.11-nosrp.patch Patch4: gnutls-3.3.6-default-policy.patch @@ -135,7 +134,6 @@ This package contains Guile bindings for the library. %setup -q %patch1 -p1 -b .rpath -%patch2 -p1 -b .dane-test %patch3 -p1 -b .nosrp %patch4 -p1 -b .default-policy sed 's/gnutls_srp.c//g' -i lib/Makefile.in @@ -271,6 +269,9 @@ fi %endif %changelog +* Mon Aug 25 2014 Nikos Mavrogiannopoulos 3.3.7-1 +- new upstream release + * Sat Aug 16 2014 Fedora Release Engineering - 3.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 368b3cd..e978741 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -656f56e3cf1021efe8543dc06a7f10c6 gnutls-3.3.6-hobbled.tar.xz +9f3811d7dc10cfd835da386e5bd99014 gnutls-3.3.7-hobbled.tar.xz