From 196b9090f96064d5772e01b875106397a9c898da Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 24 Apr 2018 12:34:53 +0100 Subject: [PATCH] dma: Apply compile fix dma segfaulted when built without string.h. Fixes: #11701 Submitted upstream: https://github.com/corecode/dma/pull/58 Signed-off-by: Michael Tremer --- lfs/dma | 1 + src/patches/dma-0.11-compile-fixes.patch | 29 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/patches/dma-0.11-compile-fixes.patch diff --git a/lfs/dma b/lfs/dma index 5079671584..085c9c2ee6 100644 --- a/lfs/dma +++ b/lfs/dma @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) touch /var/ipfire/dma/mail.conf cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.11-compile-fixes.patch cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile cd $(DIR_APP) && make diff --git a/src/patches/dma-0.11-compile-fixes.patch b/src/patches/dma-0.11-compile-fixes.patch new file mode 100644 index 0000000000..a6e5165c91 --- /dev/null +++ b/src/patches/dma-0.11-compile-fixes.patch @@ -0,0 +1,29 @@ +From 60cf6f03a4b13ec0e491a282ab5233a1619a7a66 Mon Sep 17 00:00:00 2001 +From: Michael Tremer +Date: Tue, 24 Apr 2018 12:30:13 +0100 +Subject: [PATCH] net.c: Include string.h + +Various functions that have been used come from string.h. GCC compiled +dma without this header, but unfortunately the binary segfaulted at random +times. + +Signed-off-by: Michael Tremer +--- + net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net.c b/net.c +index a1cc3e3bfd79..221dda131a23 100644 +--- a/net.c ++++ b/net.c +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.14.3 + -- 2.39.5