diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-09-02 21:13:55 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-09-02 21:13:55 +0000 |
| commit | e9111ba908f8adff43f60d000f684ca253d25acd (patch) | |
| tree | dffd6dc307fbec550c74174fc633f66036480187 /gnome-base/gnome-vfs/files | |
| parent | Remove depreciated patches. (diff) | |
| download | gentoo-2-e9111ba908f8adff43f60d000f684ca253d25acd.tar.gz gentoo-2-e9111ba908f8adff43f60d000f684ca253d25acd.tar.bz2 gentoo-2-e9111ba908f8adff43f60d000f684ca253d25acd.zip | |
Add autoconf check for new libsmbclient API. bug #104531
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'gnome-base/gnome-vfs/files')
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch | 41 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-samba-close_fn.patch | 41 |
2 files changed, 82 insertions, 0 deletions
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 (); + } + |