New release: 2.12.1.1

(Portage version: 2.0.53_rc3)

6 files changed, 12 insertions, 46 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 80cfba0dd658..38b9a6fc0813 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.177 2005/10/05 04:01:51 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.178 2005/10/06 04:01:57 leonardop Exp $
+
+*gnome-vfs-2.12.1.1 (06 Oct 2005)
+
+  06 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -gnome-vfs-2.12.1.ebuild, +gnome-vfs-2.12.1.1.ebuild:
+  New version.
 
 *gnome-vfs-2.12.1 (05 Oct 2005)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 2edf903a2d71..80b526f1082c 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,4 @@
+MD5 2da6afc94b55f71dfc6326cf674ad2d3 .gnome-vfs-2.12.1.1.ebuild.swp 12288
 MD5 68357549a8ad75bae70efae72c2830e2 ChangeLog 21736
 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
@@ -9,6 +10,7 @@ MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
 MD5 e5d4eaa40892c4826dca86628d17675d files/digest-gnome-vfs-2.12.1 70
+MD5 24140c8ea60f06d7afa34e26f37c23dc files/digest-gnome-vfs-2.12.1.1 72
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
 MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
@@ -21,5 +23,6 @@ MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
 MD5 0e9c1c449c2abe63a64021dca1f01c1b gnome-vfs-2.10.0-r2.ebuild 2010
 MD5 cfa26c4d1fd63991f0fd2a0aff0c7f72 gnome-vfs-2.10.1-r1.ebuild 2013
 MD5 bf0f4c642b4ed574cca837a793622add gnome-vfs-2.10.1-r2.ebuild 2213
+MD5 73555c582628174d1cf0de492a18b6a7 gnome-vfs-2.12.1.1.ebuild 2267
 MD5 73555c582628174d1cf0de492a18b6a7 gnome-vfs-2.12.1.ebuild 2267
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1
deleted file mode 100644
index 188e78054471..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95b0308d49aba17b9cb36c84f8467017 gnome-vfs-2.12.1.tar.bz2 1725467
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1
new file mode 100644
index 000000000000..c6bb77f4b446
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1
@@ -0,0 +1 @@
+MD5 bc62212600167acf78c9771add5cce7e gnome-vfs-2.12.1.1.tar.bz2 1726588
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
deleted file mode 100644
index 03cc55bb63f0..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-samba-close_fn.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.12.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1.ebuild
index 43dc09879d76..73df8aece745 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.12.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1.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.12.1.ebuild,v 1.1 2005/10/05 04:01:51 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1.ebuild,v 1.1 2005/10/06 04:01:57 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -74,8 +74,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch ${FILESDIR}/${PN}-2.11.92-fbsd.patch
-	# Fix for API breakage in samba 3.0.20 (#104531)
-	epatch ${FILESDIR}/${PN}-2.11.92-samba-close_fn.patch
 	# Allow the Trash on afs filesystems (#106118)
 	epatch ${FILESDIR}/${PN}-2.12.0-afs.patch