[gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/files/, www-client/epiphany/

[Mart Raudsepp]

commit:     80954e9697477e00ac3c4734ac6cc2f5bc36c4ec
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 18:38:58 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 18:38:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80954e96

www-client/epiphany: security cleanup

Bug: https://bugs.gentoo.org/658376
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 www-client/epiphany/Manifest                       |  1 -
 www-client/epiphany/epiphany-3.24.5.ebuild         | 75 ----------------------
 .../files/epiphany-3.14.0-unittest-2.patch         | 45 -------------
 .../files/epiphany-3.16.0-unittest-1.patch         | 30 ---------
 4 files changed, 151 deletions(-)

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index ed666f1b49f..981ca3bece2 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1,3 @@
-DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2
 DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
 DIST epiphany-3.30.0.tar.xz 4528508 BLAKE2B 75d605a1117131bebaf0e0a7013ae4e9599b7058e26f4acf84140a6e345255cccac910cc9d5a2f90be0835f7dbaa6c77d16e127dfb5b1ae139ef179a20795444 SHA512 80ba03c67bd467e31e572afd4e8632232bc002c63e584e87bc6c3b74d23cd470f14e696080fd952a8617c6c07202eafff01bc97f72d9a06f0121d75565e667f3
 DIST epiphany-3.30.1.tar.xz 4528876 BLAKE2B 1dbb630128a9af975939d386b3113a41ef92ce1bb756a5407a216fa8f25f1dfcd051a11c54a034aeafd8ca5aa5ada7da83f3ecf825370801b04b10b7ef794c80 SHA512 37d6814d9dfb1f70e6cfd3395179b9e213eb79773c1fed238999d5c6ae34c0b93b6f93dff695eb959cb46e89a2cd6b705c1a294d1424c82137ba26d0b7a37503

diff --git a/www-client/epiphany/epiphany-3.24.5.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild
deleted file mode 100644
index 873a5036a2b..00000000000
--- a/www-client/epiphany/epiphany-3.24.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	>=x11-libs/gtk+-3.22.13:3
-	>=net-libs/webkit-gtk-2.15.90:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	dev-libs/icu:=
-	>=x11-libs/libnotify-0.5.1:=
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	dev-db/sqlite:3
-	>=app-text/iso-codes-0.35
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-)
-
-src_configure() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=778495
-	append-cflags -std=gnu11
-
-	# httpseverywhere is experimental in 3.24; gnome bug #775575
-	# firefox sync storage is not quite ready in 3.24; deps on hogweed/nettle
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		--without-libhttpseverywhere \
-		--disable-firefox-sync \
-		$(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}

diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
deleted file mode 100644
index 36dcb30ce3b..00000000000
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3d2ca8dfb33f9dd658293d14d6b75983d1d2f57d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 19 Oct 2014 23:06:29 +0200
-Subject: [PATCH 3/3] Disable broken tests
-
-Not the first time these are failing even though issue was reported
-upstream.
----
- tests/ephy-file-helpers-test.c | 4 ++--
- tests/ephy-migration-test.c    | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index bdf7455..718fa29 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -341,8 +341,8 @@ main (int argc, char *argv[])
-   g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir",
-                    test_ephy_file_get_downloads_dir);
- 
--  g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
--                   test_ephy_file_create_delete_dir);
-+  /*g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
-+                   test_ephy_file_create_delete_dir);*/
- 
-   g_test_add_func ("/lib/ephy-file-helpers/desktop_dir",
-                    test_ephy_file_desktop_dir);
-diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c
-index fab9ee7..64cdd65 100644
---- a/tests/ephy-migration-test.c
-+++ b/tests/ephy-migration-test.c
-@@ -65,8 +65,8 @@ main (int argc, char *argv[])
- 
-   g_test_add_func ("/lib/ephy-profile-utils/do_migration_simple",
-                    test_do_migration_simple);
--  g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
--                   test_do_migration_invalid);
-+  /*g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
-+                   test_do_migration_invalid);*/
- 
-   return g_test_run ();
- }
--- 
-2.1.2
-

diff --git a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
deleted file mode 100644
index baa8a421da1..00000000000
--- a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7ed4a68e2106480f0984703f70b7c25734803161 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 10 May 2015 17:35:57 +0200
-Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
- guaranteed to be /tmp
-
----
- tests/ephy-file-helpers-test.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index 43d0009..0fcb585 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -89,12 +89,7 @@ test_ephy_file_helpers_init (void)
- 
-     /* Cleanup dir left behind. */
-     if (keep_dir) {
--      /* As a safety measure, only try recursive delete on paths
--       * prefixed with /tmp. */
--      if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (tmp_dir, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
-     }
- 
-     g_free (tmp_dir);
--- 
-2.3.6
-