1 |
commit: 794eb8adb225c819c6021e29b8316745974c2fd4 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 20 20:34:09 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 20 20:34:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794eb8ad |
7 |
|
8 |
net-mail/fetchmail: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
12 |
|
13 |
net-mail/fetchmail/Manifest | 1 - |
14 |
net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild | 109 ------------------- |
15 |
.../files/fetchmail-6.3.26-libressl.patch | 117 --------------------- |
16 |
.../fetchmail/files/fetchmail-6.3.26-tests.patch | 11 -- |
17 |
4 files changed, 238 deletions(-) |
18 |
|
19 |
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest |
20 |
index 5084e92cada..b0c0236ecdf 100644 |
21 |
--- a/net-mail/fetchmail/Manifest |
22 |
+++ b/net-mail/fetchmail/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63 |
25 |
DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0 |
26 |
|
27 |
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild |
28 |
deleted file mode 100644 |
29 |
index 29bd0e833e5..00000000000 |
30 |
--- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,109 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-PYTHON_COMPAT=( python2_7 ) |
38 |
-PYTHON_REQ_USE="tk" |
39 |
- |
40 |
-inherit python-single-r1 user systemd toolchain-funcs autotools |
41 |
- |
42 |
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" |
43 |
-HOMEPAGE="http://www.fetchmail.info/" |
44 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
45 |
- |
46 |
-LICENSE="GPL-2 public-domain" |
47 |
-SLOT="0" |
48 |
-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" |
49 |
-IUSE="ssl nls kerberos tk socks libressl" |
50 |
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" |
51 |
- |
52 |
-RDEPEND="ssl? ( |
53 |
- !libressl? ( >=dev-libs/openssl-0.9.6:= ) |
54 |
- libressl? ( dev-libs/libressl:= ) |
55 |
- ) |
56 |
- kerberos? ( |
57 |
- virtual/krb5 |
58 |
- !libressl? ( >=dev-libs/openssl-0.9.6:= ) |
59 |
- libressl? ( dev-libs/libressl:= ) |
60 |
- ) |
61 |
- nls? ( virtual/libintl ) |
62 |
- !elibc_glibc? ( sys-libs/e2fsprogs-libs ) |
63 |
- socks? ( net-proxy/dante ) |
64 |
- tk? ( ${PYTHON_DEPS} )" |
65 |
-DEPEND="${RDEPEND} |
66 |
- app-arch/xz-utils |
67 |
- sys-devel/flex |
68 |
- nls? ( sys-devel/gettext )" |
69 |
- |
70 |
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" |
71 |
-HTML_DOCS="*.html" |
72 |
-PATCHES=( |
73 |
- "${FILESDIR}"/${P}-python-optional.patch |
74 |
- "${FILESDIR}"/${P}-tests.patch |
75 |
- "${FILESDIR}"/${P}-libressl.patch |
76 |
-) |
77 |
- |
78 |
-pkg_setup() { |
79 |
- enewgroup ${PN} |
80 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
81 |
- |
82 |
- use tk && python-single-r1_pkg_setup |
83 |
-} |
84 |
- |
85 |
-src_prepare() { |
86 |
- default |
87 |
- # don't compile during src_install |
88 |
- use tk && : > "${S}"/py-compile |
89 |
- eautoreconf |
90 |
-} |
91 |
- |
92 |
-src_configure() { |
93 |
- use tk || export PYTHON=: |
94 |
- |
95 |
- econf \ |
96 |
- --enable-RPA \ |
97 |
- --enable-NTLM \ |
98 |
- --enable-SDPS \ |
99 |
- $(use_enable nls) \ |
100 |
- $(use_with ssl ssl "${EPREFIX}/usr") \ |
101 |
- $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ |
102 |
- $(use_with kerberos gssapi) \ |
103 |
- $(use_with kerberos kerberos5) \ |
104 |
- --without-hesiod \ |
105 |
- $(use_with socks) |
106 |
-} |
107 |
- |
108 |
-src_compile() { |
109 |
- emake AR="$(tc-getAR)" |
110 |
-} |
111 |
- |
112 |
-src_install() { |
113 |
- # fetchmail's homedir (holds fetchmail's .fetchids) |
114 |
- keepdir /var/lib/${PN} |
115 |
- fowners ${PN}:${PN} /var/lib/${PN} |
116 |
- fperms 700 /var/lib/${PN} |
117 |
- |
118 |
- default |
119 |
- |
120 |
- newinitd "${FILESDIR}"/fetchmail.initd fetchmail |
121 |
- newconfd "${FILESDIR}"/fetchmail.confd fetchmail |
122 |
- |
123 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
124 |
- systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service" |
125 |
- systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf |
126 |
- |
127 |
- docinto contrib |
128 |
- local f |
129 |
- for f in contrib/* ; do |
130 |
- [ -f "${f}" ] && dodoc "${f}" |
131 |
- done |
132 |
- |
133 |
- use tk && python_optimize |
134 |
-} |
135 |
- |
136 |
-pkg_postinst() { |
137 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
138 |
- elog "Please see /etc/conf.d/fetchmail if you want to adjust" |
139 |
- elog "the polling delay used by the fetchmail init script." |
140 |
- fi |
141 |
-} |
142 |
|
143 |
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch |
144 |
deleted file mode 100644 |
145 |
index dbbed876d60..00000000000 |
146 |
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch |
147 |
+++ /dev/null |
148 |
@@ -1,117 +0,0 @@ |
149 |
---- a/configure.ac 2013-04-23 16:51:10.000000000 -0400 |
150 |
-+++ b/configure.ac 2016-01-30 00:14:01.114090572 -0500 |
151 |
-@@ -803,6 +803,7 @@ |
152 |
- |
153 |
- case "$LIBS" in *-lssl*) |
154 |
- AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>]) |
155 |
-+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) |
156 |
- ;; |
157 |
- esac |
158 |
- |
159 |
---- a/po/de.po 2013-04-23 17:33:52.000000000 -0400 |
160 |
-+++ b/po/de.po 2016-01-30 00:25:00.255287974 -0500 |
161 |
-@@ -8,8 +8,8 @@ |
162 |
- msgstr "" |
163 |
- "Project-Id-Version: fetchmail 6.3.26\n" |
164 |
- "Report-Msgid-Bugs-To: fetchmail-devel@×××××××××××××.de\n" |
165 |
--"POT-Creation-Date: 2013-04-23 23:24+0200\n" |
166 |
--"PO-Revision-Date: 2013-04-23 23:33+0200\n" |
167 |
-+"POT-Creation-Date: 2015-01-16 20:42+0100\n" |
168 |
-+"PO-Revision-Date: 2016-01-30 00:23-0500\n" |
169 |
- "Last-Translator: Matthias Andree <matthias.andree@×××.de>\n" |
170 |
- "Language-Team: Deutsch <de@××.org>\n" |
171 |
- "Language: \n" |
172 |
-@@ -3198,20 +3198,24 @@ |
173 |
- msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL" |
174 |
- |
175 |
- #: socket.c:913 |
176 |
--msgid "Your operating system does not support SSLv2.\n" |
177 |
--msgstr "Ihr Betriebssystem unterstützt SSLv2 nicht.\n" |
178 |
-+msgid "Your OpenSSL version does not support SSLv2.\n" |
179 |
-+msgstr "Ihre OpenSSL-Version unterstützt SSLv2 nicht.\n" |
180 |
- |
181 |
--#: socket.c:923 |
182 |
-+#: socket.c:920 |
183 |
-+msgid "Your OpenSSL version does not support SSLv3.\n" |
184 |
-+msgstr "Ihre OpenSSL-Version unterstützt SSLv3 nicht.\n" |
185 |
-+ |
186 |
-+#: socket.c:928 |
187 |
- #, c-format |
188 |
- msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n" |
189 |
- msgstr "" |
190 |
- "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n" |
191 |
- |
192 |
--#: socket.c:1022 |
193 |
-+#: socket.c:1027 |
194 |
- msgid "Certificate/fingerprint verification was somehow skipped!\n" |
195 |
- msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n" |
196 |
- |
197 |
--#: socket.c:1039 |
198 |
-+#: socket.c:1044 |
199 |
- msgid "" |
200 |
- "Warning: the connection is insecure, continuing anyways. (Better use --" |
201 |
- "sslcertck!)\n" |
202 |
-@@ -3219,11 +3223,11 @@ |
203 |
- "Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie " |
204 |
- "lieber --sslcertck!)\n" |
205 |
- |
206 |
--#: socket.c:1081 |
207 |
-+#: socket.c:1086 |
208 |
- msgid "Cygwin socket read retry\n" |
209 |
- msgstr "Cygwin-Socket-Lese-Wiederholung\n" |
210 |
- |
211 |
--#: socket.c:1084 |
212 |
-+#: socket.c:1089 |
213 |
- msgid "Cygwin socket read retry failed!\n" |
214 |
- msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n" |
215 |
- |
216 |
---- a/fetchmail.c 2013-04-23 16:00:45.000000000 -0400 |
217 |
-+++ b/fetchmail.c 2016-01-30 00:16:26.104294447 -0500 |
218 |
-@@ -54,6 +54,10 @@ |
219 |
- #define ENETUNREACH 128 /* Interactive doesn't know this */ |
220 |
- #endif /* ENETUNREACH */ |
221 |
- |
222 |
-+#ifdef SSL_ENABLE |
223 |
-+#include <openssl/ssl.h> /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ |
224 |
-+#endif |
225 |
-+ |
226 |
- /* prototypes for internal functions */ |
227 |
- static int load_params(int, char **, int); |
228 |
- static void dump_params (struct runctl *runp, struct query *, flag implicit); |
229 |
-@@ -263,6 +267,12 @@ |
230 |
- #ifdef SSL_ENABLE |
231 |
- "+SSL" |
232 |
- #endif |
233 |
-+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 |
234 |
-+ "-SSLv2" |
235 |
-+#endif |
236 |
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 |
237 |
-+ "-SSLv3" |
238 |
-+#endif |
239 |
- #ifdef OPIE_ENABLE |
240 |
- "+OPIE" |
241 |
- #endif /* OPIE_ENABLE */ |
242 |
---- a/socket.c 2013-04-23 16:00:45.000000000 -0400 |
243 |
-+++ b/socket.c 2016-01-30 00:28:26.718678785 -0500 |
244 |
-@@ -907,14 +907,19 @@ |
245 |
- _ssl_context[sock] = NULL; |
246 |
- if(myproto) { |
247 |
- if(!strcasecmp("ssl2",myproto)) { |
248 |
--#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 |
249 |
-+#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL2 + 0) |
250 |
- _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); |
251 |
- #else |
252 |
-- report(stderr, GT_("Your operating system does not support SSLv2.\n")); |
253 |
-+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); |
254 |
- return -1; |
255 |
- #endif |
256 |
- } else if(!strcasecmp("ssl3",myproto)) { |
257 |
-+#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL3 + 0) |
258 |
- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); |
259 |
-+#else |
260 |
-+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); |
261 |
-+ return -1; |
262 |
-+#endif |
263 |
- } else if(!strcasecmp("tls1",myproto)) { |
264 |
- _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); |
265 |
- } else if (!strcasecmp("ssl23",myproto)) { |
266 |
|
267 |
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch |
268 |
deleted file mode 100644 |
269 |
index 691f34814ea..00000000000 |
270 |
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch |
271 |
+++ /dev/null |
272 |
@@ -1,11 +0,0 @@ |
273 |
---- a/Makefile.am |
274 |
-+++ b/Makefile.am |
275 |
-@@ -45,7 +47,7 @@ |
276 |
- check_PROGRAMS= |
277 |
- |
278 |
- TESTS= t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match |
279 |
--TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL) |
280 |
-+TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" |
281 |
- |
282 |
- if NEED_TRIO |
283 |
- noinst_LIBRARIES+= libtrio.a |