updated to gnutls 3.3.18

Resolves: rhbz#1155901

.gitignore

@@ -42,3 +42,15 @@ 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
+/gnutls-3.3.8-hobbled.tar.xz
+/gnutls-3.3.9-hobbled.tar.xz
+/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.6-dane-test.patch

@@ -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));
- 	}

gnutls.spec

@@ -1,14 +1,14 @@
 %bcond_without dane
-%bcond_with guile
+%bcond_without guile
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 3.3.6
+Version: 3.3.18
 Release: 1%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
-BuildRequires: p11-kit-devel >= 0.11, gettext
-BuildRequires: zlib-devel, readline-devel, libtasn1-devel >= 3.1
+BuildRequires: p11-kit-devel >= 0.21.3, gettext
+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
@@ -32,7 +33,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,19 +135,18 @@ 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
 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
 
 %{SOURCE2} -e
 
 %build
-# add workaround for rhbz#1102324
-%ifarch s390
-%global optflags %optflags -O1
-%endif
 
 export LDFLAGS="-Wl,--no-add-needed"
 
@@ -161,9 +160,6 @@ export LDFLAGS="-Wl,--no-add-needed"
 	   --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" \
 %if %{with guile}
            --enable-guile \
-%ifarch %{arm}
-           --disable-largefile \
-%endif
 %else
            --disable-guile \
 %endif
@@ -174,9 +170,7 @@ export LDFLAGS="-Wl,--no-add-needed"
            --disable-dane \
 %endif
            --disable-rpath
-# Note that the arm hack above is not quite right and the proper thing would
-# be to compile guile with largefile support.
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -187,7 +181,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libguile*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls*.la
 %if %{without dane}
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
 %endif
@@ -230,7 +225,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.*
@@ -269,12 +265,64 @@ fi
 %if %{with guile}
 %files guile
 %defattr(-,root,root,-)
-%{_libdir}/libguile*.so*
+%{_libdir}/guile/2.0/guile-gnutls*.so*
 %{_datadir}/guile/site/gnutls
 %{_datadir}/guile/site/gnutls.scm
 %endif
 
 %changelog
+* 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
+
+* Mon Jan  5 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.11-2
+- enabled guile bindings (#1177847)
+
+* Thu Dec 11 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.11-1
+- new upstream release
+
+* Mon Nov 10 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.10-1
+- new upstream release
+- resolves memory leak in trust db usage (#1159429)
+
+* Thu Oct 23 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.9-2
+- applied fix for issue in get-issuer (#1155901)
+
+* Mon Oct 13 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.9-1
+- new upstream release
+
+* Fri Sep 19 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.8-2
+- strip rpath from library
+
+* Thu Sep 18 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.8-1
+- new upstream release
+
+* Mon Aug 25 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.7-1
+- new upstream release
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Wed Jul 23 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.3.6-1
 - new upstream release
 

sources

@@ -1 +1 @@
-656f56e3cf1021efe8543dc06a7f10c6  gnutls-3.3.6-hobbled.tar.xz
+768226996b7b49fafe17921b7e3762a2  gnutls-3.3.18-hobbled.tar.xz