[gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/

[Mart Raudsepp]

commit:     483f64af56223e4b899c9468f6f51a22ad11b17e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 21:28:47 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 21:28:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=483f64af

gnome-base/nautilus: remove old

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/nautilus/Manifest                       |   1 -
 .../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 ---------
 gnome-base/nautilus/nautilus-3.30.5-r1.ebuild      | 106 -------------------
 6 files changed, 323 deletions(-)

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f39a559f56c..c27e9f9b5a9 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1 @@
-DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
 DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392

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 6c2d061123f..00000000000
--- 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 <mcatanzaro@××××××.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
-

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 f67695b7f1d..00000000000
--- 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 <leio@g.o>
-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 84d0bfc1d5a..00000000000
--- 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 <obrien.timothy.a@×××××.com>
-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 884deb42091..00000000000
--- 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 <leio@g.o>
-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
-

diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
deleted file mode 100644
index cdb86ae3328..00000000000
--- a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
+++ /dev/null
@@ -1,106 +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"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~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/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	seccomp? ( sys-libs/libseccomp )
-	>=x11-libs/pango-1.28.3
-	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 )
-	seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
-	"${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
-	"${FILESDIR}"/${PV}-CVE-2019-11461.patch
-)
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support
-		$(meson_use introspection)
-		$(meson_use packagekit)
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}