diff options
| -rw-r--r-- | package/fetchmail/Makefile | 6 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-config_h_in | 13 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-configure_ac | 10 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-fetchmail_c | 15 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-mxget_c | 127 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-socket_c | 38 |
6 files changed, 22 insertions, 187 deletions
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 16504d91d..b94227c61 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fetchmail -PKG_VERSION:= 6.3.26 +PKG_VERSION:= 6.4.23 PKG_RELEASE:= 1 -PKG_HASH:= 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 +PKG_HASH:= 5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300 PKG_DESCR:= fetch mail from a pop3 or imap server PKG_SECTION:= net/mail PKG_URL:= http://www.fetchmail.info @@ -22,7 +22,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= ac_cv_have_decl_TLS1_3_VERSION=no CONFIGURE_ARGS+= --without-hesiod ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y) diff --git a/package/fetchmail/patches/patch-config_h_in b/package/fetchmail/patches/patch-config_h_in deleted file mode 100644 index ec8b9c74e..000000000 --- a/package/fetchmail/patches/patch-config_h_in +++ /dev/null @@ -1,13 +0,0 @@ ---- fetchmail-6.3.26.orig/config.h.in 2013-04-23 23:36:55.000000000 +0200 -+++ fetchmail-6.3.26/config.h.in 2016-09-29 16:00:20.679625413 +0200 -@@ -53,6 +53,10 @@ - if you don't. */ - #undef HAVE_DECL_SSLV2_CLIENT_METHOD - -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 -+ if you don't. */ -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD -+ - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ - #undef HAVE_DECL_STRERROR diff --git a/package/fetchmail/patches/patch-configure_ac b/package/fetchmail/patches/patch-configure_ac deleted file mode 100644 index 7126bbc5f..000000000 --- a/package/fetchmail/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- fetchmail-6.3.26.orig/configure.ac 2013-04-23 22:51:10.000000000 +0200 -+++ fetchmail-6.3.26/configure.ac 2016-09-29 16:00:20.683625569 +0200 -@@ -803,6 +803,7 @@ fi - - 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 - diff --git a/package/fetchmail/patches/patch-fetchmail_c b/package/fetchmail/patches/patch-fetchmail_c deleted file mode 100644 index 160afa85d..000000000 --- a/package/fetchmail/patches/patch-fetchmail_c +++ /dev/null @@ -1,15 +0,0 @@ ---- fetchmail-6.3.26.orig/fetchmail.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/fetchmail.c 2016-09-29 16:00:20.683625569 +0200 -@@ -263,6 +263,12 @@ int main(int argc, char **argv) - #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 */ diff --git a/package/fetchmail/patches/patch-mxget_c b/package/fetchmail/patches/patch-mxget_c deleted file mode 100644 index 2dd74e8a3..000000000 --- a/package/fetchmail/patches/patch-mxget_c +++ /dev/null @@ -1,127 +0,0 @@ -$Id$ ---- fetchmail-6.3.9.orig/mxget.c 2007-06-10 10:32:47.000000000 +0200 -+++ fetchmail-6.3.9/mxget.c 2009-06-12 22:24:29.000000000 +0200 -@@ -56,6 +56,123 @@ - /* minimum possible size of MX record in packet */ - #define MIN_MX_SIZE 8 /* corresp to "a.com 0" w/ terminating space */ - -+/* from bind9 package: */ -+/* -+Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") -+Copyright (C) 1996-2003 Internet Software Consortium. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -+ -+$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ -+ -+Portions Copyright (C) 1996-2001 Nominum, Inc. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR -+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+*/ -+#define NS_TYPE_ELT 0x40 /*%< EDNS0 extended label -+type -+*/ -+#define NS_CMPRSFLGS 0xc0 /*%< Flag bits indicating name compression. */ -+#define DNS_LABELTYPE_BITSTRING 0x41 -+static int -+labellen(const u_char *lp) -+{ -+ int bitlen; -+ u_char l = *lp; -+ -+ if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) { -+ /* should be avoided by the caller */ -+ return(-1); -+ } -+ -+ if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) { -+ if (l == DNS_LABELTYPE_BITSTRING) { -+ if ((bitlen = *(lp + 1)) == 0) -+ bitlen = 256; -+ return((bitlen + 7 ) / 8 + 1); -+ } -+ return(-1); /*%< unknwon ELT */ -+ } -+ return(l); -+} -+/*% -+ * Advance *ptrptr to skip over the compressed name it points at. -+ * -+ * return: -+ *\li 0 on success, -1 (with errno set) on failure. -+ */ -+int -+ns_name_skip(const u_char **ptrptr, const u_char *eom) -+{ -+ const u_char *cp; -+ u_int n; -+ int l; -+ -+ cp = *ptrptr; -+ while (cp < eom && (n = *cp++) != 0) { -+ /* Check for indirection. */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /*%< normal case, n == len */ -+ cp += n; -+ continue; -+ case NS_TYPE_ELT: /*%< EDNS0 extended label */ -+ if ((l = labellen(cp - 1)) < 0) { -+// errno = EMSGSIZE; /*%< XXX */ -+ return(-1); -+ } -+ cp += l; -+ continue; -+ case NS_CMPRSFLGS: /*%< indirection */ -+ cp++; -+ break; -+ default: /*%< illegal type */ -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) { -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ *ptrptr = cp; -+ return (0); -+} -+ -+/*% -+ * Skip over a compressed domain name. Return the size or -1. -+ */ -+int -+dn_skipname(const u_char *ptr, const u_char *eom) { -+ const u_char *saveptr = ptr; -+ -+ if (ns_name_skip(&ptr, eom) == -1) -+ return (-1); -+ return (ptr - saveptr); -+} -+/* End from Bind9 package */ -+ -+ - struct mxentry *getmxrecords(const char *name) - /* get MX records for given host */ - { diff --git a/package/fetchmail/patches/patch-socket_c b/package/fetchmail/patches/patch-socket_c index 54f6ff27a..a4e3f2dbf 100644 --- a/package/fetchmail/patches/patch-socket_c +++ b/package/fetchmail/patches/patch-socket_c @@ -1,20 +1,20 @@ ---- fetchmail-6.3.26.orig/socket.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/socket.c 2016-09-29 16:00:20.683625569 +0200 -@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 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; +--- fetchmail-6.4.23.orig/socket.c 2021-08-28 11:13:58.000000000 +0200 ++++ fetchmail-6.4.23/socket.c 2021-11-12 23:58:36.082986247 +0100 +@@ -966,17 +966,9 @@ static int OSSL10X_proto_version_logic(i + report(stderr, GT_("Your OpenSSL version does not support TLS v1.2.\n")); + return -1; #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 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)) { +-#if defined(TLS1_3_VERSION) +- } else if (!strcasecmp("tls1.3", *myproto)) { +- _ctx[sock] = SSL_CTX_new(TLSv1_3_client_method()); +- } else if (!strcasecmp("tls1.3+", *myproto)) { +- *myproto = NULL; +- *avoid_ssl_versions |= SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; +-#else + } else if(!strcasecmp("tls1.3",*myproto) || !strcasecmp("tls1.3+", *myproto)) { + report(stderr, GT_("Your OpenSSL version does not support TLS v1.3.\n")); + return -1; +-#endif + } else if (!strcasecmp("ssl23", *myproto) + || 0 == strcasecmp("auto", *myproto)) + { |