[jhbuild] [3.0] Add patches for gnutls

From: William Jon McCann <mccann src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] [3.0] Add patches for gnutls
Date: Tue, 12 Oct 2010 02:36:50 +0000 (UTC)
commit efbff450f87efe281e6377b994d621fbd4c7b4f5
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Oct 11 22:36:02 2010 -0400

    [3.0] Add patches for gnutls

 modulesets/gnome-suites-core-deps-3.0.modules |   16 +++-
 patches/gnutls-2.10.1-handshake-errors.patch  |   57 ++++++++++++++
 patches/gnutls-2.10.2-rpath.patch             |  104 +++++++++++++++++++++++++
 3 files changed, 173 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index f2763da..6424e20 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -16,6 +16,8 @@
     href="git://anongit.freedesktop.org/gstreamer/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="ftp.gnu.org"
+    href="ftp://ftp.gnu.org/pub/gnu/"/>
 <repository type="tarball" name="sqlite.org"
     href="http://www.sqlite.org/"/>
 <repository type="tarball" name="gnome.org"
@@ -306,15 +308,21 @@
     </dependencies>
   </autotools>
 
-  <tarball id="gnutls" version="2.10.2" autogenargs="--enable-guile=no">
-    <source href="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.10.2.tar.bz2";
+  <autotools id="gnutls" version="2.10.2" autogenargs="--enable-guile=no">
+    <branch module="gnutls/gnutls-2.10.2.tar.bz2" version="2.10.2"
+	    repo="ftp.gnu.org"
             hash="sha256:e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
-            size="7458438" />
+            size="7458438">
+      <!-- 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"/>
+    </branch>
     <dependencies>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
     </dependencies>
-  </tarball>
+  </autotools>
 
   <tarball id="gmime" version="2.4.15">
     <source href="http://download.gnome.org/sources/gmime/2.4/gmime-2.4.15.tar.bz2";
diff --git a/patches/gnutls-2.10.1-handshake-errors.patch b/patches/gnutls-2.10.1-handshake-errors.patch
new file mode 100644
index 0000000..1c11dc7
--- /dev/null
+++ b/patches/gnutls-2.10.1-handshake-errors.patch
@@ -0,0 +1,57 @@
+diff -up gnutls-2.10.1/lib/gnutls_handshake.c.errors gnutls-2.10.1/lib/gnutls_handshake.c
+--- gnutls-2.10.1/lib/gnutls_handshake.c.errors	2010-07-25 10:35:31.000000000 +0200
++++ gnutls-2.10.1/lib/gnutls_handshake.c	2010-09-13 17:16:05.000000000 +0200
+@@ -2769,7 +2769,7 @@ _gnutls_handshake_client (gnutls_session
+     case STATE1:
+       ret = _gnutls_send_hello (session, AGAIN (STATE1));
+       STATE = STATE1;
+-      IMED_RET ("send hello", ret, 0);
++      IMED_RET ("send hello", ret, 1);
+ 
+     case STATE2:
+       /* receive the server hello */
+@@ -2849,7 +2849,7 @@ _gnutls_handshake_client (gnutls_session
+ 	ret =
+ 	  _gnutls_send_client_certificate_verify (session, AGAIN (STATE9));
+       STATE = STATE9;
+-      IMED_RET ("send client certificate verify", ret, 0);
++      IMED_RET ("send client certificate verify", ret, 1);
+ 
+       STATE = STATE0;
+     default:
+@@ -3002,7 +3002,7 @@ _gnutls_handshake_server (gnutls_session
+     case STATE2:
+       ret = _gnutls_send_hello (session, AGAIN (STATE2));
+       STATE = STATE2;
+-      IMED_RET ("send hello", ret, 0);
++      IMED_RET ("send hello", ret, 1);
+ 
+     case STATE70:
+       if (session->security_parameters.extensions.do_send_supplemental)
+@@ -3044,7 +3044,7 @@ _gnutls_handshake_server (gnutls_session
+ 					GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
+ 					AGAIN (STATE6));
+       STATE = STATE6;
+-      IMED_RET ("send server hello done", ret, 0);
++      IMED_RET ("send server hello done", ret, 1);
+ 
+     case STATE71:
+       if (session->security_parameters.extensions.do_recv_supplemental)
+@@ -3119,7 +3119,7 @@ _gnutls_handshake_common (gnutls_session
+ #endif
+ 
+       ret = _gnutls_send_handshake_final (session, FALSE);
+-      IMED_RET ("send handshake final", ret, 0);
++      IMED_RET ("send handshake final", ret, 1);
+ 
+       /* only store if we are not resuming */
+       if (session->security_parameters.entity == GNUTLS_SERVER)
+@@ -3132,7 +3132,7 @@ _gnutls_handshake_common (gnutls_session
+     {				/* if we are a client not resuming - or we are a server resuming */
+ 
+       ret = _gnutls_send_handshake_final (session, TRUE);
+-      IMED_RET ("send handshake final 2", ret, 0);
++      IMED_RET ("send handshake final 2", ret, 1);
+ 
+ #ifdef ENABLE_SESSION_TICKET
+       switch (STATE)
diff --git a/patches/gnutls-2.10.2-rpath.patch b/patches/gnutls-2.10.2-rpath.patch
new file mode 100644
index 0000000..bc2292b
--- /dev/null
+++ b/patches/gnutls-2.10.2-rpath.patch
@@ -0,0 +1,104 @@
+diff -up gnutls-2.10.2/build-aux/config.rpath gnutls-2.10.2/build-aux/config
+diff -up gnutls-2.10.2/configure.rpath gnutls-2.10.2/configure
+--- gnutls-2.10.2/configure.rpath	2010-09-30 08:43:40.000000000 +0200
++++ gnutls-2.10.2/configure	2010-09-30 15:56:59.000000000 +0200
+@@ -15112,7 +15112,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
+ 
+@@ -15510,7 +15510,7 @@ fi
+   # 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;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
+@@ -18777,7 +18777,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
+ 
+@@ -19173,7 +19173,7 @@ fi
+   # 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;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
+diff -up gnutls-2.10.2/lib/build-aux/config.rpath gnutls-2.10.2/lib/build-aux/config
+diff -up gnutls-2.10.2/lib/configure.rpath gnutls-2.10.2/lib/configure
+--- gnutls-2.10.2/lib/configure.rpath	2010-09-30 08:42:57.000000000 +0200
++++ gnutls-2.10.2/lib/configure	2010-09-30 15:58:06.000000000 +0200
+@@ -10839,7 +10839,8 @@ 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
+ 
+@@ -11237,7 +11238,7 @@ fi
+   # 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;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
+@@ -25790,7 +25791,8 @@ 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
+ 
+@@ -26186,7 +26188,7 @@ fi
+   # 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;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
+diff -up gnutls-2.10.2/libextra/build-aux/config.rpath gnutls-2.10.2/libextra/build-aux/config
+diff -up gnutls-2.10.2/libextra/configure.rpath gnutls-2.10.2/libextra/configure
+--- gnutls-2.10.2/libextra/configure.rpath	2010-09-30 08:43:20.000000000 +0200
++++ gnutls-2.10.2/libextra/configure	2010-09-30 15:58:49.000000000 +0200
+@@ -10013,7 +10013,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
+ 
+@@ -10411,7 +10411,7 @@ fi
+   # 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;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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]