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 <michael.tremer@ipfire.org>

diff --git a/lfs/dma b/lfs/dma
index 50796715844f8a3ba7fba730bb7a43190ced92ca..085c9c2ee6c5ff08c401ed998e55c444b55c06f4 100644 (file)
--- 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 (file)
index 0000000..a6e5165
--- /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 <michael.tremer@ipfire.org>
+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 <michael.tremer@ipfire.org>
+---
+ 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 <netdb.h>
+ #include <setjmp.h>
+ #include <signal.h>
++#include <string.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ 
+-- 
+2.14.3
+