From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] fetchmail: Update to 6.4.19 and using python3 Date: Wed, 05 May 2021 23:31:16 +0100 Message-ID: In-Reply-To: <20210505214306.3493034-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5065545017780463974==" List-Id: --===============5065545017780463974== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 wrote: >=20 > - 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 >=20 > Signed-off-by: Adolf Belka > --- > 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.p= atch >=20 > diff --git a/config/rootfiles/packages/fetchmail b/config/rootfiles/package= s/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 @@ >=20 > include Config >=20 > -VER =3D 6.3.26 > +VER =3D 6.4.19 >=20 > THISAPP =3D fetchmail-$(VER) > DL_FILE =3D $(THISAPP).tar.xz > @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > TARGET =3D $(DIR_INFO)/$(THISAPP) > PROG =3D fetchmail > -PAK_VER =3D 9 > +PAK_VER =3D 10 >=20 > DEPS =3D >=20 > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) >=20 > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >=20 > -$(DL_FILE)_MD5 =3D 61b66faad044afa26e142bb1791aa2b3 > +$(DL_FILE)_MD5 =3D f9c2fe96065b19f168ad834a7e3e0a25 >=20 > install : $(TARGET) >=20 > @@ -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-per= mit-build-without-ssl3.patch > $(UPDATE_AUTOMAKE) > - cd $(DIR_APP) && ./configure \ > + cd $(DIR_APP) && PYTHON=3Dpython3 \ > + ./configure \ > --prefix=3D/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 > -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 > -=20 > - case "$LIBS" in *-lssl*) > - AC_CHECK_DECLS([SSLv2_client_method],,,[#include ]) > -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include ]) > - ;; > - esac > -=20 > -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 =3D=3D 0 > -+ "-SSLv2" > -+#endif > -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 =3D=3D 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, con= st char *myproto, int certck > - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 > - _ctx[sock] =3D 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] =3D 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] =3D SSL_CTX_new(TLSv1_client_method()); > - } else if (!strcasecmp("ssl23",myproto)) { > --=20 > 2.31.1 >=20 --===============5065545017780463974==--