Add Debian patch to allow building against gnutls-2.12 (bug #388895, thanks to Lars Wendler and Pacho Ramos).

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 84 insertions, 34 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index ed9568407a68..f3c5fcb9858e 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.342 2012/01/12 02:24:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.343 2012/02/12 22:10:40 tetromino Exp $
+
+  12 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gnome-vfs-2.24.0-gnutls27.patch, gnome-vfs-2.24.4-r1.ebuild,
+  +files/gnome-vfs-2.24.4-gnutls27.patch:
+  Add Debian patch to allow building against gnutls-2.12 (bug #388895, thanks
+  to Lars Wendler and Pacho Ramos).
 
   12 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-vfs-2.24.4-r1.ebuild:
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index caa1f5b65c8c..eafc74e11ec4 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -6,19 +6,19 @@ AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300
 AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
 AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5
 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
-AUX gnome-vfs-2.24.0-gnutls27.patch 1332 RMD160 4524693921a3a7675d50da69dec6766dbd2b5861 SHA1 f7fefc9d6c9d39b02d421ee96c5707f00debb170 SHA256 66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d
 AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 RMD160 3c7069f905861ddad103a0696cac41033905e231 SHA1 91a57c3e51da5e27f7a4382d559935c1370af3d1 SHA256 beb9aace30a3976fae53c1d6972e2dc1dbc1040de804197c01ecea296f3eda25
 AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 RMD160 8135b3d02f5b82bc297fe35617e077cfbee8feaf SHA1 71eff46e892e5b9da952054671f7c6eb2ce9a506 SHA256 aa87d5a019cb2ebfa3f66b64f7bebb19ed143a825d33e9d7370f89f9630b0214
 AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 RMD160 5289d40fdad2581985a6a97295df101904a8f0c4 SHA1 d24a56fd996e5cb315626e5d69dae820109f5f2d SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe
+AUX gnome-vfs-2.24.4-gnutls27.patch 3235 RMD160 fde822d2b6552ef3ead45191a32af4f36c3a1d03 SHA1 811a82255b192ecf604ab9074866c71e1d7f297a SHA256 36ddcc5004189c3aea4edbd88fa3bbfe605737b21246110b144ffffcfc29c38c
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 RMD160 ee9a680747ed1060dd41bc64fd78d9791faa2fa8 SHA1 97b5a7ab01ba0976fac02accad7671ade5b8cbe0 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 RMD160 6a5952bea02dfc96782b6f1129fe765f5313a75b SHA1 0dc634e7dd979fd218f378902c0ca1af80738961 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-EBUILD gnome-vfs-2.24.4-r1.ebuild 3580 RMD160 c344409780764eef3c88c35a18fe7ae0888d8b66 SHA1 70d847e92086fdb7cc1a79e241e215ef1933b299 SHA256 5fbb2f7131e83a1f605d4e2c4949f5d7728b318f006d83530b8ecf4ce707e577
-MISC ChangeLog 45663 RMD160 7344f1e9c5f3ea81692b3f075a8bb45aa47067fc SHA1 0b33eba44bba7d09b5913b9cadf4ce7350e4663c SHA256 663b5c1daab91e80525c691caa7c1811b59d51e618d28dddc2c7c5bc50897321
+EBUILD gnome-vfs-2.24.4-r1.ebuild 3626 RMD160 06cc716a5ee0f8122111db70c4e0777e7e18d56c SHA1 9381afb4ce328b894e30166f308d4fc8014b0d87 SHA256 c7e012c2a7b3c1edce949ff7e297449a0153dd75769501a0adc3c3c5da0da1cc
+MISC ChangeLog 45949 RMD160 ff2fbf6ec0cdd254e58b9dc405964a56a51159fa SHA1 3dfe4f62e022635d28df964b8ea330be8dd82b60 SHA256 71cf6aa7b0459882553a67861540b76839e7269b93410160ef9601d5ad1ab90d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8ORHgACgkQdjK8w9WeBnBNyAD/bJlhAX19gJQrQGVgMAunATO2
-F5K1KNbx6156+9AYJrYA/0nH1B5uiEw9hmFxhj/UM0yyFOjv2uWRWXiZjE8xtILA
-=poSZ
+iF4EAREIAAYFAk84OOUACgkQdjK8w9WeBnCrwwEAhOnB8J4VoW3BlmSld8pNiAA6
+5bXvDievazIJQmqZUxAA/A2OtJ5DPl29EqGsFB5zRTFTyJUPD+/hw/BHnhD9FhMN
+=csax
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
deleted file mode 100644
index f6fa18b1790d..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-# Use pkg-config in place of gnutls own macro since it's not present anymore.
---- a/configure.in	2009-03-07 19:59:53.805507753 +0100
-+++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
-@@ -686,14 +686,14 @@
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
-     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
- 
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
-+						    have_ssl=true],
-+						    AC_MSG_ERROR([Unable to find GNUTLS]))
-     fi
-   fi
- fi
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
new file mode 100644
index 000000000000..93ebd17c7eff
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
@@ -0,0 +1,68 @@
+Debian #529827
+GNOME #574589
+Gentoo #253729
+Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
+
+Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
+Use pkg-config in place of gnutls own macro since it's not present anymore.
+
+As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that
+configure checks for it. Use AM_PATH_LIBGCRYPT macro for that.
+
+
+Index: gnome-vfs-2.24.4/configure.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/configure.in	2011-03-16 14:07:18.901009688 +0100
++++ gnome-vfs-2.24.4/configure.in	2011-03-16 14:16:19.317009687 +0100
+@@ -667,15 +667,14 @@
+   if test "x${OPENSSL_LIBS}" != "x"; then
+     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
+   else
+-    AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
+-    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-			      have_ssl=true])
+-
++    AM_PATH_LIBGCRYPT
++    if test "x${LIBGCRYPT_LIBS}" = "x"; then
++      AC_MSG_ERROR([Unable to find LIBGRYPT])
++    fi
++    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++    				 	   	  have_ssl=true])
+     if test "x${LIBGNUTLS_LIBS}" = "x"; then
+-      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
+-				 have_ssl=true],
+-                                 AC_MSG_ERROR([Unable to find GNUTLS]))
++      AC_MSG_ERROR([Unable to find GNUTLS])
+     fi
+   fi
+ fi
+@@ -1045,8 +1044,8 @@
+ dnl ==============================================================================
+ 
+ PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
+ AC_SUBST(LIBGNOMEVFS_CFLAGS)
+ AC_SUBST(LIBGNOMEVFS_LIBS)
+ 
+Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
+===================================================================
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:07:18.861009688 +0100
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:09:17.517009687 +0100
+@@ -61,13 +61,6 @@
+ #endif
+ #endif
+ 
+-#if defined GNUTLS_COMPAT
+-#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS
+-#define gnutls_session GNUTLS_STATE
+-#define gnutls_certificate_free_credentials gnutls_certificate_free_sc
+-#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc
+-#endif
+-
+ typedef struct {
+ #ifdef HAVE_OPENSSL
+ 	int sockfd;
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
index 844edd3b17df..88301d9482e3 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.3 2012/01/12 02:24:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.4 2012/02/12 22:10:40 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -89,7 +89,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
 
 	# Configure with gnutls-2.7, bug #253729
-	epatch "${FILESDIR}"/${PN}-2.24.0-gnutls27.patch
+	# Fix building with gnutls-2.12, bug #388895
+	epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
 
 	# Prevent duplicated volumes, bug #193083
 	epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch