public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Ondrej Holy <oholy@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gvfs] main: Remove obsolete patch files
Date: Thu, 25 Jun 2026 08:59:49 GMT [thread overview]
Message-ID: <178237798994.1.17186606951365846074.rpms-gvfs-42624542e42e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gvfs
Branch : main
Commit : 42624542e42ee800690d763f0b954e4b82deaa8a
Author : Ondrej Holy <oholy@redhat.com>
Date : 2026-06-25T10:59:25+02:00
Stats : +0/-439 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/gvfs/c/42624542e42ee800690d763f0b954e4b82deaa8a?branch=main
Log:
Remove obsolete patch files
---
diff --git a/nfs-Fail-append-with-G_IO_ERROR_IS_DIRECTORY-when-di.patch b/nfs-Fail-append-with-G_IO_ERROR_IS_DIRECTORY-when-di.patch
deleted file mode 100644
index 7817cdb..0000000
--- a/nfs-Fail-append-with-G_IO_ERROR_IS_DIRECTORY-when-di.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From b75208c86d842c7bc2f613f40bc80cc7594629aa Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Mon, 4 Nov 2024 15:21:45 +0100
-Subject: [PATCH] nfs: Fail append with G_IO_ERROR_IS_DIRECTORY when dir exists
-
-Currently, the append/edit job succeeds for the NFS backend even though
-there is a directory. The consequent write operation fails with the
-invalid address error. As per the documentation, the append/edit
-operation should fail imediatelly with the `G_IO_ERROR_IS_DIRECTORY`
-error. Let's add an extra stat call to achieve that behavior.
----
- daemon/gvfsbackendnfs.c | 49 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 43 insertions(+), 6 deletions(-)
-
-diff --git a/daemon/gvfsbackendnfs.c b/daemon/gvfsbackendnfs.c
-index c9e9ed60..6219895a 100644
---- a/daemon/gvfsbackendnfs.c
-+++ b/daemon/gvfsbackendnfs.c
-@@ -727,7 +727,10 @@ write_handle_free (WriteHandle *handle)
- }
-
- static void
--append_cb (int err, struct nfs_context *ctx, void *data, void *private_data)
-+append_create_cb (int err,
-+ struct nfs_context *ctx,
-+ void *data,
-+ void *private_data)
- {
- GVfsJob *job = G_VFS_JOB (private_data);
- if (err == 0)
-@@ -747,6 +750,42 @@ append_cb (int err, struct nfs_context *ctx, void *data, void *private_data)
- }
- }
-
-+static void
-+append_stat_cb (int err,
-+ struct nfs_context *ctx,
-+ void *data,
-+ void *private_data)
-+{
-+ GVfsJob *job = G_VFS_JOB (private_data);
-+ GVfsJobOpenForWrite *op_job = G_VFS_JOB_OPEN_FOR_WRITE (job);
-+ GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (op_job->backend);
-+
-+ if (err == 0)
-+ {
-+ struct nfs_stat_64 *st = data;
-+
-+ if (S_ISDIR (st->nfs_mode))
-+ {
-+ g_vfs_job_failed_literal (job,
-+ G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
-+ _("Target file is a directory"));
-+ return;
-+ }
-+ }
-+ else if (err != -ENOENT)
-+ {
-+ g_vfs_job_failed_from_errno (job, -err);
-+ return;
-+ }
-+
-+ nfs_create_async (op_backend->ctx,
-+ op_job->filename,
-+ O_APPEND,
-+ (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ append_create_cb,
-+ job);
-+}
-+
- static gboolean
- try_append_to (GVfsBackend *backend,
- GVfsJobOpenForWrite *job,
-@@ -755,11 +794,9 @@ try_append_to (GVfsBackend *backend,
- {
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (backend);
-
-- nfs_create_async (op_backend->ctx,
-- filename,
-- O_APPEND,
-- (flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-- append_cb, job);
-+ /* Check for existing directory because libnfs doesn't fail in this case. */
-+ nfs_stat64_async (op_backend->ctx, filename, append_stat_cb, job);
-+
- return TRUE;
- }
-
---
-2.46.2
-
diff --git a/nfs-Set-intitial_offset-when-appending.patch b/nfs-Set-intitial_offset-when-appending.patch
deleted file mode 100644
index 5c20065..0000000
--- a/nfs-Set-intitial_offset-when-appending.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From aa3eef707ae81cd8bab0d7eb94a8729c59061f61 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Thu, 28 Nov 2024 14:58:12 +0100
-Subject: [PATCH] nfs: Set intitial_offset when appending
-
-Currently the `initial_offset` is not set when appening. This is wrong
-as the `GDaemonOutputStream` implemetation relies on it to be set. Let's
-do so to fix the `g_seekable_tell` output.
----
- daemon/gvfsbackendnfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gvfsbackendnfs.c b/daemon/gvfsbackendnfs.c
-index 6219895a..85632174 100644
---- a/daemon/gvfsbackendnfs.c
-+++ b/daemon/gvfsbackendnfs.c
-@@ -759,11 +759,10 @@ append_stat_cb (int err,
- GVfsJob *job = G_VFS_JOB (private_data);
- GVfsJobOpenForWrite *op_job = G_VFS_JOB_OPEN_FOR_WRITE (job);
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (op_job->backend);
-+ struct nfs_stat_64 *st = data;
-
- if (err == 0)
- {
-- struct nfs_stat_64 *st = data;
--
- if (S_ISDIR (st->nfs_mode))
- {
- g_vfs_job_failed_literal (job,
-@@ -778,6 +777,7 @@ append_stat_cb (int err,
- return;
- }
-
-+ g_vfs_job_open_for_write_set_initial_offset (op_job, st->nfs_size);
- nfs_create_async (op_backend->ctx,
- op_job->filename,
- O_APPEND,
---
-2.46.2
-
diff --git a/nfs-Support-libnfs-6-backport-to-1.56.patch b/nfs-Support-libnfs-6-backport-to-1.56.patch
deleted file mode 100644
index 9413015..0000000
--- a/nfs-Support-libnfs-6-backport-to-1.56.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From b64ae6ffc814e6fd8982cb2733045cd353b5a7f9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Sun, 19 Jan 2025 14:28:25 +0100
-Subject: [PATCH] nfs: Support libnfs 6 (backport to 1.56)
-
-Libnfs 6 brings version 2 of its API. It is not compatible with the
-earlier API. Let's use the LIBNFS_API_V2 symbol to handle differences.
-
-Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/781
----
- daemon/gvfsbackendnfs.c | 80 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 80 insertions(+)
-
-diff --git a/daemon/gvfsbackendnfs.c b/daemon/gvfsbackendnfs.c
-index 85632174..39c59fc2 100644
---- a/daemon/gvfsbackendnfs.c
-+++ b/daemon/gvfsbackendnfs.c
-@@ -407,7 +407,9 @@ read_cb (int err, struct nfs_context *ctx, void *data, void *private_data)
- {
- GVfsJobRead *op_job = G_VFS_JOB_READ (job);
-
-+#ifndef LIBNFS_API_V2
- memcpy (op_job->buffer, data, err);
-+#endif
- g_vfs_job_read_set_size (op_job, err);
- g_vfs_job_succeeded (job);
- }
-@@ -427,7 +429,11 @@ try_read (GVfsBackend *backend,
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (backend);
- struct nfsfh *fh = _handle;
-
-+#ifdef LIBNFS_API_V2
-+ nfs_read_async (op_backend->ctx, fh, buffer, bytes_requested, read_cb, job);
-+#else
- nfs_read_async (op_backend->ctx, fh, bytes_requested, read_cb, job);
-+#endif
- return TRUE;
- }
-
-@@ -778,12 +784,21 @@ append_stat_cb (int err,
- }
-
- g_vfs_job_open_for_write_set_initial_offset (op_job, st->nfs_size);
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (op_backend->ctx,
-+ op_job->filename,
-+ O_CREAT | O_APPEND,
-+ (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ append_create_cb,
-+ job);
-+#else
- nfs_create_async (op_backend->ctx,
- op_job->filename,
- O_APPEND,
- (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- append_create_cb,
- job);
-+#endif
- }
-
- static gboolean
-@@ -815,6 +830,9 @@ typedef struct
- int mode;
- CopyFileCallback cb;
- void *private_data;
-+#ifdef LIBNFS_API_V2
-+ char buffer[COPY_BLKSIZE];
-+#endif
- } CopyHandle;
-
- static void
-@@ -842,7 +860,11 @@ copy_write_cb (int err,
- CopyHandle *handle = private_data;
-
- if (err > 0)
-+#ifdef LIBNFS_API_V2
-+ nfs_read_async (ctx, handle->srcfh, handle->buffer, COPY_BLKSIZE, copy_read_cb, handle);
-+#else
- nfs_read_async (ctx, handle->srcfh, COPY_BLKSIZE, copy_read_cb, handle);
-+#endif
- else
- copy_handle_complete (ctx, handle, FALSE);
- }
-@@ -855,7 +877,11 @@ copy_read_cb (int err, struct nfs_context *ctx, void *data, void *private_data)
- if (err == 0)
- copy_handle_complete (ctx, handle, TRUE);
- else if (err > 0)
-+#ifdef LIBNFS_API_V2
-+ nfs_write_async (ctx, handle->destfh, handle->buffer, err, copy_write_cb, handle);
-+#else
- nfs_write_async (ctx, handle->destfh, err, data, copy_write_cb, handle);
-+#endif
- else
- copy_handle_complete (ctx, handle, FALSE);
- }
-@@ -871,7 +897,11 @@ copy_open_dest_cb (int err,
- {
- handle->destfh = data;
-
-+#ifdef LIBNFS_API_V2
-+ nfs_read_async (ctx, handle->srcfh, handle->buffer, COPY_BLKSIZE, copy_read_cb, handle);
-+#else
- nfs_read_async (ctx, handle->srcfh, COPY_BLKSIZE, copy_read_cb, handle);
-+#endif
- }
- else
- {
-@@ -889,9 +919,15 @@ copy_open_source_cb (int err,
- if (err == 0)
- {
- handle->srcfh = data;
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (ctx,
-+ handle->dest, O_CREAT | O_TRUNC, handle->mode & 0777,
-+ copy_open_dest_cb, handle);
-+#else
- nfs_create_async (ctx,
- handle->dest, O_TRUNC, handle->mode & 0777,
- copy_open_dest_cb, handle);
-+#endif
- g_free (handle->dest);
- }
- else
-@@ -972,11 +1008,19 @@ replace_backup_chown_cb (int err,
- GVfsJobOpenForWrite *op_job = G_VFS_JOB_OPEN_FOR_WRITE (job);
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (op_job->backend);
-
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (op_backend->ctx,
-+ op_job->filename,
-+ O_CREAT | O_TRUNC,
-+ (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ replace_trunc_cb, handle);
-+#else
- nfs_create_async (op_backend->ctx,
- op_job->filename,
- O_TRUNC,
- (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- replace_trunc_cb, handle);
-+#endif
- }
- else
- {
-@@ -1056,11 +1100,19 @@ replace_truncate (struct nfs_context *ctx, WriteHandle *handle)
- }
- else
- {
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (ctx,
-+ op_job->filename,
-+ O_CREAT | O_TRUNC,
-+ (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ replace_trunc_cb, handle);
-+#else
- nfs_create_async (ctx,
- op_job->filename,
- O_TRUNC,
- (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- replace_trunc_cb, handle);
-+#endif
- }
- }
-
-@@ -1248,11 +1300,19 @@ replace_stat_cb (int err,
- handle->tempname = g_build_filename (dirname, basename, NULL);
- g_free (dirname);
-
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (ctx,
-+ handle->tempname,
-+ O_CREAT | O_EXCL,
-+ (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ replace_temp_cb, handle);
-+#else
- nfs_create_async (ctx,
- handle->tempname,
- O_EXCL,
- (op_job->flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- replace_temp_cb, handle);
-+#endif
- }
- else
- {
-@@ -1336,11 +1396,19 @@ try_replace (GVfsBackend *backend,
- {
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (backend);
-
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (op_backend->ctx,
-+ filename,
-+ O_CREAT | O_EXCL,
-+ (flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ replace_create_cb, job);
-+#else
- nfs_create_async (op_backend->ctx,
- filename,
- O_EXCL,
- (flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- replace_create_cb, job);
-+#endif
- return TRUE;
- }
-
-@@ -1374,11 +1442,19 @@ try_create (GVfsBackend *backend,
- {
- GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (backend);
-
-+#ifdef LIBNFS_API_V2
-+ nfs_open2_async (op_backend->ctx,
-+ filename,
-+ O_CREAT | O_EXCL,
-+ (flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
-+ create_cb, job);
-+#else
- nfs_create_async (op_backend->ctx,
- filename,
- O_EXCL,
- (flags & G_FILE_CREATE_PRIVATE ? 0600 : 0666) & ~op_backend->umask,
- create_cb, job);
-+#endif
- return TRUE;
- }
-
-@@ -1409,7 +1485,11 @@ try_write (GVfsBackend *backend,
- WriteHandle *handle = _handle;
- struct nfsfh *fh = handle->fh;
-
-+#ifdef LIBNFS_API_V2
-+ nfs_write_async (op_backend->ctx, fh, buffer, buffer_size, write_cb, job);
-+#else
- nfs_write_async (op_backend->ctx, fh, buffer_size, buffer, write_cb, job);
-+#endif
- return TRUE;
- }
-
---
-2.46.2
-
diff --git a/onedrive-Use-presentation-id-as-host-user.patch b/onedrive-Use-presentation-id-as-host-user.patch
deleted file mode 100644
index cf97e1f..0000000
--- a/onedrive-Use-presentation-id-as-host-user.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f383834e37ca279c3bd43f7483bc89c86bdaa1ca Mon Sep 17 00:00:00 2001
-From: Jan-Michael Brummer <jan-michael.brummer1@volkswagen.de>
-Date: Wed, 2 Oct 2024 16:37:27 +0200
-Subject: [PATCH] onedrive: Use presentation id as host / user
-
-Currently the drive is shown as unique id and therefore isn't very
-userfriendly on cli. Switch to make use of the presentation id (mail)
-just like it is done by Google backend to simplify it.
----
- daemon/gvfsbackendonedrive.c | 9 ++++++---
- meson.build | 2 +-
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gvfsbackendonedrive.c b/daemon/gvfsbackendonedrive.c
-index c8317cb7..4f7b6d3a 100644
---- a/daemon/gvfsbackendonedrive.c
-+++ b/daemon/gvfsbackendonedrive.c
-@@ -1148,6 +1148,7 @@ g_vfs_backend_onedrive_mount (GVfsBackend *_self,
- g_autolist (MsgDrive) drives = NULL;
- GList *l = NULL;
- const char *host = NULL;
-+ const char *user = NULL;
-
- g_debug ("+ mount\n");
-
-@@ -1159,7 +1160,8 @@ g_vfs_backend_onedrive_mount (GVfsBackend *_self,
- }
-
- host = g_mount_spec_get (spec, "host");
-- self->account_identity = g_strdup (host);
-+ user = g_mount_spec_get (spec, "user");
-+ self->account_identity = g_strconcat (user, "@", host, NULL);
-
- accounts = goa_client_get_accounts (self->client);
- for (l = accounts; l != NULL; l = l->next)
-@@ -1170,7 +1172,7 @@ g_vfs_backend_onedrive_mount (GVfsBackend *_self,
- const char *provider_type = NULL;
-
- account = goa_object_get_account (object);
-- account_identity = goa_account_get_identity (account);
-+ account_identity = goa_account_get_presentation_identity (account);
- provider_type = goa_account_get_provider_type (account);
-
- if (g_strcmp0 (provider_type, "ms_graph") == 0 &&
-@@ -1254,7 +1256,8 @@ g_vfs_backend_onedrive_mount (GVfsBackend *_self,
- g_vfs_backend_set_default_location (_self, msg_drive_item_get_name (self->home));
-
- real_mount_spec = g_mount_spec_new ("onedrive");
-- g_mount_spec_set (real_mount_spec, "host", self->account_identity);
-+ g_mount_spec_set (real_mount_spec, "host", host);
-+ g_mount_spec_set (real_mount_spec, "user", user);
- g_vfs_backend_set_mount_spec (_self, real_mount_spec);
- g_mount_spec_unref (real_mount_spec);
-
-diff --git a/meson.build b/meson.build
-index 22b58405..395f8cc9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -368,7 +368,7 @@ endif
- # *** Check if we should build with GOA volume monitor ***
- enable_goa = get_option('goa')
- if enable_goa
-- goa_dep = dependency('goa-1.0', version: '>= 3.17.1')
-+ goa_dep = dependency('goa-1.0', version: '>= 3.53.1')
- endif
-
- # *** Check for GNOME Keyring ***
---
-2.46.2
-
reply other threads:[~2026-06-25 8:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178237798994.1.17186606951365846074.rpms-gvfs-42624542e42e@fedoraproject.org \
--to=oholy@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox