webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

dma: Apply compile fix

Browse Source 
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>
This commit is contained in:
Michael Tremer
2018-04-24 12:34:53 +01:00
parent df7f30a146
commit 86fd194766
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/dma
View File

@@ -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

29
src/patches/dma-0.11-compile-fixes.patch Normal file
View File

@@ -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