[jhbuild] 3.4: Bump gnutls to 2.12.0

[Stefan Walter <stefw src gnome org>]

commit ddc8b3cdc6fd6ca4d578c5abe99334250979c2fe
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Oct 6 13:45:00 2011 +0200

    3.4: Bump gnutls to 2.12.0
    
    This is needed by glib-networking, in order for the PKCS#11
    database stuff to work. Recommend 2.12.8
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656903

 modulesets/gnome-suites-core-deps-3.4.modules |   13 +++-----
 patches/gnutls-2.12.0-rpath.patch             |   38 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 6583706..bdae23b 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -450,16 +450,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnutls" version="2.10.2" autogenargs="--enable-guile=no">
-    <pkg-config>gnutls.pc</pkg-config>
-    <branch module="gnutls/gnutls-2.10.2.tar.bz2" version="2.10.2"
+  <autotools id="gnutls" version="2.12.0" autogenargs="--enable-guile=no --with-libgcrypt">
+    <branch module="gnutls/gnutls-2.12.0.tar.bz2" version="2.12.0"
 	    repo="ftp.gnu.org"
-            hash="sha256:e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
-            size="7458438">
+            hash="sha256:67fe6449e1f65cd2d8eae85f8ec3280902c1a2079a245691ed252d4117033629"
+            size="7142406">
       <!-- Build fix for rpath?  -->
-      <patch file="gnutls-2.10.2-rpath.patch" strip="1"/>
-      <!-- Backport from upstream git -->
-      <patch file="gnutls-2.10.1-handshake-errors.patch" strip="1"/>
+      <patch file="gnutls-2.12.0-rpath.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libgcrypt" />
diff --git a/patches/gnutls-2.12.0-rpath.patch b/patches/gnutls-2.12.0-rpath.patch
new file mode 100644
index 0000000..c36cacd
--- /dev/null
+++ b/patches/gnutls-2.12.0-rpath.patch
@@ -0,0 +1,38 @@
+--- gnutls-2.12.0/configure.orig	2011-03-24 19:09:23.000000000 +0100
++++ gnutls-2.12.0/configure	2011-08-26 15:50:56.000000000 +0200
+@@ -16730,7 +16730,7 @@ shlibpath_var=
+ 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
+
+@@ -17115,7 +17115,7 @@ rm -f core conftest.err conftest.$ac_obj
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -20199,7 +20199,7 @@ shlibpath_var=
+ 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
+
+@@ -20583,7 +20583,7 @@ rm -f core conftest.err conftest.$ac_obj
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+
+   # We used to test for /lib/ld.so.1 and disable shared libraries on