From 82cadaee6d96e0b35bc1e32bfe333ae240719b47 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Jan 2014 19:38:25 +0100
Subject: [PATCH] gnutls: Update to 3.2.8.

---
 gnutls/gnutls.nm                              |  4 +--
 gnutls/patches/gnutls-3.1.11-nosrp.patch      | 12 +++++++
 .../patches/gnutls-3.2.1-pem-decoding.patch   | 35 -------------------
 gnutls/patches/gnutls-3.2.7-rpath.patch       | 12 +++++++
 4 files changed, 26 insertions(+), 37 deletions(-)
 create mode 100644 gnutls/patches/gnutls-3.1.11-nosrp.patch
 delete mode 100644 gnutls/patches/gnutls-3.2.1-pem-decoding.patch
 create mode 100644 gnutls/patches/gnutls-3.2.7-rpath.patch

diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 9d1f7279a..86f3c870a 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -6,8 +6,8 @@
 name       = gnutls
 version    = %{ver_maj}.%{ver_min}
 ver_maj    = 3.2
-ver_min    = 1
-release    = 1.2
+ver_min    = 8
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/gnutls/
diff --git a/gnutls/patches/gnutls-3.1.11-nosrp.patch b/gnutls/patches/gnutls-3.1.11-nosrp.patch
new file mode 100644
index 000000000..29227c08c
--- /dev/null
+++ b/gnutls/patches/gnutls-3.1.11-nosrp.patch
@@ -0,0 +1,12 @@
+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.1-pem-decoding.patch b/gnutls/patches/gnutls-3.2.1-pem-decoding.patch
deleted file mode 100644
index 2764f8b2d..000000000
--- a/gnutls/patches/gnutls-3.2.1-pem-decoding.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Sun, 2 Jun 2013 12:10:06 +0200
-Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems.
-
----
- tests/cert-tests/pem-decoding |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
-index fe769ec..f8c6372 100755
---- a/tests/cert-tests/pem-decoding
-+++ b/tests/cert-tests/pem-decoding
-@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
-   exit $rc
- fi
- 
--diff $srcdir/complex-cert.pem tmp-pem.pem
-+cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
-+cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
-+diff tmp1 tmp2
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
-   exit $rc
- fi
- 
--rm -f tmp-pem.pem
-+rm -f tmp-pem.pem tmp1 tmp2
- 
- exit 0
--- 
-1.7.1
-
diff --git a/gnutls/patches/gnutls-3.2.7-rpath.patch b/gnutls/patches/gnutls-3.2.7-rpath.patch
new file mode 100644
index 000000000..4e6aed37a
--- /dev/null
+++ b/gnutls/patches/gnutls-3.2.7-rpath.patch
@@ -0,0 +1,12 @@
+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
+ 
-- 
2.39.2