package/monit: reformat patch 0001 as git formatted patch

This will make it easier to edit the patch if needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2024-12-27 22:58:08 +01:00
committed by Julien Olivain
parent 61a0d5cb21
commit 1125fdde17
3 changed files with 36 additions and 23 deletions

View File

@@ -848,7 +848,7 @@ package/minissdpd/S50minissdpd Shellcheck lib_sysv.Indent lib_sysv.Variables
package/modem-manager/S44modem-manager Shellcheck lib_sysv.Variables
package/mongrel2/0001-Do-not-run-tests.patch lib_patch.Upstream
package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch lib_patch.Upstream
package/monit/0001-no-force-static.patch lib_patch.Upstream
package/monit/0001-Do-not-force-building-a-statically-linked-binary.patch lib_patch.Upstream
package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch lib_patch.Upstream
package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch lib_patch.Upstream
package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch lib_patch.Upstream

View File

@@ -0,0 +1,35 @@
From 5beb7918daa46bcc5106e6302f0d8434fc5a23e6 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 27 Dec 2024 22:12:02 +0100
Subject: [PATCH] Do not force building a statically-linked binary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Statically-linked binary do not work well with glibc, because it
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>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 6907706a..d2d123ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,7 @@ monit_SOURCES = src/y.tab.c \
src/statistics/Statistics.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
+monit_LDFLAGS = $(EXTLDFLAGS)
man_MANS = monit.1
--
2.47.0

View File

@@ -1,22 +0,0 @@
Do not force building a statically-linked binary
Statically-linked binary do not work well with glibc, because it
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
@@ -97,7 +97,7 @@
src/statistics/Statistics.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
+monit_LDFLAGS = $(EXTLDFLAGS)
man_MANS = monit.1