Control: tags -1 patch
Attached seems to work for me.
>From 1d55037aa0644b42c25f40caea708c90280ee140 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 3 Nov 2019 06:45:49 +0100
Subject: [PATCH 1/2] Build with -DLOCAL_SCAN.
---
debian/changelog | 7 +++++++
debian/rules | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index adb1c56..b6037ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sa-exim (4.2.1-17.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with -DLOCAL_SCAN.
+
+ -- Andreas Metzler <ametz...@debian.org> Sat, 02 Nov 2019 19:25:05 +0100
+
sa-exim (4.2.1-17) unstable; urgency=medium
* remove-header-crs.patch (new): Strip out carriage returns from header
diff --git a/debian/rules b/debian/rules
index 9e16922..3df6a2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ build-indep:
build-arch: build-stamp
build-stamp:
dh_testdir
- $(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CPPFLAGS) $$(CFLAGS)' \
+ $(MAKE) BUILDCFLAGS='-DLOCAL_SCAN -I/usr/include/exim4 -fPIC $$(CPPFLAGS) $$(CFLAGS)' \
CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='-shared $(LDFLAGS)' SUFF=''
touch build-stamp
--
2.24.0.rc1
>From 3b17ee74af581132466e52234f950f0196ad3458 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 3 Nov 2019 14:28:53 +0100
Subject: [PATCH 2/2] Fix string_sprintf() invcation
With exim 4.93 string_sprintf requires at least two arguments
(string_sprintf("foo") needs to be converted to string_sprintf("%s",
foo)). Closes: #943571
---
debian/changelog | 3 +++
.../patches/10_sprintf_no_format_string.diff | 19 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 23 insertions(+)
create mode 100644 debian/patches/10_sprintf_no_format_string.diff
diff --git a/debian/changelog b/debian/changelog
index b6037ea..2101b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ sa-exim (4.2.1-17.1) UNRELEASED; urgency=medium
* Non-maintainer upload.
* Build with -DLOCAL_SCAN.
+ * 10_sprintf_no_format_string.diff: With exim 4.93 string_sprintf requires
+ at least two arguments (string_sprintf("foo") needs to be converted to
+ string_sprintf("%s", foo)). Closes: #943571
-- Andreas Metzler <ametz...@debian.org> Sat, 02 Nov 2019 19:25:05 +0100
diff --git a/debian/patches/10_sprintf_no_format_string.diff b/debian/patches/10_sprintf_no_format_string.diff
new file mode 100644
index 0000000..be506d9
--- /dev/null
+++ b/debian/patches/10_sprintf_no_format_string.diff
@@ -0,0 +1,19 @@
+Description: Do not invoke printf-like function without parameter.
+ required for compat with exim 4.93
+Author: Andreas Metzler <ametz...@debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/943571
+Forwarded: no
+Last-Update: 2019-11-03
+
+--- sa-exim-4.2.1.orig/sa-exim.c
++++ sa-exim-4.2.1/sa-exim.c
+@@ -1261,7 +1261,7 @@ restart:
+ }
+
+ stret=write(fd, buffer, strlen(buffer));
+- CHECKERR(stret,string_sprintf("SA body write to msg"),__LINE__);
++ CHECKERR(stret,string_sprintf("%s", "SA body write to msg"),__LINE__);
+ if (SAEximDebug > 8)
+ {
+ log_write(0, LOG_MAIN, "SA: Debug9: Wrote to msg; line %d (wrote %d)", line, ret);
diff --git a/debian/patches/series b/debian/patches/series
index ddde747..4bf8dd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ greylisting-ipv6.patch
greylist-lint.patch
delete-ext-html-references.patch
remove-header-crs.patch
+10_sprintf_no_format_string.diff
--
2.24.0.rc1
