Hello community, here is the log from the commit of package gnome-vfs2 for openSUSE:Factory checked in at 2016-03-29 14:34:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-vfs2 (Old) and /work/SRC/openSUSE:Factory/.gnome-vfs2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-vfs2" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-vfs2/gnome-vfs2.changes 2014-01-29 19:19:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-vfs2.new/gnome-vfs2.changes 2016-03-29 14:34:22.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Mar 15 10:27:30 UTC 2016 - [email protected] + +- Add patches: + + gnome-vfs2-2.12.2-smb-method-fixes.patch + + gnome-vfs2-bug338168-cannot-access-from-location-input.patch + Porting some missing patches from SLE to openSUSE (bnc#832381). + +------------------------------------------------------------------- +Fri Feb 12 16:20:25 UTC 2016 - [email protected] + +- Patch tagging: use valid tags. + +------------------------------------------------------------------- New: ---- gnome-vfs2-2.12.2-smb-method-fixes.patch gnome-vfs2-bug338168-cannot-access-from-location-input.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-vfs2.spec ++++++ --- /var/tmp/diff_new_pack.Xh9tvt/_old 2016-03-29 14:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Xh9tvt/_new 2016-03-29 14:34:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-vfs2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,11 +54,11 @@ Patch20: gnome-vfs-url_handler_news.patch # PATCH-FEATURE-OPENSUSE gnome-vfs-url_handler_ftp.patch [email protected] -- add ftp: url handler schema Patch22: gnome-vfs-url_handler_ftp.patch -# PATCH-FEATURE-SLED gnome-vfs2-172680-novell-services.diff bnc172680 -- Needed for novell-nautilus-plugin integration in network:// +# PATCH-FEATURE-SLE gnome-vfs2-172680-novell-services.diff bnc172680 -- Needed for novell-nautilus-plugin integration in network:// Patch35: gnome-vfs2-172680-novell-services.diff # PATCH-FIX-OPENSUSE gnome-vfs-no-mime-data.patch [email protected] -- This is bgo336952. Technically, this is wrong (since gnome-mime-data is still a dependency for deprecated API), but in practice, this should be fine. Patch39: gnome-vfs-no-mime-data.patch -# PATCH-FIX-SLED gnome-vfs2-293856-novfs-file-method.diff bnc293856 +# PATCH-FIX-SLE gnome-vfs2-293856-novfs-file-method.diff bnc293856 Patch40: gnome-vfs2-293856-novfs-file-method.diff # PATCH-FEATURE-OPENSUSE gnome-vfs-url_handler_irc.patch bnc372232 [email protected] -- add irc: url handler schema Patch41: gnome-vfs-url_handler_irc.patch @@ -68,6 +68,10 @@ Patch43: gnome-vfs2-ssl.patch # PATCH-FIX-UPSTREAM gnome-vfs2-g_memmove-no-more.patch [email protected] -- Use memmove() instead of obsolete g_memmove() Patch44: gnome-vfs2-g_memmove-no-more.patch +# PATCH-FIX-SLE gnome-vfs2-2.12.2-smb-method-fixes.patch bnc#832381 [email protected] -- porting some missing patches from SLE to openSUSE +Patch45: gnome-vfs2-2.12.2-smb-method-fixes.patch +# PATCH-FIX-SLE gnome-vfs2-bug338168-cannot-access-from-location-input.patch bnc#832381 [email protected] -- porting some missing patches from SLE to openSUSE +Patch46: gnome-vfs2-bug338168-cannot-access-from-location-input.patch # bug437293 %ifarch ppc64 Obsoletes: gnome-vfs2-64bit @@ -123,6 +127,8 @@ %patch42 %patch43 %patch44 -p1 +%patch45 -p1 +%patch46 -p1 # ^ Place for your patches is here # ++++++ gnome-vfs2-2.12.2-smb-method-fixes.patch ++++++ ++++ 2230 lines (skipped) ++++++ gnome-vfs2-bug338168-cannot-access-from-location-input.patch ++++++ Index: gnome-vfs-2.24.0/modules/smb-method.c ================================================================================ --- gnome-vfs-2.24.0/configure.in +++ gnome-vfs-2.24.0/configure.in @@ -544,6 +544,12 @@ AC_CHECK_MEMBER(SMBCCTX.close, [AC_DEFINE(HAVE_SAMBA_OLD_CLOSE, , [Defined if old close is available in SMBCCTXT])],, [#include <libsmbclient.h>]) + AC_CHECK_DECL(SMBC_SHAREMODE_DENY_WRITE, + [AC_DEFINE(HAVE_SMBC_SHAREMODE_DENY_WRITE, , [Defined if SMBC_SHAREMODE_DENY_WRITE is declared])],, + [#include <libsmbclient.h>]) + AC_CHECK_DECL(SMBC_SHAREMODE_DENY_NONE, + [AC_DEFINE(HAVE_SMBC_SHAREMODE_DENY_NONE, , [Defined if SMBC_SHAREMODE_DENY_NONE is declared])],, + [#include <libsmbclient.h>]) CPPFLAGS="$CPPFLAGS_save" else SAMBA_CFLAGS="" --- gnome-vfs-2.24.0/modules/smb-method.c.old 2009-02-19 19:11:16.000000000 +0100 +++ gnome-vfs-2.24.0/modules/smb-method.c 2009-02-19 19:11:58.000000000 +0100 @@ -983,6 +983,8 @@ lookup_user_cache (SmbAuthContext *actx, g_free (key); if (user) { +/* mask this to reload the username/userdomain/userpasswd to get the useful information from the cache*/ +#if 0 /* If we already have a user name or domain double check that... */ if (!(actx->prompt_flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME) && !string_compare(user->username, actx->use_user)) { @@ -995,7 +997,7 @@ lookup_user_cache (SmbAuthContext *actx, retval = FALSE; goto out; } - +#endif actx->use_user = string_realloc (actx->use_user, user->username); actx->use_domain = string_realloc (actx->use_domain, user->domain); actx->use_password = string_realloc (actx->use_password, user->password); @@ -1917,10 +1919,15 @@ do_open (GnomeVFSMethod *method, LOCK_SMB(); init_authentication (&actx, uri); + /* open_share_mode is not support in samba 3.0.22 (10.1) and the previous versions. + * mask it for compiling 10.1 version + */ +#ifdef HAVE_SMBC_SHAREMODE_DENY_WRITE if (mode & GNOME_VFS_OPEN_LOCKED) { smbc_option_set (smb_context, "open_share_mode", SMBC_SHAREMODE_DENY_WRITE); } +#endif /* Important: perform_authentication leaves and re-enters the lock! */ while (perform_authentication (&actx) > 0) { @@ -1929,10 +1936,12 @@ do_open (GnomeVFSMethod *method, DEBUG_SMB(("ctx->open(\"%s\") returned file %p and error %d\n", path, file, (int) actx.res)); } +#ifdef HAVE_SMBC_SHAREMODE_DENY_NONE if (mode & GNOME_VFS_OPEN_LOCKED) { smbc_option_set (smb_context, "open_share_mode", SMBC_SHAREMODE_DENY_NONE); } +#endif UNLOCK_SMB(); if (file == NULL) { @@ -2473,6 +2482,15 @@ do_open_directory (GnomeVFSMethod *metho dir = smb_context->opendir (smb_context, path); actx.res = (dir != NULL) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); DEBUG_SMB(("ctx->opendir(\"%s\") returned dir %p and error %d\n", path, dir, (int) actx.res)); + + /*remove the server which cannot be opened from the cache*/ + if (actx.res != GNOME_VFS_OK) { + SMBCSRV *server; + server = find_cached_server (actx.for_server, actx.for_share, actx.use_domain?actx.use_domain:smb_context->workgroup, actx.use_user); + if (server) { + remove_cached_server (server_cache, server); + } + } } UNLOCK_SMB();
