diff options
| -rw-r--r-- | groups.d/241.native_packages_inet.d/fetchmail.package | 10 | ||||
| -rw-r--r-- | patches/fetchmail-6.4.0.beta4.local.patch | 14 | ||||
| -rw-r--r-- | patches/fetchmail-6.4.39_pre.local.patch | 30 |
3 files changed, 35 insertions, 19 deletions
diff --git a/groups.d/241.native_packages_inet.d/fetchmail.package b/groups.d/241.native_packages_inet.d/fetchmail.package index 7c8c0335..6ff584b6 100644 --- a/groups.d/241.native_packages_inet.d/fetchmail.package +++ b/groups.d/241.native_packages_inet.d/fetchmail.package @@ -1,8 +1,8 @@ -: ${PKG_FETCHMAIL_DEPENDS:="libressl"}; -: ${PKG_FETCHMAIL_SHA256SUM:=c7500bed3b0bb85722f7cf2d980e74a879ac57b13cfd225d278179d671c0f5e8}; -: ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4}; -: ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; -: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"}; +: ${PKG_FETCHMAIL_DEPENDS:="wolfssl"}; +: ${PKG_FETCHMAIL_SHA256SUM:=75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186}; +: ${PKG_FETCHMAIL_VERSION:=6.4.39}; +: ${PKG_FETCHMAIL_URL:=https://fossies.org/linux/misc/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; +: ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="PYTHON=${PREFIX}/bin/python3 WOLFSSL_TRUST_FILE=/etc/ssl/cert.pem --with-kerberos5=no --with-kerberos=no --with-wolfssl=${PREFIX_NATIVE}"}; ex_pkg_register "fetchmail" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/fetchmail-6.4.0.beta4.local.patch b/patches/fetchmail-6.4.0.beta4.local.patch deleted file mode 100644 index 130ab575..00000000 --- a/patches/fetchmail-6.4.0.beta4.local.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru fetchmail-6.4.0.beta4.orig/socket.c fetchmail-6.4.0.beta4/socket.c ---- fetchmail-6.4.0.beta4.orig/socket.c 2018-06-06 01:57:00.000000000 +0200 -+++ fetchmail-6.4.0.beta4/socket.c 2021-09-22 09:50:13.654463039 +0200 -@@ -885,8 +885,8 @@ - return ret; - } - --#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL --/* OSSL_proto_version_logic for OpenSSL 1.0.x and LibreSSL */ -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL -+/* OSSL_proto_version_logic for OpenSSL 1.0.x */ - static int OSSL10X_proto_version_logic(int sock, const char **myproto, int *avoid_ssl_versions) - { - if (!*myproto) { diff --git a/patches/fetchmail-6.4.39_pre.local.patch b/patches/fetchmail-6.4.39_pre.local.patch new file mode 100644 index 00000000..bc2f8c74 --- /dev/null +++ b/patches/fetchmail-6.4.39_pre.local.patch @@ -0,0 +1,30 @@ +diff -ru fetchmail-6.4.39.orig/configure fetchmail-6.4.39/configure +--- fetchmail-6.4.39.orig/configure 2024-07-20 11:34:52.000000000 +0200 ++++ fetchmail-6.4.39/configure 2024-08-09 11:53:47.808214122 +0200 +@@ -13349,8 +13349,8 @@ + with_wolfssl="$(${_WOLFSSLCONF} --prefix)" + fi + if "$_WOLFSSLCONF" >/dev/null 2>&1 --version ; then +- wolfCFLAGS="$(${_WOLFSSLCONF} --cflags)" +- wolfLIBS="$(${_WOLFSSLCONF} --libs)" ++ wolfCFLAGS="$($PKG_CONFIG --cflags wolfssl)" ++ wolfLIBS="$($PKG_CONFIG --libs wolfssl)" + elif test -d "${with_wolfssl}/include" -a -d "${with_wolfssl}/lib" ; then + wolfCFLAGS="-I${with_wolfssl}/include" + wolfLIBS="-L${with_wolfssl}/lib -lwolfssl -lpthread" +diff -ru fetchmail-6.4.39.orig/fetchmail.c fetchmail-6.4.39/fetchmail.c +--- fetchmail-6.4.39.orig/fetchmail.c 2024-01-31 20:54:42.000000000 +0100 ++++ fetchmail-6.4.39/fetchmail.c 2024-08-09 11:34:11.836359108 +0200 +@@ -314,9 +314,11 @@ + "Run-time uses SSL library %#lx \"%s\"\n"), + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + OpenSSL_version_num(), OpenSSL_version(OPENSSL_VERSION)); ++#ifndef USING_WOLFSSL + printf(GT_("OpenSSL: %s\nEngines: %s\n"), + OpenSSL_version(OPENSSL_DIR), + OpenSSL_version(OPENSSL_ENGINES_DIR)); ++#endif + # if !HAVE_DECL_TLS1_3_VERSION || defined(OPENSSL_NO_TLS1_3) + printf(GT_("WARNING: Your SSL/TLS library does not support TLS v1.3.\n")); + # endif +Only in fetchmail-6.4.39: fetchmail.c.orig |