[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 196b9090f96064d5772e01b875106397a9c898da

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 196b9090f96064d5772e01b875106397a9c898da

[git]

[-- Attachment #1: Type: text/plain, Size: 3020 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core120 has been updated
       via  196b9090f96064d5772e01b875106397a9c898da (commit)
      from  3509cd985fd5a92de5eb3e3b1bc153fcea2d3d31 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 196b9090f96064d5772e01b875106397a9c898da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 24 12:34:53 2018 +0100

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 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

Difference in files:
diff --git a/lfs/dma b/lfs/dma
index 507967158..085c9c2ee 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 000000000..a6e5165c9
--- /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(a)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(a)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
+


hooks/post-receive
--
IPFire 2.x development tree