[gentoo-commits] repo/gentoo:master commit in: mail-client/sylpheed/files/, profiles/, mail-client/sylpheed/

[gentoo-commits] repo/gentoo:master commit in: mail-client/sylpheed/files/, profiles/, mail-client/sylpheed/

[Jakov Smolić]

commit:     b0fca6e9ac605eecb019c47cdc23f38cbcae8474
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 18:46:19 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 05:23:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0fca6e9

mail-client/sylpheed: treeclean

Closes: https://bugs.gentoo.org/769293
Closes: https://bugs.gentoo.org/664070
Bug: https://bugs.gentoo.org/805338
Bug: https://bugs.gentoo.org/807358
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-client/sylpheed/Manifest                      |  1 -
 .../sylpheed/files/sylpheed-CVE-2021-37746.patch   | 39 ------------
 mail-client/sylpheed/files/sylpheed-tls-1.3.patch  | 17 ------
 mail-client/sylpheed/metadata.xml                  | 11 ----
 mail-client/sylpheed/sylpheed-3.7.0-r5.ebuild      | 69 ----------------------
 profiles/package.mask                              |  6 --
 6 files changed, 143 deletions(-)

diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
deleted file mode 100644
index 8bcca88f4e71..000000000000
--- a/mail-client/sylpheed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4

diff --git a/mail-client/sylpheed/files/sylpheed-CVE-2021-37746.patch b/mail-client/sylpheed/files/sylpheed-CVE-2021-37746.patch
deleted file mode 100644
index 47a6f078e824..000000000000
--- a/mail-client/sylpheed/files/sylpheed-CVE-2021-37746.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://src.fedoraproject.org/rpms/sylpheed/blob/rawhide/f/sylpheed-3.7.0-uri-check.patch
-
-From 4d7dfe055673b49391af66f45643bc956799a4ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Mon, 2 Aug 2021 12:04:42 +0200
-Subject: [PATCH] harden link checker before accepting click
-
-http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ac286a71ed78429e16c612161251b9ea90ccd431;hp=a4a629ce824011f5ae3f0b8cb1117f9608b7f5ad
-
-Resolves: CVE-2021-37746
----
- src/textview.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/textview.c b/src/textview.c
-index e55eea9e..6fbb8a1d 100644
---- a/src/textview.c
-+++ b/src/textview.c
-@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
- 	gboolean retval = TRUE;
- 
- 	if (is_uri_string(uri->uri) == FALSE)
--		return TRUE;
-+		return FALSE;
- 
- 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
- 	gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
-@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
- 		if (aval == G_ALERTDEFAULT)
- 			retval = TRUE;
- 	}
-+	if (strlen(uri->uri) > get_uri_len(uri->uri))
-+		retval = FALSE;
- 
- 	g_free(visible_str);
- 
--- 
-2.31.1
-

diff --git a/mail-client/sylpheed/files/sylpheed-tls-1.3.patch b/mail-client/sylpheed/files/sylpheed-tls-1.3.patch
deleted file mode 100644
index a8215dd2a0d1..000000000000
--- a/mail-client/sylpheed/files/sylpheed-tls-1.3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://sylpheed.sraoss.jp/redmine/issues/306
-
-Author: Antonio Ospite <ao2@ao2.it>
-
---- a/libsylph/ssl.c
-+++ b/libsylph/ssl.c
-@@ -262,6 +262,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
- 		return FALSE;
- 	}
- 
-+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-+	SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname);
-+#endif
-+
- 	SSL_set_fd(sockinfo->ssl, sockinfo->sock);
- 	while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
- 		err = SSL_get_error(sockinfo->ssl, ret);

diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
deleted file mode 100644
index 5228794459ac..000000000000
--- a/mail-client/sylpheed/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hattya@gentoo.org</email>
-		<name>Akinori Hattori</name>
-	</maintainer>
-	<use>
-		<flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
-	</use>
-</pkgmetadata>

diff --git a/mail-client/sylpheed/sylpheed-3.7.0-r5.ebuild b/mail-client/sylpheed/sylpheed-3.7.0-r5.ebuild
deleted file mode 100644
index 1899b3053048..000000000000
--- a/mail-client/sylpheed/sylpheed-3.7.0-r5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit desktop xdg
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.sraoss.jp/"
-SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt ipv6 ldap nls oniguruma spell ssl xface"
-
-CDEPEND="net-libs/liblockfile
-	x11-libs/gtk+:2
-	crypt? ( app-crypt/gpgme:= )
-	ldap? ( net-nds/openldap:= )
-	nls? ( sys-devel/gettext )
-	oniguruma? ( dev-libs/oniguruma:= )
-	spell? (
-		app-text/gtkspell:2
-		dev-libs/dbus-glib
-	)
-	ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types
-	net-misc/curl"
-DEPEND="${CDEPEND}
-	xface? ( media-libs/compface )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-tls-1.3.patch
-	"${FILESDIR}"/${PN}-CVE-2021-37746.patch
-)
-DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*"
-
-src_configure() {
-	local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-	econf \
-		$(use_enable crypt gpgme) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable oniguruma) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl) \
-		$(use_enable xface compface) \
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \
-		--with-manualdir="${htmldir}"/manual \
-		--with-faqdir="${htmldir}"/faq \
-		--disable-updatecheck
-}
-
-src_install() {
-	default
-
-	doicon *.png
-	domenu *.desktop
-
-	cd plugin/attachment_tool
-	emake DESTDIR="${D}" install-plugin
-	docinto plugin/attachment_tool
-	dodoc README
-
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index d5f181d037d3..4db77c8aacd3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -236,12 +236,6 @@ dev-python/thunarx-python
 =dev-python/pythran-0.13.0
 =dev-python/gast-0.5.4
 
-# John Helmert III <ajak@gentoo.org> (2023-04-30)
-# STARTTLS vulnerability, depends on gtk+:2, practically unmainatined
-# upstream. Use mail-client/claws instead. Removal in 30 days, bugs
-# #769293, #807358
-mail-client/sylpheed
-
 # Sam James <sam@gentoo.org> (2023-05-01)
 # Quite broken, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109672.
 =sys-devel/gcc-14.0.0_pre20230430