- updated to 3.5.8 (fixes GNUTLS-SA-2017-1 GNUTLS-SA-2017-2)

- updated link patch

diff --git a/gnutls-link.patch b/gnutls-link.patch
index 50ead07a695103bd6c195be3277abaddf2a0d66f..fb14acdcec6fd0b7d3820b69e2a102dc4c4e9793 100644 (file)
--- a/gnutls-link.patch
+++ b/gnutls-link.patch
@@ -1,5 +1,5 @@
---- gnutls-3.5.6/gl/m4/lib-link.m4.orig        2008-05-17 07:44:04.000000000 +0200
-+++ gnutls-3.5.6/gl/m4/lib-link.m4     2011-04-02 11:29:18.159546509 +0200
+--- gnutls-3.5.6/m4/lib-link.m4.orig   2008-05-17 07:44:04.000000000 +0200
++++ gnutls-3.5.6/m4/lib-link.m4        2011-04-02 11:29:18.159546509 +0200
 @@ -322,7 +322,11 @@
            fi
            if test "X$found_dir" != "X"; then
@@ -12,24 +12,3 @@
              if test "X$found_so" != "X"; then
                dnl Linking with a shared library. We attempt to hardcode its
                dnl directory into the executable's runpath, unless it's the
---- gnutls-3.4.4.1/configure.ac.orig   2015-09-08 18:38:30.228498005 +0200
-+++ gnutls-3.4.4.1/configure.ac        2015-09-08 18:38:32.501831080 +0200
-@@ -515,6 +515,7 @@
-                  Trspi_Error_String(err);])],
-                 [AC_MSG_RESULT(yes)
-                  AC_SUBST([TSS_LIBS], [-ltspi])
-+                 AC_SUBST([TSS_DL_LIBS], [-ldl])
-                  AC_SUBST([TSS_CFLAGS], [])
-                  AC_DEFINE([HAVE_TROUSERS], 1, [Enable TPM])
-                  with_tpm=yes],
---- gnutls-3.4.4.1/lib/Makefile.am.orig        2015-07-21 11:42:08.000000000 +0200
-+++ gnutls-3.4.4.1/lib/Makefile.am     2015-09-08 18:38:26.635165277 +0200
-@@ -137,7 +137,7 @@
-       auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
-       extras/libgnutls_extras.la
- thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \
--      $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT)
-+      $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_DL_LIBS)
- 
- if HAVE_LIBIDN
- thirdparty_libadd += $(LIBIDN_LIBS)

diff --git a/gnutls.spec b/gnutls.spec
index f2bbcd192063624775b652444e6b134c0c06c49b..4ede83d506ff606ee5e233b84bdf171e569fd77b 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -11,12 +11,12 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.5.6
+Version:       3.5.8
 Release:       1
 License:       LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.xz
-# Source0-md5: 7a38b23757aae009c3eb5bb12fb0afda
+# Source0-md5: 113e892e51acdb11b81804cd355adfee
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.gnutls.org/
@@ -31,9 +31,10 @@ BuildRequires:       guile-devel >= 5:2.0
 BuildRequires: libcfg+-devel
 BuildRequires: libidn-devel >= 1.31
 BuildRequires: libstdc++-devel
-BuildRequires: libtasn1-devel >= 4.3
+BuildRequires: libtasn1-devel >= 4.9
+BuildRequires: libunistring-devel
 BuildRequires: libtool >= 2:2
-BuildRequires: nettle-devel >= 3.1
+BuildRequires: nettle-devel >= 3.3
 # miniopencdk is included in sources and currently maintained
 # as part of gnutls, not external package
 #BuildRequires:        opencdk-devel >= 0.6.6
@@ -69,8 +70,8 @@ Summary:      GnuTLS shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone GnuTLS
 Group:         Libraries
 Requires:      libidn >= 1.31
-Requires:      libtasn1 >= 4.3
-Requires:      nettle >= 3.1
+Requires:      libtasn1 >= 4.9
+Requires:      nettle >= 3.3
 #Requires:     opencdk >= 0.6.6
 Requires:      p11-kit >= 0.23.1
 %{?with_tpm:Requires:  trousers-libs >= 0.3.11}
@@ -89,8 +90,9 @@ License:      LGPL v2.1+ (libgnutls), GPL v3+ (openssl library)
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      libidn-devel >= 1.31
-Requires:      libtasn1-devel >= 4.3
-Requires:      nettle-devel >= 3.1
+Requires:      libtasn1-devel >= 4.9
+Requires:      libunistring-devel
+Requires:      nettle-devel >= 3.3
 #Requires:     opencdk-devel >= 0.6.6
 Requires:      p11-kit-devel >= 0.23.1
 %{?with_tpm:Requires:  trousers-devel >= 0.3.11}
@@ -256,7 +258,7 @@ Wiązania Guile do GnuTLS.
 %{__mv} build-aux/snippet{,.save}
 %{__libtoolize}
 %{__mv} build-aux/snippet{.save,}
-%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4
+%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}