gentoo resync : 25.04.2020

5 files changed, 138 insertions, 18 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 693796e89907..2bf8e07d9e94 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,9 +1,10 @@
 AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
+AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
 DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
-EBUILD evolution-3.32.5-r1.ebuild 4547 BLAKE2B 23783f5d3f1036ba73e1b0143c83eb32bc92328148306892609adcc1057a5dbd04793c50a94180072ffe7685c84a3f65ea19debcd71046a012a3fde071589cce SHA512 1d5d94eb9b9dcddfa86527874de77e3f3e0477d20a6f0db85eca6e8369e44931fdf041fa57da437b69b1ed05a0fc503c460994b7937590f3075b6e5b8577d6ee
-EBUILD evolution-3.32.5-r2.ebuild 4644 BLAKE2B a3ec95f9139190dbf6320c9d8b4b90fd40104877df539925d109b9c04b6d096b8de4a5687a06107d350fd3ff25915e3856ec709ec5b275fbb26195c207245c5c SHA512 4d71cbdeb3dc03d908b2d24e7f62bf920cc1cb33ff60fe12c3107179304c3cacd1d79cf74ec9d0ea468246c518bb65957674a3fadebdc9dd113e161409f060e2
-EBUILD evolution-3.34.4.ebuild 4389 BLAKE2B 8976ff4f739d6cfdba5c49e863b2bc8fb82d2cb72c474cb90d816805353f83295a6dbb5514a5444f9623da0ef6f3e0aba0ffdab784cc5d4ff281bfa51291c679 SHA512 a59922c5ee99202f668b339db2f5e219504193e07b1a080324464c4d9f89ea3ce0aa8b07f6ce451f20d9a106a0b8a51a414757be747c4e4499c9df548ace484d
+EBUILD evolution-3.32.5-r2.ebuild 4636 BLAKE2B db044f7101258192838c9984bf714378ffac3040d4598141fa600fb08ea77e25a7dcfcee34d5826ff5c616e942501c4539e8a13bb73c642446fc67e0d9e7cd75 SHA512 48900d1036f9468db58c548dd17cf91f559f78d835f0fa529811a602821f70eb581ceb2e20cd9a01e15c1b3edfe83507e0e1bdeedf15cf8acd04072291154cda
+EBUILD evolution-3.34.4-r1.ebuild 4430 BLAKE2B 038126aa987508944b795cc8ac73f48f24c0006cba40d9522058ed621422a7ce1f1587067e86493aade42351400023e16070abe1028e10e9aa112aac8871b3f6 SHA512 d027de5fef0f850d815c6e09b6ace58675dae79af7cf2fcd6da23f460feef7df305d8ecbe1acf8f8e55a54cb9ca5d1ec3131ad9c49dcbea440625abc449a2ba8
+EBUILD evolution-3.34.4.ebuild 4383 BLAKE2B 404ba5b3ee03be264b22fe229a1b3942d73f8133bd8a8f4384038529fe22cad71ba92aa75d6e2b920bf1a7cefe7da518c6b4cb7ee5900d2793e8d1b241862eb6 SHA512 54e9f216e5cd2c22259dee1abeb37d7cd04a853dfea629b3c317b182fd4d805733a2e29411dae936db6ab1778ea9576bb47c90bdab19d9aa7e538c8bd0c60cae
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.32.5-r2.ebuild b/mail-client/evolution/evolution-3.32.5-r2.ebuild
index cfb14b38415c..4dc92b18e571 100644
--- a/mail-client/evolution/evolution-3.32.5-r2.ebuild
+++ b/mail-client/evolution/evolution-3.32.5-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/evolution-3.32.5-r1.ebuild b/mail-client/evolution/evolution-3.34.4-r1.ebuild
index b36e4e069f30..8428ec7d8069 100644
--- a/mail-client/evolution/evolution-3.32.5-r1.ebuild
+++ b/mail-client/evolution/evolution-3.34.4-r1.ebuild
@@ -14,27 +14,26 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
 # dconf explicitely needed for backup plugin
 # gnome-desktop support is optional with --enable-gnome-desktop
 # automagic libunity dep
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.8 to ensure all use enchant:2
+# TODO: Adjust webkit-gtk dep to actually be that once it's keyworded for needed arches
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.6.0:0
+	>=app-text/enchant-2.2.0:2
 	>=dev-libs/glib-2.46:2[dbus]
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	<gnome-extra/evolution-data-server-3.33
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
 	>=net-libs/webkit-gtk-2.16.0:4
-	!=net-libs/webkit-gtk-2.26.3-r1:4
-	<net-libs/webkit-gtk-2.26.4-r1:4
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
 	>=x11-libs/gtk+-3.22:3
@@ -44,11 +43,11 @@ COMMON_DEPEND="
 	>=app-text/iso-codes-0.49
 	dev-libs/atk
 	gnome-base/dconf
-	>=dev-libs/libical-3.0.2:=
 	x11-libs/libSM
 	x11-libs/libICE
 
 	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
 	geolocation? (
 		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
@@ -56,7 +55,8 @@ COMMON_DEPEND="
 		>=sci-geosciences/geocode-glib-3.10.0
 		x11-libs/mx:1.0 )
 	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( <app-text/gtkspell-3.0.10:3 )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
@@ -75,9 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
 	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
 	!gnome-extra/evolution-exchange
 "
 
@@ -97,9 +95,8 @@ file from /usr/share/applications if you use a different browser)."
 # call; if needed, set them after cmake-utils_src_prepare call, if that works
 
 src_prepare() {
-	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
-	eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 3.34, it should be compatible without this hack.
 	cmake-utils_src_prepare
+	eapply "${FILESDIR}"/${PV}-CVE-2020-11879.patch
 	gnome2_src_prepare
 }
 
@@ -112,14 +109,14 @@ src_configure() {
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DENABLE_SMIME=$(usex ssl)
 		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=1
+		-DWITH_ENCHANT_VERSION=2
 		-DENABLE_CANBERRA=ON
 		-DENABLE_AUTOAR=$(usex archive)
 		-DWITH_HELP=ON
 		-DENABLE_YTNEF=OFF
 		-DWITH_BOGOFILTER=$(usex bogofilter)
 		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GTKSPELL=$(usex spell)
+		-DENABLE_GSPELL=$(usex spell)
 		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
 		-DENABLE_WEATHER=$(usex weather)
 		-DENABLE_CONTACT_MAPS=$(usex geolocation)
diff --git a/mail-client/evolution/evolution-3.34.4.ebuild b/mail-client/evolution/evolution-3.34.4.ebuild
index 32bffc06770b..15ea8d66bcea 100644
--- a/mail-client/evolution/evolution-3.34.4.ebuild
+++ b/mail-client/evolution/evolution-3.34.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch b/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch
new file mode 100644
index 000000000000..8415f3a2617d
--- /dev/null
+++ b/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch
@@ -0,0 +1,122 @@
+From 6489f20d6905cc797e2b2581c415e558c457caa7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 12 Feb 2020 18:59:52 +0100
+Subject: [PATCH] I#784 - Warn about and limit what can be attached using
+ mailto: URI
+
+Closes https://gitlab.gnome.org/GNOME/evolution/issues/784
+---
+ src/composer/e-msg-composer.c | 58 +++++++++++++++++++++++++++++------
+ src/e-util/e-system.error.xml |  7 ++++-
+ 2 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
+index e4c9ac095e..cd3168d882 100644
+--- a/src/composer/e-msg-composer.c
++++ b/src/composer/e-msg-composer.c
+@@ -4761,7 +4761,8 @@ handle_mailto (EMsgComposer *composer,
+ 	gchar *header, *content, *buf;
+ 	gsize nread, nwritten;
+ 	const gchar *p;
+-	gint len, clen;
++	gint len, clen, has_attachments = 0;
++	gboolean has_blacklisted_attachment = FALSE;
+ 
+ 	table = e_msg_composer_get_header_table (composer);
+ 	view = e_msg_composer_get_attachment_view (composer);
+@@ -4844,22 +4845,36 @@ handle_mailto (EMsgComposer *composer,
+ 			} else if (!g_ascii_strcasecmp (header, "attach") ||
+ 				   !g_ascii_strcasecmp (header, "attachment")) {
+ 				EAttachment *attachment;
++				GFile *file;
+ 
+ 				camel_url_decode (content);
+-				if (file_is_blacklisted (content))
+-					e_alert_submit (
+-						E_ALERT_SINK (e_msg_composer_get_editor (composer)),
+-						"mail:blacklisted-file",
+-						content, NULL);
+ 				if (g_ascii_strncasecmp (content, "file:", 5) == 0)
+ 					attachment = e_attachment_new_for_uri (content);
+ 				else
+ 					attachment = e_attachment_new_for_path (content);
+-				e_attachment_store_add_attachment (store, attachment);
+-				e_attachment_load_async (
+-					attachment, (GAsyncReadyCallback)
+-					e_attachment_load_handle_error, composer);
++				file = e_attachment_ref_file (attachment);
++				if (!file || !g_file_peek_path (file) ||
++				    !g_file_test (g_file_peek_path (file), G_FILE_TEST_EXISTS) ||
++				    g_file_test (g_file_peek_path (file), G_FILE_TEST_IS_DIR)) {
++					/* Do nothing, simply ignore the attachment request */
++				} else {
++					has_attachments++;
++
++					if (file_is_blacklisted (content)) {
++						has_blacklisted_attachment = TRUE;
++						e_alert_submit (
++							E_ALERT_SINK (e_msg_composer_get_editor (composer)),
++							"mail:blacklisted-file",
++							content, NULL);
++					}
++
++					e_attachment_store_add_attachment (store, attachment);
++					e_attachment_load_async (
++						attachment, (GAsyncReadyCallback)
++						e_attachment_load_handle_error, composer);
++				}
+ 				g_object_unref (attachment);
++				g_clear_object (&file);
+ 			} else if (!g_ascii_strcasecmp (header, "from")) {
+ 				/* Ignore */
+ 			} else if (!g_ascii_strcasecmp (header, "reply-to")) {
+@@ -4883,6 +4898,29 @@ handle_mailto (EMsgComposer *composer,
+ 
+ 	g_free (buf);
+ 
++	if (has_attachments && !has_blacklisted_attachment) {
++		const gchar *primary;
++		gchar *secondary;
++
++		primary = g_dngettext (GETTEXT_PACKAGE,
++			"Review attachment before sending.",
++			"Review attachments before sending.",
++			has_attachments);
++
++		secondary = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
++			"There had been added %d attachment. Make sure it does not contain any sensitive information before sending the message.",
++			"There had been added %d attachments. Make sure they do not contain any sensitive information before sending the message.",
++			has_attachments),
++			has_attachments);
++
++		e_alert_submit (
++			E_ALERT_SINK (e_msg_composer_get_editor (composer)),
++			"system:generic-warning",
++			primary, secondary, NULL);
++
++		g_free (secondary);
++	}
++
+ 	merge_always_cc_and_bcc (table, to, &cc, &bcc);
+ 
+ 	tov = destination_list_to_vector (to);
+diff --git a/src/e-util/e-system.error.xml b/src/e-util/e-system.error.xml
+index ddcf989fda..02facb7d26 100644
+--- a/src/e-util/e-system.error.xml
++++ b/src/e-util/e-system.error.xml
+@@ -1,6 +1,11 @@
+ <?xml version="1.0"?>
+ <error-list domain="system">
+-  <error type="error" id="generic-error">
++  <error id="generic-error" type="error">
++    <primary>{0}</primary>
++    <secondary>{1}</secondary>
++  </error>
++
++  <error id="generic-warning" type="warning">
+     <primary>{0}</primary>
+     <secondary>{1}</secondary>
+   </error>
+-- 
+2.24.1
+