From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- gnome-base/nautilus/Manifest | 7 +- gnome-base/nautilus/files/3.28.1-docs-build.patch | 42 -------- .../nautilus/files/3.30.5-CVE-2019-11461.patch | 30 ++++++ gnome-base/nautilus/nautilus-3.28.1.ebuild | 104 -------------------- gnome-base/nautilus/nautilus-3.30.5-r1.ebuild | 106 +++++++++++++++++++++ gnome-base/nautilus/nautilus-3.30.5.ebuild | 105 -------------------- 6 files changed, 138 insertions(+), 256 deletions(-) delete mode 100644 gnome-base/nautilus/files/3.28.1-docs-build.patch create mode 100644 gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch delete mode 100644 gnome-base/nautilus/nautilus-3.28.1.ebuild create mode 100644 gnome-base/nautilus/nautilus-3.30.5-r1.ebuild delete mode 100644 gnome-base/nautilus/nautilus-3.30.5.ebuild (limited to 'gnome-base/nautilus') diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index f4412b2402e8..f55e6a7fc394 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,11 +1,8 @@ -AUX 3.28.1-docs-build.patch 1049 BLAKE2B d79a2a9a91ae549386a5c484692c690301af7e181351ab4fd530947d4663d15f0cbfff1ee7f4ecdce390cdb1eb31db03d6df821ffffadb3e570f002433538c7a SHA512 069d669be97913e9177b456e9cfa67f0498ec3905a3e884f9373b375eb82b40ed43c9ca4d483d2eabd1ca91127d43dc2981234cbaac08f67e7fa124d8827a68b +AUX 3.30.5-CVE-2019-11461.patch 1099 BLAKE2B 8f906c2076f7f2c630bcc5a56f76ec18814932055eebea12b41335d3770403efa34f8350bd9bb2fbabeec36ed7249f5363d689d6ea8a9e1e1babebe19c36e6af SHA512 91c927814ae3763a634d26ccb357276b570bc57f176969e43b7e99dcb9f720bfec43003295e5058c43b512c94af2e4afc7b960e1b10009e1b0d365440e3eb37f AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990 AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7 AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab -DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48 -DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf -EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5 -EBUILD nautilus-3.30.5.ebuild 2780 BLAKE2B 89428170b804da39250b721558dc568700549d1b0cbf7b35989074b7402d8271ca8b684b5d1b9e7a318f2984bcfaa51e67dd4c392109403dd9481a1e21723283 SHA512 1e182d99407ac7464b2d68801a2a49200f4bd3a7e781bc7506a7c97045ca8dcffc382b088fe2b5c96d0de6d94f0066fe0c3b889f68495a075f7fd64e85bd2f4e +EBUILD nautilus-3.30.5-r1.ebuild 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5 MISC metadata.xml 577 BLAKE2B 16a9d9904b6a1cb02d844b3a90cd87e4398024a16d4cef1a5106190a06b6d60058db172d1ae1ae0b424c3a2c864dfacbedaca696e847f88a1a5ae300a2cb04b7 SHA512 c42d9a07ac2a05a5da2c6c10c49c3810ed3409ac00d5d7e744d15232fb62ec0f84d2ebcb36c5a819a476ae922900d1d8270101b26a766e85c35d3fa2d6531747 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 -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 +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/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild deleted file mode 100644 index 40dd98c4c84d..000000000000 --- a/gnome-base/nautilus/nautilus-3.28.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg - -DESCRIPTION="Default file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-3+ LGPL-2.1+" -SLOT="0" -IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - >=dev-libs/glib-2.55.1:2 - >=media-libs/gexiv2-0.10.0 - >=app-arch/gnome-autoar-0.2.1 - >=gnome-base/gnome-desktop-3.0.0:3= - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.22.26:3[X,introspection?] - selinux? ( >=sys-libs/libselinux-2.0 ) - >=app-misc/tracker-2.0:= - x11-libs/libX11 - >=dev-libs/libxml2-2.7.8:2 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gdbus-codegen-2.51.2 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.10 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !