Re: [PATCH] fetchmail: Update to 6.4.19 and using python3

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5403 bytes --]

Hello,

This looks very good and is all we need.

Perfect. I will merge this tomorrow.

Best,
-Michael

> On 5 May 2021, at 22:43, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Update from 6.3.26 (2013-04-23) to 6.4.19 (2021-04-24)
> - Update rootfile
> - Delete fetchmail-6.3.26-permit-build-without-ssl3.patch as it is not
>   needed with version 6.4.19
> - Added command to use python3 to lfs
> - Changelog is too large to include here
>   Full details can be found in NEWS file in the source tarball
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/packages/fetchmail           |  4 +-
> lfs/fetchmail                                 | 10 +--
> ...ail-6.3.26-permit-build-without-ssl3.patch | 62 -------------------
> 3 files changed, 6 insertions(+), 70 deletions(-)
> delete mode 100644 src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
> 
> diff --git a/config/rootfiles/packages/fetchmail b/config/rootfiles/packages/fetchmail
> index 01141380b..9a6492f0b 100644
> --- a/config/rootfiles/packages/fetchmail
> +++ b/config/rootfiles/packages/fetchmail
> @@ -2,9 +2,7 @@ etc/rc.d/init.d/fetchmail
> root/.fetchmailrc
> usr/bin/fetchmail
> #usr/bin/fetchmailconf
> -#usr/lib/python2.7/site-packages/fetchmailconf.py
> -#usr/lib/python2.7/site-packages/fetchmailconf.pyc
> -#usr/lib/python2.7/site-packages/fetchmailconf.pyo
> +#usr/lib/python3.8/site-packages/fetchmailconf.py
> #usr/share/man/man1/fetchmail.1
> #usr/share/man/man1/fetchmailconf.1
> var/ipfire/backup/addons/includes/fetchmail
> diff --git a/lfs/fetchmail b/lfs/fetchmail
> index 5e8aae416..aed08aae2 100644
> --- a/lfs/fetchmail
> +++ b/lfs/fetchmail
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 6.3.26
> +VER        = 6.4.19
> 
> THISAPP    = fetchmail-$(VER)
> DL_FILE    = $(THISAPP).tar.xz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = fetchmail
> -PAK_VER    = 9
> +PAK_VER    = 10
> 
> DEPS       =
> 
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 61b66faad044afa26e142bb1791aa2b3
> +$(DL_FILE)_MD5 = f9c2fe96065b19f168ad834a7e3e0a25
> 
> install : $(TARGET)
> 
> @@ -77,9 +77,9 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
> 	$(UPDATE_AUTOMAKE)
> -	cd $(DIR_APP) && ./configure \
> +	cd $(DIR_APP) && PYTHON=python3 \
> +		./configure \
> 		--prefix=/usr \
> 		--with-ssl \
> 		--disable-nls
> diff --git a/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch b/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
> deleted file mode 100644
> index 5f8b2772a..000000000
> --- a/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -From a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc Mon Sep 17 00:00:00 2001
> -From: Matthias Andree <matthias.andree(a)gmx.de>
> -Date: Fri, 16 Jan 2015 20:48:46 +0100
> -Subject: [PATCH] Permit build on SSLv3-disabled OpenSSL,
> -
> -providing that these also omit the declaration of SSLv3_client_method().
> -Related to Debian Bug#775255.
> -Version report lists -SSLv3 on +SSL builds that omit SSLv3_client_method().
> -Version report lists -SSLv2 on +SSL builds that omit SSLv2_client_method().
> -
> -diff --git a/configure.ac b/configure.ac
> -index bdcbb20..9248b26 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -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/fetchmail.c b/fetchmail.c
> -index 5f31d6e..be0e9ab 100644
> ---- a/fetchmail.c
> -+++ b/fetchmail.c
> -@@ -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/socket.c b/socket.c
> -index 58a8e15..91a21c2 100644
> ---- a/socket.c
> -+++ b/socket.c
> -@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
> - #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;
> - #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)) {
> -- 
> 2.31.1
>