mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-26 03:50:44 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/exim: bump version to 4.100

Browse Source 
https://lists.exim.org/lurker/message/20260820.154633.91995f73.en.html

Rebased patch 0001.

Updated patch 0005, the previous version was applied upstream with
commit 497e9eb7e77ad27ae1d45281e23eefadfaa7a3bc but it did not fix all
linker errors so we sent a new patch upstream which replaces the
previous patch.

Updated hash of GPL-2.0 license file (address, name of president and
typos), a commit can not be provided from the source tree.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 8b009489f5)
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
This commit is contained in:
Bernd Kuhls
2026-09-06 12:53:09 +02:00
committed by Raphaël Mélotte
parent 707a7026fc
commit e673c80cb7
4 changed files with 30 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/exim/0001-Build-buildconfig-for-the-host.patch
View File

@@ -2,7 +2,7 @@ buildconfig is meant to be executed on the host, so it has to be compiled
using $(HOSTCC), not $(CC).
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
[Bernd: rebased for version 4.99]
[Bernd: rebased for version 4.100]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
OS/Makefile-Base | 4 ++--
@@ -22,4 +22,5 @@ index 29a6ad3..420ba60 100644
+ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c
util_deps: config ../src/utils/msgid.frag
UTIL_DEPS = $(CONFIG_DEPS) ../src/utils/msgid.frag

104
package/exim/0005-Fix-cross-compile-by-adding-LD-variable.patch
View File

@@ -1,95 +1,37 @@
From a47de397eb1f28356086f315a443c288599d8657 Mon Sep 17 00:00:00 2001
From cb7d04db69623673e606a3249bc7de1330c8f0b6 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sat, 1 Nov 2025 17:00:52 +0100
Date: Fri, 4 Sep 2026 18:43:42 +0200
Subject: [PATCH] Fix cross-compile by adding LD variable
Fixes cross-build error due to commit
a449ff8ca50e6df5faee2f1e83e1198c27738dfc.
Upstream: https://code.exim.org/exim/exim/pulls/3244
Hard-coding "ld" when cross-compiling is a bad idea.
Upstream: https://github.com/Exim/exim/pull/98
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
src/OS/Makefile-Base | 10 +++++-----
src/OS/Makefile-Default | 1 +
src/src/miscmods/Makefile | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
src/miscmods/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/OS/Makefile-Base b/OS/Makefile-Base
index 5a15b0a6b..0250647f0 100644
--- a/OS/Makefile-Base
+++ b/OS/Makefile-Base
@@ -1065,7 +1065,7 @@ dynmodules: buildlookups buildrouters buildtransports buildauths \
buildlookups: config
@cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" HDRS="../version.h $(PHDRS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"
@echo " "
@@ -1074,7 +1074,7 @@ buildlookups: config
buildrouters: config
@cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
@echo " "
@@ -1083,7 +1083,7 @@ buildrouters: config
buildtransports: config
@cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
@echo " "
@@ -1092,7 +1092,7 @@ buildtransports: config
buildauths: config
@cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
@echo " "
@@ -1101,7 +1101,7 @@ buildmisc: config
CC="$(CC)" CFLAGS="$(CFLAGS)" \
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
LDFLAGS_PARTIAL="$(LDFLAGS_PARTIAL)" HDRS="../version.h $(PHDRS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
+ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \
PERL_CC="$(PERL_CC)" PERL_CCOPTS="$(PERL_CCOPTS)" \
PERL_CFLAGS="$(PERL_CFLAGS)" PERL_LFLAGS="$(PERL_LFLAGS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE)" TLS_INCLUDE="$(TLS_INCLUDE)"
diff --git a/OS/Makefile-Default b/OS/Makefile-Default
index 858361bf3..c469c7f01 100644
--- a/OS/Makefile-Default
+++ b/OS/Makefile-Default
@@ -227,6 +227,7 @@ HOSTNAME_COMMAND=/bin/hostname
RANLIB=ranlib
+LD=ld
# EXIM_CHMOD is available to specify a command that is automatically applied
# to the Exim binary immediately it is compiled. (I find this useful when
diff --git a/src/miscmods/Makefile b/src/miscmods/Makefile
index 1e46d4456..cfae5aac2 100644
index 807d6f377..5bac23a7f 100644
--- a/src/miscmods/Makefile
+++ b/src/miscmods/Makefile
@@ -62,7 +62,7 @@ dkim.o:
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c
$(FE)mv dkim.o dkim_tmp.o
- $(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \
+ $(FE)$(LD) -r -o dkim.o $(LDFLAGS_PARTIAL) \
dkim_tmp.o dkim_transport.o pdkim.o signing.o
@@ -96,7 +96,7 @@ dmarc.o dmarc_native.o:
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $*.c
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) dmarc_common.c
$(FE)mv $@ dmarc_tmp.o
- $(FE)ld -r -o $@ $(LDFLAGS_PARTIAL) dmarc_tmp.o dmarc_common.o
+ $(FE)$(LD) -r -o $@ $(LDFLAGS_PARTIAL) dmarc_tmp.o dmarc_common.o
# Similarly, we want a single .so for the dynamic-load module
# dmarc_native is special in the same way as spf_perl
dmarc.so dmarc_native.so:
@@ -112,7 +112,7 @@ sieve_filter.o:
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) sieve_filter_body.c
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) sieve_filter_input.c
$(FE)mv sieve_filter.o sieve_filter_tmp.o
- $(FE)ld -r -o sieve_filter.o $(LDFLAGS_PARTIAL) \
+ $(FE)$(LD) -r -o sieve_filter.o $(LDFLAGS_PARTIAL) \
sieve_filter_tmp.o sieve_filter_body.o sieve_filter_input.o
sieve_filter.so:
--
2.47.3

6
package/exim/exim.hash
View File

@@ -1,6 +1,6 @@
# From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt
sha256 c2d2f80adc7c71d424fd82a46655eaa2d7d9b4ca2e77883eba9076947b7ee627 exim-4.99.5.tar.xz
sha256 5bd0a3e353dbfcd5c8174388b824316a61ee2455d9052ea2f0877dee939d33b3 exim-4.100.tar.xz
# From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt
sha512 28fd15d0d4e0114129fd42140fb5d5920fcd5cbfb6ac816197e3567c3d2ece6ec73367b43bd8d47d2b543adb89ad28a5e4c58a23210887f867a5c41c24e181b5 exim-4.99.5.tar.xz
sha512 e7f2cc1ba9af4b1113d9a40b384bf2e5439f539381126018fb9a15d3afaf687fd209d06d1cfa96e61426df0d9f4e7988e49e1192510abc02b2aa19b14b051abc exim-4.100.tar.xz
# Locally calculated
sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE
sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 LICENCE

2
package/exim/exim.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
EXIM_VERSION = 4.99.5
EXIM_VERSION = 4.100
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
EXIM_SITE = https://ftp.exim.org/pub/exim/exim4
EXIM_LICENSE = GPL-2.0+