Attachment #188531 for bug #202192




USE_XORG=	ice sm x11
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	NLS NOTIFY SSHFSFIX
OPTIONS_GROUP=	PLUGINS
OPTIONS_GROUP_PLUGINS=	PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
OPTIONS_DEFAULT=	NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA PLUG_WALL

PLUG_TPA_DESC=	Trash Panel Applet plugin
PLUG_UCA_DESC=	User Customizable Actions plugin
PLUG_WALL_DESC=	Wallpaper plugin
SSHFSFIX_DESC=	Fix changing file permissions on sshfs

NLS_USES=			gettext-runtime
NLS_CONFIGURE_ENABLE=		nls
NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
NOTIFY_CONFIGURE_ENABLE=	notifications
PLUG_APR_LIB_DEPENDS=		libexif.so:graphics/libexif
PLUG_APR_CONFIGURE_ENABLE=	apr-plugin exif
PLUG_SBR_LIB_DEPENDS=		libpcre.so:devel/pcre
PLUG_SBR_CONFIGURE_ENABLE=	sbr-plugin pcre
PLUG_TPA_USE=			gnome=gvfs xfce=panel
PLUG_TPA_CONFIGURE_ENABLE=	tpa-plugin
PLUG_UCA_CONFIGURE_ENABLE=	uca-plugin
PLUG_WALL_CONFIGURE_ENABLE=	wallpaper-plugin
SSHFSFIX_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-sshfsfix
OPTIONS_SUB=			yes

CONFIGURE_ARGS+=--enable-gio-unix \
		--disable-gudev \




--- thunar/thunar-file.c.orig	2017-11-25 16:54:56 UTC
+++ thunar/thunar-file.c
@@ -50,6 +50,10 @@
 #include <unistd.h>
 #endif
 
+/* required by statfs(2) */
+#include <sys/param.h>
+#include <sys/mount.h>
+
 #include <gio/gio.h>
 #include <libxfce4ui/libxfce4ui.h>
 
@@ -3222,7 +3226,28 @@ thunar_file_get_item_count (const ThunarFile *file)
 gboolean
 thunar_file_is_chmodable (const ThunarFile *file)
 {
+  char *path;
+  struct statfs sfs;
+
   _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+
+  /*
+   * sshfs user on remote FS can be different from the local one, and there is
+   * no easy way to discover it's UID, so create a special case always returning
+   * true for such an FS
+   */
+  path = g_file_get_path(file->gfile);
+
+  if (path != NULL)
+    {
+      if (statfs(*path, &sfs) == 0)
+        {
+          if (strncmp(sfs.f_fstypename, "fusefs.sshfs", 12) == 0)
+            {
+              return !thunar_file_is_trashed (file);
+            }
+        }
+    }
 
   /* we can only change the mode if we the euid is
    *   a) equal to the file owner id

Lines 1-6 Link Here

(-)files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2017-06-30 22:28:12 UTC	1	--- configure.orig 2017-11-25 18:37:32 UTC
2	+++ configure	2	+++ configure
3	@@ -14452,7 +14452,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h	3	@@ -14454,7 +14454,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
4		4
5	fi	5	fi
6	fi	6	fi

Return to bug 202192

Lines 34-40 Link Here

(-)Makefile (-8 / +10 lines)
34	USE_XORG= ice sm x11	34	USE_XORG= ice sm x11
35	INSTALL_TARGET= install-strip	35	INSTALL_TARGET= install-strip
36		36
37	OPTIONS_DEFINE= NLS NOTIFY	37	OPTIONS_DEFINE= NLS NOTIFY SSHFSFIX
38	OPTIONS_GROUP= PLUGINS	38	OPTIONS_GROUP= PLUGINS
39	OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL	39	OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
40	OPTIONS_DEFAULT= NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA PLUG_WALL	40	OPTIONS_DEFAULT= NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA PLUG_WALL
Lines 46-65 Link Here
46	PLUG_TPA_DESC= Trash Panel Applet plugin	46	PLUG_TPA_DESC= Trash Panel Applet plugin
47	PLUG_UCA_DESC= User Customizable Actions plugin	47	PLUG_UCA_DESC= User Customizable Actions plugin
48	PLUG_WALL_DESC= Wallpaper plugin	48	PLUG_WALL_DESC= Wallpaper plugin
		49	SSHFSFIX_DESC= Fix changing file permissions on sshfs
49		50
50	NLS_USES= gettext-runtime	51	NLS_USES= gettext-runtime
51	NLS_CONFIGURE_ENABLE= nls	52	NLS_CONFIGURE_ENABLE= nls
52	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify	53	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
53	NOTIFY_CONFIGURE_ENABLE= notifications	54	NOTIFY_CONFIGURE_ENABLE= notifications
54	PLUG_APR_LIB_DEPENDS= libexif.so:graphics/libexif	55	PLUG_APR_LIB_DEPENDS= libexif.so:graphics/libexif
55	PLUG_APR_CONFIGURE_ENABLE= apr-plugin exif	56	PLUG_APR_CONFIGURE_ENABLE= apr-plugin exif
56	PLUG_SBR_LIB_DEPENDS= libpcre.so:devel/pcre	57	PLUG_SBR_LIB_DEPENDS= libpcre.so:devel/pcre
57	PLUG_SBR_CONFIGURE_ENABLE= sbr-plugin pcre	58	PLUG_SBR_CONFIGURE_ENABLE= sbr-plugin pcre
58	PLUG_TPA_USE= gnome=gvfs xfce=panel	59	PLUG_TPA_USE= gnome=gvfs xfce=panel
59	PLUG_TPA_CONFIGURE_ENABLE= tpa-plugin	60	PLUG_TPA_CONFIGURE_ENABLE= tpa-plugin
60	PLUG_UCA_CONFIGURE_ENABLE= uca-plugin	61	PLUG_UCA_CONFIGURE_ENABLE= uca-plugin
61	PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin	62	PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin
62	OPTIONS_SUB= yes	63	SSHFSFIX_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-sshfsfix
		64	OPTIONS_SUB= yes
63		65
64	CONFIGURE_ARGS+=--enable-gio-unix \	66	CONFIGURE_ARGS+=--enable-gio-unix \
65	--disable-gudev \	67	--disable-gudev \

Line 0 Link Here

(-)files/extra-patch-sshfsfix (+42 lines)
	1	--- thunar/thunar-file.c.orig 2017-11-25 16:54:56 UTC
	2	+++ thunar/thunar-file.c
	3	@@ -50,6 +50,10 @@
	4	#include <unistd.h>
	5	#endif
	6
	7	+/* required by statfs(2) */
	8	+#include <sys/param.h>
	9	+#include <sys/mount.h>
	10	+
	11	#include <gio/gio.h>
	12	#include <libxfce4ui/libxfce4ui.h>
	13
	14	@@ -3222,7 +3226,28 @@ thunar_file_get_item_count (const ThunarFile *file)
	15	gboolean
	16	thunar_file_is_chmodable (const ThunarFile *file)
	17	{
	18	+ char *path;
	19	+ struct statfs sfs;
	20	+
	21	_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
	22	+
	23	+ /*
	24	+ * sshfs user on remote FS can be different from the local one, and there is
	25	+ * no easy way to discover it's UID, so create a special case always returning
	26	+ * true for such an FS
	27	+ */
	28	+ path = g_file_get_path(file->gfile);
	29	+
	30	+ if (path != NULL)
	31	+ {
	32	+ if (statfs(*path, &sfs) == 0)
	33	+ {
	34	+ if (strncmp(sfs.f_fstypename, "fusefs.sshfs", 12) == 0)
	35	+ {
	36	+ return !thunar_file_is_trashed (file);
	37	+ }
	38	+ }
	39	+ }
	40
	41	/* we can only change the mode if we the euid is
	42	* a) equal to the file owner id