diff options
Diffstat (limited to 'package/fetchmail')
| -rw-r--r-- | package/fetchmail/Makefile | 19 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-configure | 12 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-mxget_c | 127 | ||||
| -rw-r--r-- | package/fetchmail/patches/patch-socket_c | 20 |
4 files changed, 31 insertions, 147 deletions
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 6388a3d43..b94227c61 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -4,28 +4,31 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fetchmail -PKG_VERSION:= 6.3.26 +PKG_VERSION:= 6.4.23 PKG_RELEASE:= 1 -PKG_MD5SUM:= 61b66faad044afa26e142bb1791aa2b3 +PKG_HASH:= 5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300 PKG_DESCR:= fetch mail from a pop3 or imap server PKG_SECTION:= net/mail PKG_URL:= http://www.fetchmail.info PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fetchmail/} -PKG_FLAVOURS_FETCHMAIL:=WITH_SSL -PKGFD_WITH_SSL:= enable SSL support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl +PKG_CHOICES_FETCHMAIL:= WITH_LIBRESSL WITHOUT_SSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCD_WITHOUT_SSL:= use no ssl include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= ac_cv_have_decl_TLS1_3_VERSION=no CONFIGURE_ARGS+= --without-hesiod -ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_SSL},y) +ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl='${STAGING_TARGET_DIR}/usr' -else +endif +ifeq (${ADK_PACKAGE_FETCHMAIL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl endif diff --git a/package/fetchmail/patches/patch-configure b/package/fetchmail/patches/patch-configure deleted file mode 100644 index e5dc5ce44..000000000 --- a/package/fetchmail/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- fetchmail-6.3.9.orig/configure 2008-11-16 15:18:49.000000000 +0100 -+++ fetchmail-6.3.9/configure 2009-06-12 22:27:25.000000000 +0200 -@@ -13176,9 +13176,6 @@ then - { echo "$as_me:$LINENO: Enabling OpenSSL support in $with_ssl." >&5 - echo "$as_me: Enabling OpenSSL support in $with_ssl." >&6;} - test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include" -- ### In Red Hat 9, this file includes a reference to <krb5.h>, so we -- ### force the Kerberos direcory onto the include path so it will build. -- CFLAGS="$CFLAGS -I/usr/kerberos/include" - ### OpenBSD comes with ssl headers - else - { { echo "$as_me:$LINENO: error: SSL support enabled, but OpenSSL not found" >&5 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 new file mode 100644 index 000000000..a4e3f2dbf --- /dev/null +++ b/package/fetchmail/patches/patch-socket_c @@ -0,0 +1,20 @@ +--- 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 +-#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)) + { |