diff mbox series

[1/1] package/gengetopt: fix patch fuzz

Message ID 20240720213347.1740848-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/gengetopt: fix patch fuzz | expand

Commit Message

Fabrice Fontaine July 20, 2024, 9:33 p.m. UTC 
Use upstream patch to fix patch fuzz and avoid the following build
failure raised since commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
which reduced the fuzz factor:

Applying 0001-configure.ac-add-disable-doc-option.patch using patch:
patching file Makefile.am
Hunk #1 FAILED at 18.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej

Fixes:
 - http://autobuild.buildroot.org/results/4cfa513e024ea2cb2058fde4ffdd727bd379dae7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .checkpackageignore                                 |  1 -
 .../0001-configure.ac-add-disable-doc-option.patch  | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

Comments

Thomas Petazzoni July 21, 2024, 4:21 p.m. UTC | #1 
On Sat, 20 Jul 2024 23:33:47 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Use upstream patch to fix patch fuzz and avoid the following build
> failure raised since commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
> which reduced the fuzz factor:
> 
> Applying 0001-configure.ac-add-disable-doc-option.patch using patch:
> patching file Makefile.am
> Hunk #1 FAILED at 18.
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/4cfa513e024ea2cb2058fde4ffdd727bd379dae7
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .checkpackageignore                                 |  1 -
>  .../0001-configure.ac-add-disable-doc-option.patch  | 13 +++++++------
>  2 files changed, 7 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index f0fa13eb4f..e6538af999 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -604,7 +604,6 @@  package/gdb/15.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U
 package/gdb/15.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream
 package/gdb/15.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream
 package/gdb/15.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream
-package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream
 package/genpart/0001-fix-return-code.patch lib_patch.Upstream
 package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream
 package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream
diff --git a/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch b/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
index d43714a3df..80bda9b721 100644
--- a/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
+++ b/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
@@ -1,22 +1,22 @@ 
-From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001
+From e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Sun, 22 Sep 2019 09:27:24 +0200
-Subject: [PATCH] configure.ac: add --disable-doc option
+Subject: configure.ac: add --disable-doc option
 
 Add --disable-doc option to allow the user to disable documentation
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931]
+Upstream: https://git.savannah.gnu.org/cgit/gengetopt.git/commit/?id=e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a
 ---
  Makefile.am  | 6 +++++-
  configure.ac | 7 +++++++
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index dbb5719..2db307a 100644
+index 1f184c2..76ac21a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -18,6 +18,10 @@
+@@ -18,7 +18,11 @@
  ACLOCAL_AMFLAGS = -I m4 -I gl/m4
  
  EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
@@ -28,6 +28,7 @@  index dbb5719..2db307a 100644
 +endif
  
  gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
+ 
 diff --git a/configure.ac b/configure.ac
 index 0ee89db..915706c 100644
 --- a/configure.ac
@@ -47,5 +48,5 @@  index 0ee89db..915706c 100644
  	[gengen],
  	[  --with-gengen=mygengen       gengen to use],
 -- 
-2.23.0
+cgit v1.1