diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /gnome-base/nautilus/files | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'gnome-base/nautilus/files')
-rw-r--r-- | gnome-base/nautilus/files/3.28.1-docs-build.patch | 42 | ||||
-rw-r--r-- | gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch | 30 |
2 files changed, 30 insertions, 42 deletions
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch deleted file mode 100644 index a2cb07aa23e3..000000000000 --- a/gnome-base/nautilus/files/3.28.1-docs-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 5 Mar 2019 19:22:58 +0200 -Subject: [PATCH] build: Always install man page - -It's already generated and shouldn't be thrown in the same pot as -full gtk-doc generation. It should be either a separate `man` option, -or just always installed. ---- - docs/meson.build | 4 +++- - meson.build | 4 +--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/docs/meson.build b/docs/meson.build -index b039cb631..2b1800be6 100644 ---- a/docs/meson.build -+++ b/docs/meson.build -@@ -1,3 +1,5 @@ - install_man('nautilus.1') - --subdir('reference') -+if get_option('docs') -+ subdir('reference') -+endif -diff --git a/meson.build b/meson.build -index 4b64239ac..88fe73237 100644 ---- a/meson.build -+++ b/meson.build -@@ -152,9 +152,7 @@ if get_option('tests') != 'none' - endif - subdir('data') - subdir('po') --if get_option('docs') -- subdir('docs') --endif -+subdir('docs') - if get_option('extensions') - subdir('extensions') - endif --- -2.17.0 - 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 new file mode 100644 index 000000000000..6c2d061123fa --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch @@ -0,0 +1,30 @@ +From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@igalia.com> +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 + |