From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- .../nautilus/files/3.30.5-CVE-2019-11461.patch | 30 ------ .../nautilus/files/3.30.5-seccomp-sparc32.patch | 27 ----- .../files/3.30.5-thumbnailer-updates.patch | 113 --------------------- .../files/3.30.5-thumbnailer-updates2.patch | 46 --------- 4 files changed, 216 deletions(-) delete mode 100644 gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch delete mode 100644 gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch delete mode 100644 gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch delete mode 100644 gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch (limited to 'gnome-base/nautilus/files') diff --git a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch deleted file mode 100644 index 6c2d061123fa..000000000000 --- a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sat, 13 Apr 2019 13:57:36 -0500 -Subject: [PATCH] thumbnailer: fix incomplete TIOCSTI filtering - -Fixes #112 - -See also: https://github.com/flatpak/flatpak/issues/2782 ---- - libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -leio: Adjusted to apply to nautilus copy - -diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c -index 9468b51c..3b3d1ea9 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray *argv_array, - {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)}, - - /* Don't allow faking input to the controlling tty (CVE-2017-5226) */ -- {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)}, -+ {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)}, - }; - - struct --- -2.20.1 - diff --git a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch deleted file mode 100644 index f67695b7f1d0..000000000000 --- a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3b0fd7dd26fa5af0b310650b2974d800ace80802 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 21:34:34 +0200 -Subject: [PATCH 2/2] meson.build: Add 32-bit sparc to seccomp unsupported list - -32-bit sparc doesn't support seccomp either. - -(cherry picked from commit 44b49e6ca02add9592abac03a8578b9eea1a5088) ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 50479f5f0..91915b31a 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,6 +72,7 @@ unsupported_cpus = [ - 'parisc', - 'parisc64', - 'sh4', -+ 'sparc', - 'sparc64', - ] - system_supports_seccomp = host_system == 'linux' --- -2.17.0 - diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch deleted file mode 100644 index 84d0bfc1d5af..000000000000 --- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 2e36d4bacc3cffebe62161adc375bb9ec64099f5 Mon Sep 17 00:00:00 2001 -From: Timothy OBrien -Date: Fri, 18 Jan 2019 19:42:46 +1100 -Subject: [PATCH 1/2] gnome-desktop: update to latest version of upstream - thumbnail code - -The thumbnail code in gnome-desktop had recent bug fixes that needed to be carried across to the Nautilus implementation. Issues for the three related upstream fixes can be found at: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/4 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/89 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/87 - -This patch includes the latest thumbnail code from the gnome-desktop repository to include the fixes. - -Fixes #836 - -(cherry picked from commit e88b2dc8783833c4263ad5d84567a67dbc7bc6de) ---- - .../gnome-desktop-thumbnail-script.c | 54 +++++++++++++++++-- - src/gnome-desktop/gnome-desktop-thumbnail.c | 4 +- - 2 files changed, 52 insertions(+), 6 deletions(-) - -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -index 14e2fed3a..525766388 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -506,22 +506,68 @@ setup_seccomp (GPtrArray *argv_array, - #endif - - #ifdef HAVE_BWRAP -+static gboolean -+path_is_usrmerged (const char *dir) -+{ -+ /* does /dir point to /usr/dir? */ -+ g_autofree char *target = NULL; -+ GStatBuf stat_buf_src, stat_buf_target; -+ -+ if (g_stat (dir, &stat_buf_src) < 0) -+ return FALSE; -+ -+ target = g_strdup_printf ("/usr/%s", dir); -+ -+ if (g_stat (target, &stat_buf_target) < 0) -+ return FALSE; -+ -+ return (stat_buf_src.st_dev == stat_buf_target.st_dev) && -+ (stat_buf_src.st_ino == stat_buf_target.st_ino); -+} -+ - static gboolean - add_bwrap (GPtrArray *array, - ScriptExec *script) - { -+ const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" }; -+ int i; -+ - g_return_val_if_fail (script->outdir != NULL, FALSE); - g_return_val_if_fail (script->s_infile != NULL, FALSE); - - add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", -+ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ NULL); -+ -+ /* These directories might be symlinks into /usr/... */ -+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) -+ { -+ g_autofree char *absolute_dir = g_strdup_printf ("/%s", usrmerged_dirs[i]); -+ -+ if (!g_file_test (absolute_dir, G_FILE_TEST_EXISTS)) -+ continue; -+ -+ if (path_is_usrmerged (absolute_dir)) -+ { -+ g_autofree char *symlink_target = g_strdup_printf ("/usr/%s", absolute_dir); -+ -+ add_args (array, -+ "--symlink", symlink_target, absolute_dir, -+ NULL); -+ } -+ else -+ { -+ add_args (array, -+ "--ro-bind", absolute_dir, absolute_dir, -+ NULL); -+ } -+ } -+ -+ add_args (array, - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c -index b31bad58d..f48fd461a 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c -@@ -967,8 +967,8 @@ get_preview_thumbnail (const char *uri, - if (file_info == NULL) - return NULL; - -- object = g_file_info_get_attribute_object (file_info, -- G_FILE_ATTRIBUTE_PREVIEW_ICON); -+ object = g_object_ref (g_file_info_get_attribute_object (file_info, -+ G_FILE_ATTRIBUTE_PREVIEW_ICON)); - g_object_unref (file_info); - - if (!object) --- -2.17.0 - diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch deleted file mode 100644 index 884deb420911..000000000000 --- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 87aa2520989bafbd861a03a32d6fdb0d2620faf5 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Mon, 11 Mar 2019 23:23:11 +0200 -Subject: [PATCH] Sync gnome-desktop code - -Brings in fontconfig cache bind mount and a small memory fix; cache path hardcoded to Gentoo for now ---- - src/gnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++++ - src/gnome-desktop/gnome-desktop-thumbnail.c | 6 ++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -index 525766388..0331cb3c7 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array, - } - } - -+ /* fontconfig cache if necessary */ -+ if (!g_str_has_prefix ("/var/cache/fontconfig", "/usr/")) -+ add_args (array, "--ro-bind-try", "/var/cache/fontconfig", "/var/cache/fontconfig", NULL); -+ - add_args (array, - "--proc", "/proc", - "--dev", "/dev", -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c -index f48fd461a..566fbeb84 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c -@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri, - if (file_info == NULL) - return NULL; - -- object = g_object_ref (g_file_info_get_attribute_object (file_info, -- G_FILE_ATTRIBUTE_PREVIEW_ICON)); -+ object = g_file_info_get_attribute_object (file_info, -+ G_FILE_ATTRIBUTE_PREVIEW_ICON); -+ if (object) -+ g_object_ref (object); - g_object_unref (file_info); - - if (!object) --- -2.17.0 - -- cgit v1.2.3