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

- updated link patch (libtool wants -lLIB, not /path/libLIB.so)

diff --git a/gnutls-link.patch b/gnutls-link.patch
index 292968d2979e1735ce8a39ac154a2cd3421c1bd1..18079692e7eb6d407622e71aa8014fee93bf4bc9 100644 (file)
--- a/gnutls-link.patch
+++ b/gnutls-link.patch
@@ -12,3 +12,25 @@
              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.3.26/lib/Makefile.am.orig 2017-01-09 08:11:25.000000000 +0100
++++ gnutls-3.3.26/lib/Makefile.am      2017-02-04 10:47:27.231553284 +0100
+@@ -149,7 +149,7 @@
+ endif
+ 
+ if ENABLE_TROUSERS
+-thirdparty_libadd += $(LIBDL)
++thirdparty_libadd += $(LTLIBDL)
+ endif
+ 
+ if ENABLE_OPENPGP
+--- gnutls-3.3.26/configure.ac.orig    2017-01-09 07:42:13.000000000 +0100
++++ gnutls-3.3.26/configure.ac 2017-02-04 10:47:15.884886746 +0100
+@@ -329,7 +329,7 @@
+ 
+     AC_DEFINE([ENABLE_FIPS140], 1, [Enable FIPS140-2 mode])
+ 
+-    AC_SUBST([FIPS140_LIBS], $LIBDL)
++    AC_SUBST([FIPS140_LIBS], $LTLIBDL)
+   else
+     enable_fips=no
+     AC_MSG_WARN([[

diff --git a/gnutls.spec b/gnutls.spec
index 23eb38c1ac4b7f298018a9ce81a77895a5d7fd0f..07e4314bd98fd1e1b6c7f5db0d401a1f6c6b5623 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,6 +1,5 @@
 # NOTE: 3.3.x is previous-stable line
-# - for 3.4.x (current stable) see gnutls-3.4 branch (requires DEVEL p11-kit)
-# - for 3.5.x (next-stable) see DEVEL branch (requires DEVEL p11-kit)
+# - for 3.5.x (current stable) see DEVEL branch (requires DEVEL p11-kit)
 #
 # Conditional build:
 %bcond_without dane            # libdane (DANE with DNSSEC certificate verification)
@@ -12,12 +11,12 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.3.25
+Version:       3.3.26
 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.3/%{name}-%{version}.tar.xz
-# Source0-md5: 00ec77f05cc0b970f44dad0cd0c67fb9
+# Source0-md5: 9840c06019bfa7db07ed8fd5e63106d5
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.gnutls.org/