mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 21:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/monit: update the patches to be applied with fuzz 0

Browse Source 
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, monit fails to build with output:

    Applying 0001-no-force-static.patch using patch:
    patching file Makefile.am
    Hunk #1 FAILED at 85.
    1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej

    Applying 0002-configure.ac-fixes-missing-config-macro-dir.patch using patch:
    patching file configure.ac
    Hunk #1 FAILED at 8.
    1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

This commit refreshes the package patches on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Dario Binacchi 2024-07-07 07:50:05 +02:00 committed by Thomas Petazzoni
parent 1dc5fe6050
commit 18b1197e91
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/monit/0001-no-force-static.patch
View File

@ -5,13 +5,15 @@ still dlopen()s the NSS libraries.
Reported-by: Peter Kümmel <syntheticpp@gmx.net>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
@@ -85,7 +85,7 @@
src/process/sysdep_@ARCH@.c
@@ -97,7 +97,7 @@
src/statistics/Statistics.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
+monit_LDFLAGS = $(EXTLDFLAGS)

6
package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch
View File

@ -8,6 +8,8 @@ so that m4 macros are properly loaded upon autoreconf use.
Upstream: N/A (specific to buildroot)
Signed-off-by: Jens Maus <mail@jens-maus.de>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
configure.ac | 2 +-
libmonit/configure.ac | 2 +-
@ -17,9 +19,9 @@ diff --git a/configure.ac b/configure.ac
index 3c3d30a2..f4c5ea07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ([2.53])
@@ -8,7 +8,7 @@
# Example: 5.0_beta2
AC_INIT([monit], [5.34.0], [monit-general@nongnu.org])
AC_INIT([monit], [5.33.0], [monit-general@nongnu.org])
AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4 config])