6 files changed, 112 insertions, 24 deletions
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 59f77be1eeea..178ceeee2f1d 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.167 2005/08/25 23:24:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.168 2005/09/02 21:13:55 dang Exp $
+
+  02 Sep 2005; <dang@gentoo.org>
+  +files/gnome-vfs-2.10.1-samba-close_fn.patch,
+  +files/gnome-vfs-2.11.92-samba-close_fn.patch, gnome-vfs-2.10.1-r2.ebuild,
+  gnome-vfs-2.11.92.ebuild:
+  Add autoconf check for new libsmbclient API.  bug #104531
 
 *gnome-vfs-2.10.1-r2 (25 Aug 2005)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index dca2d55098e6..9eca0d1aaefa 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,32 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ef154b39abb1d26bba1afdfbe8ee7991 gnome-vfs-2.11.92.ebuild 2000
 MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
-MD5 31fbe56985252404323e8f568cf46eb9 ChangeLog 19972
+MD5 127a3f7ac8c69d6aaad6696ef33e1a3f gnome-vfs-2.10.1-r2.ebuild 2248
+MD5 5c37214d9aecc7f5aef92160839ceeb6 gnome-vfs-2.10.0-r2.ebuild 2045
 MD5 b38fd6ba659d5d63d370a8bc36c43733 gnome-vfs-2.10.1-r1.ebuild 2049
-MD5 64c850e76530326ddf3a5e38c00624c7 gnome-vfs-2.11.92.ebuild 1868
-MD5 3ee8a444b6556e7460c330d618f6e873 gnome-vfs-2.10.1-r2.ebuild 2116
+MD5 667de726e5ea6647167ef0861b1fd48f ChangeLog 20219
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5c37214d9aecc7f5aef92160839ceeb6 gnome-vfs-2.10.0-r2.ebuild 2045
-MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
+MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 MD5 b0c503dc8276be2fae063259ca0f2514 files/digest-gnome-vfs-2.11.92 71
+MD5 75d0133c9ee4ef3355b25dad13c6cd9a files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
 MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
-MD5 6aa77e036ebb110dad9bc8244c3a7081 files/gnome-vfs-2.11.92-fbsd.patch 1036
-MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
-MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
-MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
 MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
-MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
+MD5 6aa77e036ebb110dad9bc8244c3a7081 files/gnome-vfs-2.11.92-fbsd.patch 1036
+MD5 aa105582688e7798d87c46739348cfad files/gnome-vfs-2.11.92-samba-close_fn.patch 1901
+MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
 MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
 MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
+MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDlNgj5H05b2HAEkRAsaBAJ92vO146IAcWlrdqobxxCbLxxkycQCfd9Cf
-KhbpAFTT5+vsJQ/2YkgKrTQ=
-=INQv
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
new file mode 100644
index 000000000000..e8608b63509f
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
@@ -0,0 +1,41 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/config.h.in gnome-vfs-2.10.1.fixed/config.h.in
+--- gnome-vfs-2.10.1/config.h.in	2005-04-11 03:07:33.000000000 -0400
++++ gnome-vfs-2.10.1.fixed/config.h.in	2005-09-02 15:19:13.000000000 -0400
+@@ -253,6 +253,9 @@
+ /* Defined if flags availible in SMBCCTXT */
+ #undef HAVE_SAMBA_FLAGS
+ 
++/* Defined if close_fn is in SMBCCTXT instead of close */
++#undef HAVE_SAMBA_CLOSE_FN
++
+ /* Define to 1 if you have the `setegid' function. */
+ #undef HAVE_SETEGID
+ 
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/configure.in gnome-vfs-2.10.1.fixed/configure.in
+--- gnome-vfs-2.10.1/configure.in	2005-03-31 21:28:41.000000000 -0500
++++ gnome-vfs-2.10.1.fixed/configure.in	2005-09-02 14:54:27.000000000 -0400
+@@ -541,6 +541,9 @@
+ 		AC_CHECK_MEMBER(SMBCCTX.flags,
+ 				[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
+ 				[#include <libsmbclient.h>])
++		AC_CHECK_MEMBER(SMBCCTX.close_fn,
++				[AC_DEFINE(HAVE_SAMBA_CLOSE_FN,, [Defined if close_fn used in SMBCCTXT instead of close])],,
++				[#include <libsmbclient.h>])
+ 		CPPFLAGS="$CPPFLAGS_save"
+ 	else
+ 		SAMBA_CFLAGS=""
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/modules/smb-method.c gnome-vfs-2.10.1.fixed/modules/smb-method.c
+--- gnome-vfs-2.10.1/modules/smb-method.c	2005-03-02 18:44:11.000000000 -0500
++++ gnome-vfs-2.10.1.fixed/modules/smb-method.c	2005-09-02 14:57:00.000000000 -0400
+@@ -1425,7 +1425,11 @@
+ 
+ 		/* Important: perform_authentication leaves and re-enters the lock! */
+ 		while (perform_authentication (&actx) > 0) {
++#ifndef HAVE_SAMBA_CLOSE_FN
+ 			r = smb_context->close (smb_context, handle->file);
++#else /* HAVE_SAMBA_CLOSE_FN */
++			r = smb_context->close_fn (smb_context, handle->file);
++#endif /* HAVE_SAMBA_CLOSE_FN */
+ 			actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
+ 		}
+ 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-samba-close_fn.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-samba-close_fn.patch
new file mode 100644
index 000000000000..03cc55bb63f0
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-samba-close_fn.patch
@@ -0,0 +1,41 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.11.92.orig/config.h.in gnome-vfs-2.11.92/config.h.in
+--- gnome-vfs-2.11.92.orig/config.h.in	2005-08-24 03:31:32.000000000 -0400
++++ gnome-vfs-2.11.92/config.h.in	2005-09-02 15:18:36.000000000 -0400
+@@ -268,6 +268,9 @@
+ /* Defined if flags availible in SMBCCTXT */
+ #undef HAVE_SAMBA_FLAGS
+ 
++/* Defined if close_fn is in SMBCCTXT instead of close */
++#undef HAVE_SAMBA_CLOSE_FN
++
+ /* Define to 1 if you have the `setegid' function. */
+ #undef HAVE_SETEGID
+ 
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.11.92.orig/configure.in gnome-vfs-2.11.92/configure.in
+--- gnome-vfs-2.11.92.orig/configure.in	2005-08-24 03:31:14.000000000 -0400
++++ gnome-vfs-2.11.92/configure.in	2005-09-02 14:59:55.000000000 -0400
+@@ -517,6 +517,9 @@
+ 		AC_CHECK_MEMBER(SMBCCTX.flags,
+ 				[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
+ 				[#include <libsmbclient.h>])
++		AC_CHECK_MEMBER(SMBCCTX.close_fn,
++				[AC_DEFINE(HAVE_SAMBA_CLOSE_FN,, [Defined if close_fn used in SMBCCTXT instead of close])],,
++				[#include <libsmbclient.h>])
+ 		CPPFLAGS="$CPPFLAGS_save"
+ 	else
+ 		SAMBA_CFLAGS=""
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.11.92.orig/modules/smb-method.c gnome-vfs-2.11.92/modules/smb-method.c
+--- gnome-vfs-2.11.92.orig/modules/smb-method.c	2005-05-24 12:41:44.000000000 -0400
++++ gnome-vfs-2.11.92/modules/smb-method.c	2005-09-02 14:59:55.000000000 -0400
+@@ -1486,7 +1486,11 @@
+ 
+ 		/* Important: perform_authentication leaves and re-enters the lock! */
+ 		while (perform_authentication (&actx) > 0) {
++#ifndef HAVE_SAMBA_CLOSE_FN
+ 			r = smb_context->close (smb_context, handle->file);
++#else /* HAVE_SAMBA_CLOSE_FN */
++			r = smb_context->close_fn (smb_context, handle->file);
++#endif /* HAVE_SAMBA_CLOSE_FN */
+ 			actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
+ 		}
+ 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
index 7d1085e4e2b3..f6815cc50adb 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.10.1-r2.ebuild,v 1.1 2005/08/25 23:24:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild,v 1.2 2005/09/02 21:13:55 dang Exp $
 
 inherit gnome2 eutils
 
@@ -75,6 +75,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-date_time_stamp.patch
 	# fix Gentoo/FreeBSD
 	epatch ${FILESDIR}/${P}-fbsd.patch
+	# Fix for API breakage in samba 3.0.20 (#104531)
+	epatch ${FILESDIR}/${P}-samba-close_fn.patch
+
+	autoconf || die "autoconf failed"
 }
 
 src_install() {
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
index 3b798660168b..2f73b371bb74 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.11.92.ebuild,v 1.2 2005/08/25 23:24:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild,v 1.3 2005/09/02 21:13:55 dang Exp $
 
 inherit gnome2 eutils
 
@@ -65,6 +65,10 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-fbsd.patch
+	# Fix for API breakage in samba 3.0.20 (#104531)
+	epatch ${FILESDIR}/${P}-samba-close_fn.patch
+
+	autoconf || die "autoconf failed"
 }
 
 src_install() {