diff options
Diffstat (limited to 'net-mail/fetchmail')
| -rw-r--r-- | net-mail/fetchmail/Manifest | 6 | ||||
| -rw-r--r-- | net-mail/fetchmail/fetchmail-6.4.2.ebuild (renamed from net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild) | 36 | ||||
| -rw-r--r-- | net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch | 117 | ||||
| -rw-r--r-- | net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch | 11 |
4 files changed, 19 insertions, 151 deletions
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest index 3fe793ea5d90..7880d066bb35 100644 --- a/net-mail/fetchmail/Manifest +++ b/net-mail/fetchmail/Manifest @@ -1,14 +1,12 @@ -AUX fetchmail-6.3.26-libressl.patch 3948 BLAKE2B fa277ad3aa70d83f258be80a17b69d977c6c523eb37a305a7c82659231eff6ce6f63e3b7a4ccd4fe487f6a3bd163711f3ea3e338406fcec4ec8955a32007af91 SHA512 3d2aa5f7c388ae89d3ea701e4f83b9a477f31e39df13a6e84ede11be6a003f7b9e483f8439b3eaf27256f72cf7f9279d3f999f69f4cf210cb5d15ab124283389 AUX fetchmail-6.3.26-python-optional.patch 255 BLAKE2B ff13ec04926ae8362acea31c37719e9bc59599ad98f0ba8792d25101371984d38b2ea5ea9672a5b23b2600e743d6d57a718d3967f1c79dcb393c4f8757a58741 SHA512 7ac620a695d681278ed91f2f45a55822e5adfb0657c65be3edf09eb5259173e298cf509d1d7df7905bf2cb914b4869cca9cd0627dc0527a048edd9e9bd2a775d -AUX fetchmail-6.3.26-tests.patch 344 BLAKE2B 7ebe51bf9253f14c64763c375e6bf213dd4ef3857780ceda2093ce7d576d6cd99e88e2ca00f424fca3f2aebc01cf8a09c9a6c758ec4b78232af1e9d628288c90 SHA512 bf049e35af40f10f386dbfc6aa95082c650bc5802f13d0f4d3f77d925cf5120b8166b7718e5321b99f26a1dc8fbeaddc42872dda7adbd57962ce04950ad373b2 AUX fetchmail.conf 38 BLAKE2B 8458d0709652038a9a4661d68154ed87269aa3b9d07abb1a04645fe5acdfbee2c197b81356430e74ab63685c2f2f7003def4ca4a7f2ca04146abc42f4d91cafc SHA512 f6e3eb409a1d88bcfb02012491fdbbf859803dbee45998879525fd35a2377bae95504da8aafcb24bcc2e695e15c96f6ec6f7e6521d28012370a4ec5e2a25a351 AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398ab3104c5180a321a2cff386d4a50fbc24bacd00a001052b3076b6fa5f3c831e48ecc2ce95b8ca27b1 SHA512 4dacd025d76a22c991c6dabe7c3d5b33b49348e83534d4de300a1b0d55a62dc0195e19065cb0a3a5da72f50700e7b92d4579be795a899f680e2a8be7dd508532 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed -DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0 -EBUILD fetchmail-6.3.26-r4.ebuild 2642 BLAKE2B 666e66fb9d3dff9291b4cdd9e8f8dd4524e16aef2d17b8b4b6451b145b2befca701ca1d4db0e6761e61eacb2d3866d8af3039c601061f723e74bc5c9701249b6 SHA512 fd972903d3736ba4402ff07c802889d62c01a6f749bc60fd5bad74266f14082736a2a53d5f42991a5a9c156b2ea6d26b7ea6b79e66c7573376a07e4a7a2021b3 +DIST fetchmail-6.4.2.tar.xz 1261472 BLAKE2B 11d00eeef39ceda6374a66909e2f8815c2f22ac7321ccd47eff8387e71056a8094c616f903ac0502a0a0a18929c11d4102d116229f6f875f413e026735040190 SHA512 8ec62a5df81b9b8c5e5479d35a10aded22aca74f671cded339dc7ae1c78d8a8638dfe4f04be35334184b5b27f3fb857402dc5b587cca8ede3f5b9b268b37edc1 EBUILD fetchmail-6.4.1-r3.ebuild 2429 BLAKE2B 5e089f5b9bdc9371e6701dfe48e140df30a38cae1ebc89c4032e030737c316f622632c31fa3d7f1f55c4461cc0a7127674191a5f3f94955e32474a3161e64490 SHA512 4d3a571f7943f2d8d3cde6a35ff71ac6ef41ed36f12d1fd18d81a9efbdb8e463d9e8be6d92459503ca7c4494af4e8f132e877a3cb809f9c72ac220f5a82aae2e EBUILD fetchmail-6.4.1.ebuild 2606 BLAKE2B 4597ff6bd5653d6b075498fc4a2175b3d0695ca2934734bc4565152c7f868b211116274aad9a61b7c57120e1d9a2101244aefec54bb3f9da7f721148c4889750 SHA512 6c852431b6d438067247f5368cc8e7966a986223485faeb667dd31be756a3570738a6e19685dafd0050c89caa3ac34471603f43f6b7f1df9d67f1173597b0640 +EBUILD fetchmail-6.4.2.ebuild 2521 BLAKE2B 109bae40d435d854f994ceee21217697487bc5c0ac1a27076faab03c9540aab696fb225dcf0b1519250b1767b51f0b3a9fe97e9b2b094b2082fd41b89c416315 SHA512 3426247247809415e7105e66aa48fa06a874754098e00a76b287254b9234def9d7dcac0d68e57bd338bf3fac19f8470345defc82ecba3170b94823e24631f7cc MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974 diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.4.2.ebuild index 29bd0e833e52..109bd30c3ec1 100644 --- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild +++ b/net-mail/fetchmail/fetchmail-6.4.2.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) PYTHON_REQ_USE="tk" -inherit python-single-r1 user systemd toolchain-funcs autotools +inherit python-single-r1 systemd toolchain-funcs autotools DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" HOMEPAGE="http://www.fetchmail.info/" @@ -13,23 +14,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="GPL-2 public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="ssl nls kerberos tk socks libressl" REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:= ) +RDEPEND="acct-user/fetchmail + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 - !libressl? ( >=dev-libs/openssl-0.9.6:= ) + !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) - tk? ( ${PYTHON_DEPS} )" + tk? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + ') + )" DEPEND="${RDEPEND} app-arch/xz-utils sys-devel/flex @@ -38,15 +45,11 @@ DEPEND="${RDEPEND} DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" HTML_DOCS="*.html" PATCHES=( - "${FILESDIR}"/${P}-python-optional.patch - "${FILESDIR}"/${P}-tests.patch - "${FILESDIR}"/${P}-libressl.patch + "${FILESDIR}"/${PN}-6.3.26-python-optional.patch ) +S=${WORKDIR}/${P/_/.} pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - use tk && python-single-r1_pkg_setup } @@ -78,11 +81,6 @@ src_compile() { } src_install() { - # fetchmail's homedir (holds fetchmail's .fetchids) - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} - fperms 700 /var/lib/${PN} - default newinitd "${FILESDIR}"/fetchmail.initd fetchmail diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch deleted file mode 100644 index dbbed876d600..000000000000 --- a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- a/configure.ac 2013-04-23 16:51:10.000000000 -0400 -+++ b/configure.ac 2016-01-30 00:14:01.114090572 -0500 -@@ -803,6 +803,7 @@ - - case "$LIBS" in *-lssl*) - AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) - ;; - esac - ---- a/po/de.po 2013-04-23 17:33:52.000000000 -0400 -+++ b/po/de.po 2016-01-30 00:25:00.255287974 -0500 -@@ -8,8 +8,8 @@ - msgstr "" - "Project-Id-Version: fetchmail 6.3.26\n" - "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" --"POT-Creation-Date: 2013-04-23 23:24+0200\n" --"PO-Revision-Date: 2013-04-23 23:33+0200\n" -+"POT-Creation-Date: 2015-01-16 20:42+0100\n" -+"PO-Revision-Date: 2016-01-30 00:23-0500\n" - "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n" - "Language-Team: Deutsch <de@li.org>\n" - "Language: \n" -@@ -3198,20 +3198,24 @@ - msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL" - - #: socket.c:913 --msgid "Your operating system does not support SSLv2.\n" --msgstr "Ihr Betriebssystem unterstützt SSLv2 nicht.\n" -+msgid "Your OpenSSL version does not support SSLv2.\n" -+msgstr "Ihre OpenSSL-Version unterstützt SSLv2 nicht.\n" - --#: socket.c:923 -+#: socket.c:920 -+msgid "Your OpenSSL version does not support SSLv3.\n" -+msgstr "Ihre OpenSSL-Version unterstützt SSLv3 nicht.\n" -+ -+#: socket.c:928 - #, c-format - msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n" - msgstr "" - "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n" - --#: socket.c:1022 -+#: socket.c:1027 - msgid "Certificate/fingerprint verification was somehow skipped!\n" - msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n" - --#: socket.c:1039 -+#: socket.c:1044 - msgid "" - "Warning: the connection is insecure, continuing anyways. (Better use --" - "sslcertck!)\n" -@@ -3219,11 +3223,11 @@ - "Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie " - "lieber --sslcertck!)\n" - --#: socket.c:1081 -+#: socket.c:1086 - msgid "Cygwin socket read retry\n" - msgstr "Cygwin-Socket-Lese-Wiederholung\n" - --#: socket.c:1084 -+#: socket.c:1089 - msgid "Cygwin socket read retry failed!\n" - msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n" - ---- a/fetchmail.c 2013-04-23 16:00:45.000000000 -0400 -+++ b/fetchmail.c 2016-01-30 00:16:26.104294447 -0500 -@@ -54,6 +54,10 @@ - #define ENETUNREACH 128 /* Interactive doesn't know this */ - #endif /* ENETUNREACH */ - -+#ifdef SSL_ENABLE -+#include <openssl/ssl.h> /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ -+#endif -+ - /* prototypes for internal functions */ - static int load_params(int, char **, int); - static void dump_params (struct runctl *runp, struct query *, flag implicit); -@@ -263,6 +267,12 @@ - #ifdef SSL_ENABLE - "+SSL" - #endif -+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 -+ "-SSLv2" -+#endif -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 -+ "-SSLv3" -+#endif - #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ ---- a/socket.c 2013-04-23 16:00:45.000000000 -0400 -+++ b/socket.c 2016-01-30 00:28:26.718678785 -0500 -@@ -907,14 +907,19 @@ - _ssl_context[sock] = NULL; - if(myproto) { - if(!strcasecmp("ssl2",myproto)) { --#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 -+#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL2 + 0) - _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; - #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL3 + 0) - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch deleted file mode 100644 index 691f34814eaa..000000000000 --- a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,7 +47,7 @@ - check_PROGRAMS= - - TESTS= t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match --TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL) -+TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" - - if NEED_TRIO - noinst_LIBRARIES+= libtrio.a |