diff --git a/mail-client/sylpheed/files/sylpheed-debian-Specify-MACRO_DIRS-as-general.patch b/mail-client/sylpheed/files/sylpheed-debian-Specify-MACRO_DIRS-as-general.patch new file mode 100644 index 0000000..ec26d74 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-Specify-MACRO_DIRS-as-general.patch @@ -0,0 +1,22 @@ +From: Hideki Yamane +Date: Sun, 28 Jan 2018 18:20:49 +0900 +Subject: Specify MACRO_DIRS as general + +It breaks configure that is generated with autoreconf +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 090177d..3c12182 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,7 +71,7 @@ AM_PROG_LEX + AC_PROG_YACC + AM_PROG_LIBTOOL + +-SYLPHEED_ACLOCAL_INCLUDE(ac) ++AC_CONFIG_MACRO_DIRS([ac]) + + native_win32=no + os_osx=no diff --git a/mail-client/sylpheed/files/sylpheed-debian-address-book.patch b/mail-client/sylpheed/files/sylpheed-debian-address-book.patch new file mode 100644 index 0000000..792e613 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-address-book.patch @@ -0,0 +1,31 @@ +From: Gustavo Noronha Silva +Date: Sun, 28 Jan 2018 18:20:19 +0900 +Subject: fix small bug in addressbook window +Forwarded: yes + +--- + src/addressbook.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/addressbook.c b/src/addressbook.c +index b013507..592050d 100644 +--- a/src/addressbook.c ++++ b/src/addressbook.c +@@ -1326,6 +1326,17 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data) + if (new_compose) + compose_block_modified(addrbook.target_compose); + ++ /* ++ * nothing selected, but maybe there's something on the text entry ++ */ ++ if (node == NULL) { ++ gchar *addr; ++ addr = gtk_entry_get_text(GTK_ENTRY(addrbook.entry)); ++ if (addr) ++ compose_entry_append(addrbook.target_compose, addr, ++ (ComposeEntryType) data); ++ } ++ + while( node ) { + AddressObject *obj = node->data; + Compose *compose = addrbook.target_compose; diff --git a/mail-client/sylpheed/files/sylpheed-debian-detect-oniguruma-without-onig-config.patch b/mail-client/sylpheed/files/sylpheed-debian-detect-oniguruma-without-onig-config.patch new file mode 100644 index 0000000..12d11e1 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-detect-oniguruma-without-onig-config.patch @@ -0,0 +1,29 @@ +From: Hideki Yamane +Date: Fri, 9 Feb 2018 23:04:58 +0900 +Subject: detect oniguruma without onig-config + +--- + configure.ac | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3c12182..0bd2e35 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -346,13 +346,10 @@ AC_MSG_CHECKING([whether to use Oniguruma]) + if test "$ac_cv_enable_oniguruma" = yes; then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING([whether Oniguruma is available]) +- dnl AC_CHECK_PROG(ONIG_CONFIG, onig-config, onig-config) +- ONIG_CONFIG=onig-config +- ONIG_VERSION=`$ONIG_CONFIG --version 2>/dev/null` +- if test "x$ONIG_VERSION" != "x"; then ++ if `pkg-config --exists oniguruma`; then + AC_MSG_RESULT(yes) +- CFLAGS="$CFLAGS `$ONIG_CONFIG --cflags`" +- LIBS="$LIBS `$ONIG_CONFIG --libs`" ++ CFLAGS="$CFLAGS `pkg-config --cflags oniguruma`" ++ LIBS="$LIBS `pkg-config --libs oniguruma`" + AC_DEFINE(USE_ONIGURUMA, 1, Define if you want to use Oniguruma.) + else + AC_MSG_RESULT(no) diff --git a/mail-client/sylpheed/files/sylpheed-debian-escape-from-at-the-beginning.patch b/mail-client/sylpheed/files/sylpheed-debian-escape-from-at-the-beginning.patch new file mode 100644 index 0000000..0aec9e3 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-escape-from-at-the-beginning.patch @@ -0,0 +1,28 @@ +From: Darren Salt +Reviewed-by: Francesco Poli +Date: Sun, 28 Jan 2018 18:20:19 +0900 +Subject: escape '^From ' lines for not breaking GPG MIME signatures +Bug-Debian: http://bugs.debian.org/485855 + +--- + libsylph/quoted-printable.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libsylph/quoted-printable.c b/libsylph/quoted-printable.c +index adcdb05..adee4bc 100644 +--- a/libsylph/quoted-printable.c ++++ b/libsylph/quoted-printable.c +@@ -52,6 +52,13 @@ void qp_encode_line(gchar *out, const guchar *in) + if (*inp == '\r') + inp++; + inp++; ++ if (strncmp(inp, "From ", 5) == 0) { ++ *outp++ = '='; ++ *outp++ = '4'; ++ *outp++ = '6'; ++ len += 3; ++ inp++; ++ } + } else if (ch == '\t' || ch == ' ') { + if (IS_LBREAK(inp + 1)) { + SOFT_LBREAK_IF_REQUIRED(3); diff --git a/mail-client/sylpheed/files/sylpheed-debian-fix-typo-import.patch b/mail-client/sylpheed/files/sylpheed-debian-fix-typo-import.patch new file mode 100644 index 0000000..cb2ce73 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-fix-typo-import.patch @@ -0,0 +1,18 @@ +From: Ricardo Mones +Subject: fix typo in import.c file +Last-Updated: 2022-09-14 +Forwarded: no + +diff --git a/src/import.c b/src/import.c +index a59f11f..b323270 100644 +--- a/src/import.c ++++ b/src/import.c +@@ -734,7 +734,7 @@ static void import_filesel_cb(GtkWidget *widget, gpointer data) + + utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); + if (!utf8_filename) { +- g_warning("import_filesel_cb(): failed to convert characer set."); ++ g_warning("import_filesel_cb(): failed to convert character set."); + utf8_filename = g_strdup(filename); + } + gtk_entry_set_text(GTK_ENTRY(file_entry), utf8_filename); diff --git a/mail-client/sylpheed/files/sylpheed-debian-support-SNI-for-IMAP.patch b/mail-client/sylpheed/files/sylpheed-debian-support-SNI-for-IMAP.patch new file mode 100644 index 0000000..441e919 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-support-SNI-for-IMAP.patch @@ -0,0 +1,27 @@ +From: Antonio Ospite +Date: Fri, 24 Aug 2018 10:46:04 +0200 +Subject: [PATCH v2] libsylph/ssl.c: Support SNI, some servers (imap.gmail.com) + seem to require it + +--- + libsylph/ssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libsylph/ssl.c b/libsylph/ssl.c +index 61e770f8..b4f6be0c 100644 +--- 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); +-- +2.19.0.rc2 + diff --git a/mail-client/sylpheed/files/sylpheed-debian-use-enchant-2.patch b/mail-client/sylpheed/files/sylpheed-debian-use-enchant-2.patch new file mode 100644 index 0000000..235dcd9 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-debian-use-enchant-2.patch @@ -0,0 +1,31 @@ +Description: Switch to enchant-2 +Author: Laurent Bigonville +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949720 + +--- a/configure.ac ++++ b/configure.ac +@@ -319,10 +319,10 @@ if test "$ac_cv_enable_gtkspell" = yes; + LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`" + if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then + AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell) +- LIBS="$LIBS `$PKG_CONFIG --libs enchant`" ++ LIBS="$LIBS `$PKG_CONFIG --libs enchant-2`" + + dnl Workaroud for zemberek crash +- if $PKG_CONFIG --atleast-version 1.4.2 enchant ; then ++ if $PKG_CONFIG --atleast-version 1.4.2 enchant-2 ; then + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags dbus-glib-1`" + LIBS="$LIBS `$PKG_CONFIG --libs dbus-glib-1`" + fi +--- a/src/compose.c ++++ b/src/compose.c +@@ -71,7 +71,7 @@ + # include + # include + #if USE_ENCHANT +-# include ++# include + #else + # include + #endif diff --git a/mail-client/sylpheed/sylpheed-3.8.0.ebuild b/mail-client/sylpheed/sylpheed-3.8.0.ebuild new file mode 100644 index 0000000..b3f20c3 --- /dev/null +++ b/mail-client/sylpheed/sylpheed-3.8.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit git-r3 autotools desktop xdg + +DESCRIPTION="A lightweight email client and newsreader" +HOMEPAGE="http://sylpheed.sraoss.jp/" +EGIT_REPO_URI="https://github.com/sylpheed-mail/sylpheed" +EGIT_COMMIT="${EGIT_COMMIT:c47d366}" + +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}-debian-address-book.patch + "${FILESDIR}"/${PN}-debian-escape-from-at-the-beginning.patch + "${FILESDIR}"/${PN}-debian-Specify-MACRO_DIRS-as-general.patch + "${FILESDIR}"/${PN}-debian-detect-oniguruma-without-onig-config.patch + "${FILESDIR}"/${PN}-debian-support-SNI-for-IMAP.patch + "${FILESDIR}"/${PN}-debian-use-enchant-2.patch + "${FILESDIR}"/${PN}-debian-fix-typo-import.patch + "${FILESDIR}"/${PN}-tls-1.3.patch + "${FILESDIR}"/${PN}-CVE-2021-37746.patch +) +DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*" + +src_configure() { + eautoreconf + 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 +}