commit: 2098af5e8e89ec8ba4b503246ec2f12dfc8da939 Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Tue Jun 2 01:44:46 2020 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Tue Jun 2 01:44:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2098af5e
net-mail/fetchmail: drop package fixed in gentoo.git Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> net-mail/fetchmail/Manifest | 1 - net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild | 106 ------------------- net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild | 108 ------------------- .../files/fetchmail-6.3.26-libressl.patch | 117 --------------------- .../files/fetchmail-6.3.26-python-optional.patch | 14 --- .../fetchmail/files/fetchmail-6.3.26-tests.patch | 11 -- net-mail/fetchmail/files/fetchmail.conf | 1 - net-mail/fetchmail/files/fetchmail.confd | 10 -- net-mail/fetchmail/files/fetchmail.initd | 44 -------- net-mail/fetchmail/files/fetchmail.service | 11 -- net-mail/fetchmail/files/fetchmail_at.service | 11 -- net-mail/fetchmail/metadata.xml | 15 --- 12 files changed, 449 deletions(-) diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest deleted file mode 100644 index 3f09115..0000000 --- a/net-mail/fetchmail/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fetchmail-6.3.26.tar.xz 1283816 SHA256 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63 WHIRLPOOL 275d7b121a7fcec239e074d2dadc8d1645633d7f8335d760ceba98042b8b3bfe67cdacb9e247a072a8c587f821b23f89c1c7e654fd171ad4372dbb69bcf1021a diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild deleted file mode 100644 index 5665e46..0000000 --- a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk" - -inherit python-single-r1 user systemd toolchain-funcs autotools eutils - -DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" -HOMEPAGE="http://www.fetchmail.info/"; -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" -IUSE="ssl nls kerberos tk socks libressl" -REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:= ) - libressl? ( dev-libs/libressl:= ) - ) - kerberos? ( - virtual/krb5 - !libressl? ( >=dev-libs/openssl-0.9.6:= ) - libressl? ( dev-libs/libressl:= ) - ) - nls? ( virtual/libintl ) - !elibc_glibc? ( sys-libs/e2fsprogs-libs ) - socks? ( net-proxy/dante ) - tk? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex - nls? ( sys-devel/gettext )" - -DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - - use tk && python-single-r1_pkg_setup -} - -src_prepare() { - # don't compile during src_install - use tk && : > "${S}"/py-compile - - epatch "${FILESDIR}"/${P}-python-optional.patch - epatch "${FILESDIR}"/${P}-tests.patch - epatch "${FILESDIR}"/${P}-libressl.patch - eautoreconf -} - -src_configure() { - use tk || export PYTHON=: - - econf \ - --enable-RPA \ - --enable-NTLM \ - --enable-SDPS \ - $(use_enable nls) \ - $(use_with ssl ssl "${EPREFIX}/usr") \ - $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ - $(use_with kerberos gssapi) \ - $(use_with kerberos kerberos5) \ - --without-hesiod \ - $(use_with socks) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -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 - - dohtml *.html - - newinitd "${FILESDIR}"/fetchmail.initd fetchmail - newconfd "${FILESDIR}"/fetchmail.confd fetchmail - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf - - docinto contrib - local f - for f in contrib/* ; do - [ -f "${f}" ] && dodoc "${f}" - done - - use tk && python_optimize -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please see /etc/conf.d/fetchmail if you want to adjust" - elog "the polling delay used by the fetchmail init script." - fi -} diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild deleted file mode 100644 index 8eb7ea6..0000000 --- a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk" - -inherit python-single-r1 user systemd toolchain-funcs autotools eutils - -DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" -HOMEPAGE="http://www.fetchmail.info/"; -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" -IUSE="ssl nls kerberos tk socks libressl" -REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:= ) - libressl? ( dev-libs/libressl:= ) - ) - kerberos? ( - virtual/krb5 - !libressl? ( >=dev-libs/openssl-0.9.6:= ) - libressl? ( dev-libs/libressl:= ) - ) - nls? ( virtual/libintl ) - !elibc_glibc? ( sys-libs/e2fsprogs-libs ) - socks? ( net-proxy/dante ) - tk? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex - nls? ( sys-devel/gettext )" - -DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - - use tk && python-single-r1_pkg_setup -} - -src_prepare() { - # don't compile during src_install - use tk && : > "${S}"/py-compile - - epatch "${FILESDIR}"/${P}-python-optional.patch - epatch "${FILESDIR}"/${P}-tests.patch - epatch "${FILESDIR}"/${P}-libressl.patch - eautoreconf -} - -src_configure() { - use tk || export PYTHON=: - - econf \ - --enable-RPA \ - --enable-NTLM \ - --enable-SDPS \ - $(use_enable nls) \ - $(use_with ssl ssl "${EPREFIX}/usr") \ - $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ - $(use_with kerberos gssapi) \ - $(use_with kerberos kerberos5) \ - --without-hesiod \ - $(use_with socks) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -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 - - dohtml *.html - - newinitd "${FILESDIR}"/fetchmail.initd fetchmail - newconfd "${FILESDIR}"/fetchmail.confd fetchmail - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service" - systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf - - docinto contrib - local f - for f in contrib/* ; do - [ -f "${f}" ] && dodoc "${f}" - done - - use tk && python_optimize -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please see /etc/conf.d/fetchmail if you want to adjust" - elog "the polling delay used by the fetchmail init script." - fi -} 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 dbbed87..0000000 --- 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: [email protected]\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 <[email protected]>\n" - "Language-Team: Deutsch <[email protected]>\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-python-optional.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch deleted file mode 100644 index 2eafe4d..0000000 --- a/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- fetchmail-6.3.26/Makefile.am -+++ fetchmail-6.3.26/Makefile.am -@@ -16,9 +16,11 @@ - pys= fetchmailconf.py - pym= fetchmailconf.man - -+if HAVE_PYTHON - nodist_bin_SCRIPTS= fetchmailconf - python_PYTHON= $(pys) - dist_man1_MANS+= $(pym) -+endif - - CLEANFILES= $(nodist_bin_SCRIPTS) - 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 a0b3e8b..0000000 --- a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fetchmail-6.3.26/Makefile.am -+++ fetchmail-6.3.26/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 diff --git a/net-mail/fetchmail/files/fetchmail.conf b/net-mail/fetchmail/files/fetchmail.conf deleted file mode 100644 index 07945f8..0000000 --- a/net-mail/fetchmail/files/fetchmail.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/fetchmail 700 fetchmail nobody diff --git a/net-mail/fetchmail/files/fetchmail.confd b/net-mail/fetchmail/files/fetchmail.confd deleted file mode 100644 index a5d0b74..0000000 --- a/net-mail/fetchmail/files/fetchmail.confd +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Polling frequency in seconds -# (fetchmail will daemonize and check for new mail at this interval) -polling_period="60" - -# Directory where the pid file is kept -pid_dir="/var/run/fetchmail" diff --git a/net-mail/fetchmail/files/fetchmail.initd b/net-mail/fetchmail/files/fetchmail.initd deleted file mode 100644 index f967e5a..0000000 --- a/net-mail/fetchmail/files/fetchmail.initd +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run - -piddir=${pid_dir:-/var/run/fetchmail} -pid_file=${piddir}/${RC_SVCNAME}.pid -rcfile=/etc/${RC_SVCNAME}rc - -depend() { - need net - use mta -} - -checkconfig() { - if [ ! -f ${rcfile} ]; then - eerror "Configuration file ${rcfile} not found" - return 1 - fi - local fetchmail_instance - fetchmail_instance=${RC_SVCNAME##*.} - if [ -n "${fetchmail_instance}" -a "${RC_SVCNAME}" != "fetchmail" ]; then - fidfile=/var/lib/fetchmail/.fetchids.${RC_SVCNAME} - else - fidfile=/var/lib/fetchmail/.fetchids - fi - if [ ! -d ${piddir} ]; then - checkpath -q -d -o fetchmail:fetchmail -m 0755 ${piddir} || return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting ${RC_SVCNAME}" - start-stop-daemon --start --pidfile ${pid_file} \ - --user fetchmail --exec /usr/bin/fetchmail \ - -- -d ${polling_period} -f ${rcfile} \ - --pidfile ${pid_file} -i ${fidfile} - eend ${?} -} - -stop() { - ebegin "Stopping ${RC_SVCNAME}" - start-stop-daemon --stop --quiet --pidfile ${pid_file} - eend ${?} -} - diff --git a/net-mail/fetchmail/files/fetchmail.service b/net-mail/fetchmail/files/fetchmail.service deleted file mode 100644 index 954f06e..0000000 --- a/net-mail/fetchmail/files/fetchmail.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=A remote-mail retrieval utility -After=network.target - -[Service] -User=fetchmail -ExecStart=/usr/bin/fetchmail -d 60 -f /etc/fetchmailrc -RestartSec=1 - -[Install] -WantedBy=multi-user.target diff --git a/net-mail/fetchmail/files/fetchmail_at.service b/net-mail/fetchmail/files/fetchmail_at.service deleted file mode 100644 index 7e23bf1..0000000 --- a/net-mail/fetchmail/files/fetchmail_at.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=A remote-mail retrieval utility for %i -After=network.target - -[Service] -User=fetchmail -ExecStart=/usr/bin/fetchmail --pidfile %t/fetchmail/fetchmail-%i.pid -i /var/lib/fetchmail/.fetchids.%i -f /etc/fetchmailrc-%i -d 60 -RestartSec=1 - -[Install] -WantedBy=multi-user.target diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml deleted file mode 100644 index 33e5a03..0000000 --- a/net-mail/fetchmail/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Net-Mail</name> - </maintainer> - <use> - <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag> - <flag name="socks">Enable support for socks proxy</flag> - </use> - <upstream> - <remote-id type="sourceforge">fetchmail</remote-id> - </upstream> -</pkgmetadata>
