Skip to content

Commit 2097314

Browse files
bkuhlsyann-morin-1998
authored andcommitted
package/exim: update patches to be applied with fuzz 0
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, exim fails to build with output: Applying 0004-exim_lock-fix-lstat-related-build-errors.patch using patch: patching file src/exim_lock.c Hunk #1 FAILED at 13. Hunk #2 succeeded at 27 (offset 1 line). 1 out of 2 hunks FAILED -- saving rejects to file src/exim_lock.c.rej This commit rebases the package patches on the current package version when needed. Fixes: http://autobuild.buildroot.net/results/ff27d5ebd7f24ac8cb236b83c67c2c75255e51c6/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Yann E. MORIN <yann.morin@orange.com> Tested-by: Yann E. MORIN <yann.morin@orange.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
1 parent 15e5c51 commit 2097314

5 files changed

Lines changed: 18 additions & 10 deletions

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ buildconfig is meant to be executed on the host, so it has to be compiled
22
using $(HOSTCC), not $(CC).
33

44
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
5+
[Bernd: rebased for version 4.97.1]
6+
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
57
---
68
OS/Makefile-Base | 4 ++--
79
1 files changed, 2 insertions(+), 2 deletions(-)
@@ -10,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base
1012
index 29a6ad3..420ba60 100644
1113
--- a/OS/Makefile-Base
1214
+++ b/OS/Makefile-Base
13-
@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
15+
@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
1416

1517
# Targets for special-purpose configuration header builders
1618
buildconfig: buildconfig.c

package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ This leads to useless duplicated files on the target, so disable this
55
piece of code.
66

77
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
8+
[Bernd: rebased for version 4.97.1]
9+
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
810
---
911
scripts/exim_install | 18 +++++++++---------
1012
1 files changed, 9 insertions(+), 9 deletions(-)
@@ -13,7 +15,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
1315
index 616ab3c..e68e7d5 100755
1416
--- a/scripts/exim_install
1517
+++ b/scripts/exim_install
16-
@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do
18+
@@ -348,15 +348,15 @@ while [ $# -gt 0 ]; do
1719

1820
else
1921
if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then

package/exim/0003-Skip-version-check-and-symlink-installation.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Inspired by:
99
http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch
1010

1111
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
12-
(rebased against exim 4.89)
13-
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
12+
[Bernd: rebased for version 4.89 & 4.97.1]
13+
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
1414
---
1515
scripts/exim_install | 7 +++++--
1616
1 files changed, 5 insertions(+), 2 deletions(-)
@@ -19,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
1919
index e68e7d5..487a4e1 100755
2020
--- a/scripts/exim_install
2121
+++ b/scripts/exim_install
22-
@@ -58,6 +58,8 @@
22+
@@ -61,6 +61,8 @@
2323
shift
2424
done
2525

@@ -28,7 +28,7 @@ index e68e7d5..487a4e1 100755
2828
# Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK,
2929
# SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build
3030
# directory). EXE is empty except in the Cygwin environment. In each case, keep
31-
@@ -217,9 +219,7 @@
31+
@@ -220,9 +223,7 @@
3232
# The exim binary is handled specially
3333

3434
if [ $name = exim${EXE} ]; then

package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Fixes:
2222

2323
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
2424
Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
25+
[Bernd: rebased for version 4.97.1]
26+
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
2527
---
2628
src/exim_lock.c | 3 +++
2729
1 file changed, 3 insertions(+)
@@ -30,16 +32,16 @@ diff --git a/src/exim_lock.c b/src/exim_lock.c
3032
index 068216816054..cb140aff6436 100644
3133
--- a/src/exim_lock.c
3234
+++ b/src/exim_lock.c
33-
@@ -13,6 +13,8 @@ Argument: the name of the lock file
34-
Copyright (c) The Exim Maintainers 2016
35+
@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021
36+
SPDX-License-Identifier: GPL-2.0-or-later
3537
*/
3638

3739
+#define _XOPEN_SOURCE
3840
+
3941
#include "os.h"
4042

4143
#include <stdio.h>
42-
@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016
44+
@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016
4345
#include <unistd.h>
4446
#include <utime.h>
4547
#include <sys/utsname.h>

package/exim/0005-sieve-fix-build-errors.patch

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ buildsystem.
2121

2222
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
2323
Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
24+
[Bernd: rebased for version 4.97.1]
25+
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
2426
---
2527
src/sieve.c | 2 ++
2628
1 file changed, 2 insertions(+)
@@ -29,7 +31,7 @@ diff --git a/src/sieve.c b/src/sieve.c
2931
index 5e8d1e6f4776..9632f2d43810 100644
3032
--- a/src/sieve.c
3133
+++ b/src/sieve.c
32-
@@ -12,6 +12,8 @@
34+
@@ -14,6 +14,8 @@
3335

3436
/* Sieve mail filter. */
3537

0 commit comments

Comments
 (0)