package/fetchmail: bump version to 6.4.34

Switched _SITE to https.

Removed patch which was applied upstream:
28c476ec45

Release notes:
https://sourceforge.net/p/fetchmail/mailman/message/37721221/
https://sourceforge.net/p/fetchmail/mailman/message/37699234/
https://sourceforge.net/p/fetchmail/mailman/message/37687601/
https://sourceforge.net/p/fetchmail/mailman/message/37681775/
https://sourceforge.net/p/fetchmail/mailman/message/37645690/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2022-10-29 10:08:21 +02:00 committed by Peter Korsgaard
parent 18b5d6205d
commit 3383613ad3
3 changed files with 4 additions and 62 deletions

View File

@ -1,56 +0,0 @@
From 262aa59c1a7a7100e1dd4e73a6d0112d9becc701 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 1 Apr 2022 19:23:06 +0200
Subject: [PATCH] configure.ac: fix cross-compilation with openssl
Don't call AC_LIB_LINKFLAGS when the libraries are retrieved through
pkg-config to avoid the following build failure when cross-compiling
raised since commit 77503f545d2806d07ab83c59ed9a96f435d281da:
/home/autobuild/autobuild/instance-5/output-1/host/bin/arc-buildroot-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -I/home/autobuild/autobuild/instance-5/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/include -I/usr/kerberos/include -L/home/autobuild/autobuild/instance-5/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/lib -L/home/autobuild/autobuild/instance-5/output-1/host/bin/../arc-buildroot-linux-gnu/sysroot/usr/lib -o fetchmail socket.o getpass.o fetchmail.o env.o idle.o options.o daemon.o driver.o transact.o sink.o smtp.o idlist.o uid.o mxget.o md5ify.o cram.o gssapi.o opie.o interface.o netrc.o unmime.o conf.o checkalias.o uid_db.o lock.o rcfile_l.o rcfile_y.o ucs/norm_charmap.o fm_realpath.o pop3.o imap.o etrn.o odmr.o libfm.a strlcpy.o strlcat.o /usr/lib/libssl.so /usr/lib/libcrypto.so
/usr/lib/libssl.so: file not recognized: file format not recognized
This build failure is raised because AC_LIB_LINKFLAGS will override the
pkg-config target libraries by the host openssl libraries:
configure: Enabling OpenSSL support in /home/autobuild/autobuild/instance-5/output-1/host/arc-buildroot-linux-gnu/sysroot/usr.
configure: SSL-check: trying pkg-config for openssl
checking for SSL... yes
checking how to link with libssl... /usr/lib/libssl.so /usr/lib/libcrypto.so
configure: From pkg-config: Adding /usr/lib/libssl.so /usr/lib/libcrypto.so to LIBS. LDFLAGS= -L/home/autobuild/autobuild/instance-5/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/lib -L/home/autobuild/autobuild/instance-5/output-1/host/bin/../arc-buildroot-linux-gnu/sysroot/usr/lib
Fixes:
- http://autobuild.buildroot.org/results/815f18f25017be178d478458c48712d9a8570d5a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.com/fetchmail/fetchmail/-/merge_requests/42]
---
configure.ac | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index bd042d51..80e5bf91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -838,15 +838,13 @@ else
PKG_CHECK_MODULES([SSL],[$i],[
set -- $SSL_LIBS
while test $# -ge 1 ; do
- case $1 in -l*|lib*) : ;;
+ case $1 in -l*|lib*) LIBS="$LIBS $1" ;;
*) LDFLAGS="$LDFLAGS $1" ;;
esac
shift
done
CPPFLAGS="$SSL_CFLAGS $CPPFLAGS"
- AC_LIB_LINKFLAGS([ssl], [crypto])
- AS_MESSAGE([From pkg-config: Adding $LIBSSL to LIBS. LDFLAGS=$LDFLAGS])
- LIBS="$LIBS $LIBSSL"
+ AS_MESSAGE([From pkg-config: $SSL_LIBS])
found=1
break],[: ignore-error])
done
--
2.35.1

View File

@ -1,4 +1,4 @@
# From https://sourceforge.net/p/fetchmail/mailman/message/37628013/
sha256 397df984082abae51edec6831700d68636f0e117cfaffcbdd3eed66d04b97321 fetchmail-6.4.29.tar.xz
# From https://sourceforge.net/p/fetchmail/mailman/message/37721221/
sha256 c3bdded1b5ce236960bd1ceeee3f3257220ed99c3eec84a5d76bb5618e3258d4 fetchmail-6.4.34.tar.xz
# Locally computed:
sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING

View File

@ -5,15 +5,13 @@
################################################################################
FETCHMAIL_VERSION_MAJOR = 6.4
FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).29
FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).34
FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz
FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING
FETCHMAIL_LICENSE_FILES = COPYING
FETCHMAIL_CPE_ID_VENDOR = fetchmail
FETCHMAIL_SELINUX_MODULES = fetchmail mta
# We're patching configure.ac
FETCHMAIL_AUTORECONF = YES
FETCHMAIL_CONF_OPTS = \
--with-ssl=$(STAGING_DIR)/usr