From 5d10c69bf2b7b61368404a420152f4d345213ee2 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 9 Oct 2023 15:32:04 +0200
Subject: [PATCH] Add support for x-gvfs-notrash mount option

Resolves: RHEL-2824
---
 gvfs.spec                                     | 10 ++-
 ...t-for-x-gvfs-notrash-option-to-ignor.patch | 65 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 trash-Add-support-for-x-gvfs-notrash-option-to-ignor.patch

diff --git a/gvfs.spec b/gvfs.spec
index c727337..dc615b9 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -3,7 +3,7 @@
 %global avahi_version 0.6
 %global fuse_version 2.8.0
 %global gettext_version 0.19.4
-%global glib2_version 2.51.0
+%global glib2_version 2.56.4-162
 %global goa_version 3.17.1
 %global gsettings_desktop_schemas_version 3.28.1-2
 %global gudev_version 147
@@ -25,7 +25,7 @@
 
 Name: gvfs
 Version: 1.36.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Backends for the gio framework in GLib
 
 License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
@@ -76,6 +76,9 @@ Patch14: smb-Use-O_RDWR-to-fix-fstat-when-writing.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2083481
 Patch15: google-performance-fixes.patch
 
+# https://issues.redhat.com/browse/RHEL-2824
+Patch16: trash-Add-support-for-x-gvfs-notrash-option-to-ignor.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(dbus-glib-1)
@@ -466,6 +469,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Oct 09 2023 Ondrej Holy <oholy@redhat.com> - 1.36.2-15
+- Add support for x-gvfs-notrash mount option (RHEL-2824)
+
 * Thu Jun 16 2022 Ondrej Holy <oholy@redhat.com> - 1.36.2-14
 - Backport performance fixes for Google backend (#2083481)
 
diff --git a/trash-Add-support-for-x-gvfs-notrash-option-to-ignor.patch b/trash-Add-support-for-x-gvfs-notrash-option-to-ignor.patch
new file mode 100644
index 0000000..88a7df3
--- /dev/null
+++ b/trash-Add-support-for-x-gvfs-notrash-option-to-ignor.patch
@@ -0,0 +1,65 @@
+From f93bd46c36c8e42f17f0f61b79c55a3794906395 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 6 Mar 2020 10:08:09 +0100
+Subject: [PATCH] trash: Add support for x-gvfs-notrash option to ignore mounts
+
+Add support for x-gvfs-notrash mount option, which allows to ignore
+trash folder on certain mounts. This might be especially useful e.g.
+to prevent wakeups of autofs mounts...
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1096200
+---
+ daemon/trashlib/trashwatcher.c | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/trashlib/trashwatcher.c b/daemon/trashlib/trashwatcher.c
+index 6b455235..01c440a1 100644
+--- a/daemon/trashlib/trashwatcher.c
++++ b/daemon/trashlib/trashwatcher.c
+@@ -211,6 +211,34 @@ trash_mount_remove (TrashMount **mount_ptr)
+   g_slice_free (TrashMount, mount);
+ }
+ 
++static gboolean
++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)
++    {
++      mount_point = g_unix_mount_point_at (g_unix_mount_get_mount_path (mount),
++                                           NULL);
++      if (mount_point != NULL)
++        mount_options = g_unix_mount_point_get_options (mount_point);
++    }
++
++  if (mount_options == NULL ||
++      strstr (mount_options, "x-gvfs-notrash") == NULL)
++    retval = FALSE;
++
++  g_clear_pointer (&mount_point, g_unix_mount_point_free);
++
++  return retval;
++}
++
+ static void
+ trash_watcher_remount (TrashWatcher *watcher)
+ {
+@@ -229,7 +257,7 @@ trash_watcher_remount (TrashWatcher *watcher)
+     {
+       int result;
+ 
+-      if (new && g_unix_mount_is_system_internal (new->data))
++      if (new && ignore_trash_mount (new->data))
+         {
+           g_unix_mount_free (new->data);
+           new = new->next;
+-- 
+2.41.0
+