* Re: [Buildroot] [PATCH 1/1] package/exim: update patches to be applied with fuzz 0
2024-06-27 21:25 [Buildroot] [PATCH 1/1] package/exim: update patches to be applied with fuzz 0 Bernd Kuhls
2024-06-28 6:36 ` Luca Ceresoli via buildroot
@ 2024-06-28 6:44 ` yann.morin
2024-06-28 20:25 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: yann.morin @ 2024-06-28 6:44 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Luca Ceresoli, buildroot
Bernd, All,
On 2024-06-27 23:25 +0200, Bernd Kuhls spake thusly:
> Commit 8f88a644ed "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: Yann E. MORIN <yann.morin@orange.com>
Tested-by: Yann E. MORIN <yann.morin@orange.com>
Regards,
Yann E. MORIN.
> ---
> package/exim/0001-Build-buildconfig-for-the-host.patch | 4 +++-
> ...0002-Don-t-make-backup-copies-of-installed-files.patch | 4 +++-
> ...0003-Skip-version-check-and-symlink-installation.patch | 8 ++++----
> .../0004-exim_lock-fix-lstat-related-build-errors.patch | 8 +++++---
> package/exim/0005-sieve-fix-build-errors.patch | 4 +++-
> 5 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch
> index 87eb527974..e9da80765a 100644
> --- a/package/exim/0001-Build-buildconfig-for-the-host.patch
> +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch
> @@ -2,6 +2,8 @@ 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.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> OS/Makefile-Base | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> @@ -10,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base
> index 29a6ad3..420ba60 100644
> --- a/OS/Makefile-Base
> +++ b/OS/Makefile-Base
> -@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
> +@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
>
> # Targets for special-purpose configuration header builders
> buildconfig: buildconfig.c
> diff --git a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> index 0cdaa744bc..3c115f8d02 100644
> --- a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> +++ b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> @@ -5,6 +5,8 @@ This leads to useless duplicated files on the target, so disable this
> piece of code.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> scripts/exim_install | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
> @@ -13,7 +15,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
> index 616ab3c..e68e7d5 100755
> --- a/scripts/exim_install
> +++ b/scripts/exim_install
> -@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do
> +@@ -348,15 +348,15 @@ while [ $# -gt 0 ]; do
>
> else
> if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then
> diff --git a/package/exim/0003-Skip-version-check-and-symlink-installation.patch b/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> index a342d6ed34..55166f108b 100644
> --- a/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> +++ b/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> @@ -9,8 +9,8 @@ Inspired by:
> http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -(rebased against exim 4.89)
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +[Bernd: rebased for version 4.89 & 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> scripts/exim_install | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
> @@ -19,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
> index e68e7d5..487a4e1 100755
> --- a/scripts/exim_install
> +++ b/scripts/exim_install
> -@@ -58,6 +58,8 @@
> +@@ -61,6 +61,8 @@
> shift
> done
>
> @@ -28,7 +28,7 @@ index e68e7d5..487a4e1 100755
> # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK,
> # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build
> # directory). EXE is empty except in the Cygwin environment. In each case, keep
> -@@ -217,9 +219,7 @@
> +@@ -220,9 +223,7 @@
> # The exim binary is handled specially
>
> if [ $name = exim${EXE} ]; then
> diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> index a0a279fc43..616ada5026 100644
> --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> +++ b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> @@ -22,6 +22,8 @@ Fixes:
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> src/exim_lock.c | 3 +++
> 1 file changed, 3 insertions(+)
> @@ -30,8 +32,8 @@ diff --git a/src/exim_lock.c b/src/exim_lock.c
> index 068216816054..cb140aff6436 100644
> --- a/src/exim_lock.c
> +++ b/src/exim_lock.c
> -@@ -13,6 +13,8 @@ Argument: the name of the lock file
> - Copyright (c) The Exim Maintainers 2016
> +@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021
> + SPDX-License-Identifier: GPL-2.0-or-later
> */
>
> +#define _XOPEN_SOURCE
> @@ -39,7 +41,7 @@ index 068216816054..cb140aff6436 100644
> #include "os.h"
>
> #include <stdio.h>
> -@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016
> +@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016
> #include <unistd.h>
> #include <utime.h>
> #include <sys/utsname.h>
> diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0005-sieve-fix-build-errors.patch
> index f4b95d50bc..20323c17cd 100644
> --- a/package/exim/0005-sieve-fix-build-errors.patch
> +++ b/package/exim/0005-sieve-fix-build-errors.patch
> @@ -21,6 +21,8 @@ buildsystem.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> src/sieve.c | 2 ++
> 1 file changed, 2 insertions(+)
> @@ -29,7 +31,7 @@ diff --git a/src/sieve.c b/src/sieve.c
> index 5e8d1e6f4776..9632f2d43810 100644
> --- a/src/sieve.c
> +++ b/src/sieve.c
> -@@ -12,6 +12,8 @@
> +@@ -14,6 +14,8 @@
>
> /* Sieve mail filter. */
>
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
____________
.-----------------.--------------------: _ :------------------.
| Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON |
| | Software Designer | _/ - /' | \ / CAMPAIGN |
| +33 638.411.245 '--------------------: (_ `--, | X AGAINST |
| yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL |
'--------------------------------------:______/_____:------------------'
____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.
This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/exim: update patches to be applied with fuzz 0
2024-06-27 21:25 [Buildroot] [PATCH 1/1] package/exim: update patches to be applied with fuzz 0 Bernd Kuhls
2024-06-28 6:36 ` Luca Ceresoli via buildroot
2024-06-28 6:44 ` yann.morin
@ 2024-06-28 20:25 ` Yann E. MORIN
2 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2024-06-28 20:25 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Luca Ceresoli, buildroot
Bernd, All,
On 2024-06-27 23:25 +0200, Bernd Kuhls spake thusly:
> Commit 8f88a644ed "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>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/exim/0001-Build-buildconfig-for-the-host.patch | 4 +++-
> ...0002-Don-t-make-backup-copies-of-installed-files.patch | 4 +++-
> ...0003-Skip-version-check-and-symlink-installation.patch | 8 ++++----
> .../0004-exim_lock-fix-lstat-related-build-errors.patch | 8 +++++---
> package/exim/0005-sieve-fix-build-errors.patch | 4 +++-
> 5 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch
> index 87eb527974..e9da80765a 100644
> --- a/package/exim/0001-Build-buildconfig-for-the-host.patch
> +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch
> @@ -2,6 +2,8 @@ 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.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> OS/Makefile-Base | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> @@ -10,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base
> index 29a6ad3..420ba60 100644
> --- a/OS/Makefile-Base
> +++ b/OS/Makefile-Base
> -@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
> +@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
>
> # Targets for special-purpose configuration header builders
> buildconfig: buildconfig.c
> diff --git a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> index 0cdaa744bc..3c115f8d02 100644
> --- a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> +++ b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
> @@ -5,6 +5,8 @@ This leads to useless duplicated files on the target, so disable this
> piece of code.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> scripts/exim_install | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
> @@ -13,7 +15,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
> index 616ab3c..e68e7d5 100755
> --- a/scripts/exim_install
> +++ b/scripts/exim_install
> -@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do
> +@@ -348,15 +348,15 @@ while [ $# -gt 0 ]; do
>
> else
> if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then
> diff --git a/package/exim/0003-Skip-version-check-and-symlink-installation.patch b/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> index a342d6ed34..55166f108b 100644
> --- a/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> +++ b/package/exim/0003-Skip-version-check-and-symlink-installation.patch
> @@ -9,8 +9,8 @@ Inspired by:
> http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -(rebased against exim 4.89)
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +[Bernd: rebased for version 4.89 & 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> scripts/exim_install | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
> @@ -19,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install
> index e68e7d5..487a4e1 100755
> --- a/scripts/exim_install
> +++ b/scripts/exim_install
> -@@ -58,6 +58,8 @@
> +@@ -61,6 +61,8 @@
> shift
> done
>
> @@ -28,7 +28,7 @@ index e68e7d5..487a4e1 100755
> # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK,
> # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build
> # directory). EXE is empty except in the Cygwin environment. In each case, keep
> -@@ -217,9 +219,7 @@
> +@@ -220,9 +223,7 @@
> # The exim binary is handled specially
>
> if [ $name = exim${EXE} ]; then
> diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> index a0a279fc43..616ada5026 100644
> --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> +++ b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch
> @@ -22,6 +22,8 @@ Fixes:
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> src/exim_lock.c | 3 +++
> 1 file changed, 3 insertions(+)
> @@ -30,8 +32,8 @@ diff --git a/src/exim_lock.c b/src/exim_lock.c
> index 068216816054..cb140aff6436 100644
> --- a/src/exim_lock.c
> +++ b/src/exim_lock.c
> -@@ -13,6 +13,8 @@ Argument: the name of the lock file
> - Copyright (c) The Exim Maintainers 2016
> +@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021
> + SPDX-License-Identifier: GPL-2.0-or-later
> */
>
> +#define _XOPEN_SOURCE
> @@ -39,7 +41,7 @@ index 068216816054..cb140aff6436 100644
> #include "os.h"
>
> #include <stdio.h>
> -@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016
> +@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016
> #include <unistd.h>
> #include <utime.h>
> #include <sys/utsname.h>
> diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0005-sieve-fix-build-errors.patch
> index f4b95d50bc..20323c17cd 100644
> --- a/package/exim/0005-sieve-fix-build-errors.patch
> +++ b/package/exim/0005-sieve-fix-build-errors.patch
> @@ -21,6 +21,8 @@ buildsystem.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523
> +[Bernd: rebased for version 4.97.1]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> src/sieve.c | 2 ++
> 1 file changed, 2 insertions(+)
> @@ -29,7 +31,7 @@ diff --git a/src/sieve.c b/src/sieve.c
> index 5e8d1e6f4776..9632f2d43810 100644
> --- a/src/sieve.c
> +++ b/src/sieve.c
> -@@ -12,6 +12,8 @@
> +@@ -14,6 +14,8 @@
>
> /* Sieve mail filter. */
>
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread