From 7273f65352863cc2f420dee49c430dcd5838dc59 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 26 Sep 2024 13:25:46 +0200
Subject: [PATCH] Add support for x-gvfs-trash mount option

Resolves: RHEL-52353
---
 gvfs.spec                                     |  8 ++-
 ...upport-for-x-gvfs-trash-mount-option.patch | 64 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 trash-Add-support-for-x-gvfs-trash-mount-option.patch

diff --git a/gvfs.spec b/gvfs.spec
index 9ac2325..48f29e3 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -22,7 +22,7 @@
 
 Name: gvfs
 Version: 1.48.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Backends for the gio framework in GLib
 
 License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
@@ -33,6 +33,9 @@ Source0: https://download.gnome.org/sources/gvfs/1.48/gvfs-%{version}.tar.xz
 Patch0: smb-Ignore-EINVAL-for-kerberos-ccache-login.patch
 Patch1: smb-Rework-anonymous-handling-to-avoid-EINVAL.patch
 
+# https://issues.redhat.com/browse/RHEL-52342
+Patch2: trash-Add-support-for-x-gvfs-trash-mount-option.patch
+
 BuildRequires: meson
 BuildRequires: gcc
 BuildRequires: pkgconfig
@@ -429,6 +432,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Thu Sep 26 2024 Ondrej Holy <oholy@redhat.com> - 1.48.1-5
+- Add support for x-gvfs-trash mount option (RHEL-52353)
+
 * Tue Jun 14 2022 Ondrej Holy <oholy@redhat.com> - 1.48.1-4
 - Ignore EINVAL for kerberos/ccache login to fix SMB mounting (#2093861)
 
diff --git a/trash-Add-support-for-x-gvfs-trash-mount-option.patch b/trash-Add-support-for-x-gvfs-trash-mount-option.patch
new file mode 100644
index 0000000..907aabf
--- /dev/null
+++ b/trash-Add-support-for-x-gvfs-trash-mount-option.patch
@@ -0,0 +1,64 @@
+From 1c2cc7c0b80e5fc3f59e8557232bb6ff8ebbab7a Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 12 Jul 2024 13:21:49 +0200
+Subject: [PATCH] trash: Add support for x-gvfs-trash mount option
+
+Currently, the trash functionality is disabled for system internal mounts.
+That might be a problem in some cases. The `x-gvfs-notrash` mount option
+allows disabling the trash functionality for certain mounts. Let's add
+support for the `x-gvfs-trash` mount option to allow the opposite.
+
+See: https://issues.redhat.com/browse/RHEL-46828
+
+Related: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4155
+---
+ daemon/trashlib/trashwatcher.c | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/daemon/trashlib/trashwatcher.c b/daemon/trashlib/trashwatcher.c
+index eec32d0b..707323cb 100644
+--- a/daemon/trashlib/trashwatcher.c
++++ b/daemon/trashlib/trashwatcher.c
+@@ -218,10 +218,6 @@ ignore_trash_mount (GUnixMountEntry *mount)
+ {
+   GUnixMountPoint *mount_point = NULL;
+   const gchar *mount_options;
+-  gboolean retval = TRUE;
+-
+-  if (g_unix_mount_is_system_internal (mount))
+-    return TRUE;
+ 
+   mount_options = g_unix_mount_get_options (mount);
+   if (mount_options == NULL)
+@@ -230,15 +226,23 @@ ignore_trash_mount (GUnixMountEntry *mount)
+                                            NULL);
+       if (mount_point != NULL)
+         mount_options = g_unix_mount_point_get_options (mount_point);
++
++      g_clear_pointer (&mount_point, g_unix_mount_point_free);
+     }
+ 
+-  if (mount_options == NULL ||
+-      strstr (mount_options, "x-gvfs-notrash") == NULL)
+-    retval = FALSE;
++  if (mount_options != NULL)
++    {
++      if (strstr (mount_options, "x-gvfs-trash") != NULL)
++        return FALSE;
+ 
+-  g_clear_pointer (&mount_point, g_unix_mount_point_free);
++      if (strstr (mount_options, "x-gvfs-notrash") != NULL)
++        return TRUE;
++    }
++
++  if (g_unix_mount_is_system_internal (mount))
++    return TRUE;
+ 
+-  return retval;
++  return FALSE;
+ }
+ 
+ static void
+-- 
+2.46.1
+