gnutls: Update to 3.5.4

The old version did not build against nettle 3 and hence
required being updated.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index f3160f61b6db30735e7d5cb1b4c6d5486c47a0f8..f30c2b8de4a256e62779bc663a2f9bcd0bc697ba 100644 (file)
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -5,8 +5,8 @@
 
 name       = gnutls
 version    = %{ver_maj}.%{ver_min}
-ver_maj    = 3.3
-ver_min    = 10
+ver_maj    = 3.5
+ver_min    = 4
 release    = 1
 
 groups     = System/Libraries
@@ -32,9 +32,10 @@ build
                libidn-devel
                libtasn1-devel >= 3.2
                lzo-devel
-               nettle-devel >= 2.7
+               net-tools
+               nettle-devel >= 3.2
                perl
-               p11-kit-devel >= 0.14
+               p11-kit-devel >= 0.23.1
                readline-devel
                texinfo
                zlib-devel

diff --git a/gnutls/patches/gnutls-3.1.11-nosrp.patch b/gnutls/patches/gnutls-3.1.11-nosrp.patch
deleted file mode 100644 (file)
index 29227c0..0000000
--- a/gnutls/patches/gnutls-3.1.11-nosrp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c
---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc   2013-03-21 21:42:28.000000000 +0100
-+++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#if defined(_WIN32)
-+#if defined(_WIN32) || !defined(ENABLE_SRP)
- 
- int main()
- {

diff --git a/gnutls/patches/gnutls-3.2.7-rpath.patch b/gnutls/patches/gnutls-3.2.7-rpath.patch
deleted file mode 100644 (file)
index 4e6aed3..0000000
--- a/gnutls/patches/gnutls-3.2.7-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure
---- gnutls-3.2.7.orig/configure        2013-11-23 11:09:49.000000000 +0100
-+++ gnutls-3.2.7/configure     2013-11-25 16:53:05.559440656 +0100
-@@ -39652,7 +39652,7 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
- need_lib_prefix=unknown
- hardcode_into_libs=no
-