diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-01-17 15:13:37 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-01-17 00:30:12 -0800 |
commit | d11db37985f0b28ed8a5e95cf22876a17646ca45 (patch) | |
tree | d33356b25f496b559b6de3d06e98dc629511a296 /meta-gnome | |
parent | 61541e4fdef2c2f1656641759da350ba08b12717 (diff) | |
download | meta-openembedded-contrib-d11db37985f0b28ed8a5e95cf22876a17646ca45.tar.gz |
gvfs: upgrade 1.50.2 -> 1.50.3
0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch
included in 1.50.3
Changelog:
===========
* dav: Prevent usage of NULL when user is not specified
* ftp: Fix hangs when the connection is released
* fuse: Decrease file handle reference when open file fail
* sftp: PATH-expand the ssh client
* test: Several smaller enhancements
* backend: Add support for xx-large and x-large thumbnails
* goa: Prevent automounts when resuming from suspension
* Translation updates (GNOME Translation Project contributors)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch | 60 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb (renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb) | 7 |
2 files changed, 2 insertions, 65 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch b/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch deleted file mode 100644 index 011858e80c..0000000000 --- a/meta-gnome/recipes-gnome/gvfs/gvfs/0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8327383e262e1e7f32750a8a2d3dd708195b0f53 Mon Sep 17 00:00:00 2001 -From: Alex Stewart <alex.stewart@ni.com> -Date: Wed, 14 Dec 2022 03:05:45 -0600 -Subject: [PATCH] daemon: PATH-expand the sftp backend ssh client - -Meson is currently configured to search the gvfs builder's PATH for an -ssh client, and hardcode its fullpath as the canonical ssh client for -the gvfs sftp backend. - -This setup breaks in cases where the builder has a different ssh client -from the final runtime root, or where the client's pathes differ. -Builders using OpenEmbedded or buildroot workspaces are particularly -affected. - -Instead, set SSH_PROGRAM to `ssh` so that it gets PATH-expanded at -runtime. - -Closes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 -Signed-off-by: Alex Stewart <alex.stewart@ni.com> - -Upstream-Status: Accepted -* https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/157 - * Expect upstream merge in GNOME 44 - ---- - daemon/meson.build | 2 +- - meson.build | 4 ---- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/daemon/meson.build b/daemon/meson.build -index e20ada29..72a16890 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -256,7 +256,7 @@ if enable_sftp - '-DDEFAULT_BACKEND_TYPE=sftp', - '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', - '-DMAX_JOB_THREADS=1', -- '-DSSH_PROGRAM="@0@"'.format(ssh.full_path()), -+ '-DSSH_PROGRAM="ssh"', - ] - - programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} -diff --git a/meson.build b/meson.build -index 7fd67427..a84c0104 100644 ---- a/meson.build -+++ b/meson.build -@@ -457,10 +457,6 @@ endif - - # *** SFTP backend *** - enable_sftp = get_option('sftp') --if enable_sftp -- ssh = find_program('ssh', required: false) -- assert(ssh.found(), 'SFTP backend requested but a ssh client is required') --endif - - # *** Enable development utils *** - enable_devel_utils = get_option('devel_utils') --- -2.38.1 - diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb index 6ea8727539..073c05af28 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb @@ -18,12 +18,9 @@ DEPENDS += "\ RDEPENDS:${PN} += "gsettings-desktop-schemas" -SRC_URI = "\ - https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \ - file://0001-daemon-PATH-expand-the-sftp-backend-ssh-client.patch \ -" +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e" +SRC_URI[archive.sha256sum] = "6897119e97bb16029d2778e1a5a54a6a6592631f8b2f3a2a1dea4ef2b01803fd" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |