summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-03-05 15:30:57 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-03-05 15:30:57 +0000
commite888cd41b4759c1454b83bdba8a2964f194d6b06 (patch)
treeaca95efba1ff5ebc9b80c00c9fb6ea4066d50c94
parent2e1ca24a270ce8351ec0057102ef8bf03f723673 (diff)
sysklogd: fix build
-rw-r--r--package/sysklogd/sysklogd-susv3-legacy.patch20
-rw-r--r--package/sysklogd/sysklogd.mk2
-rw-r--r--package/sysklogd/sysklogd.patch3
3 files changed, 22 insertions, 3 deletions
diff --git a/package/sysklogd/sysklogd-susv3-legacy.patch b/package/sysklogd/sysklogd-susv3-legacy.patch
new file mode 100644
index 000000000..7e9a294fe
--- /dev/null
+++ b/package/sysklogd/sysklogd-susv3-legacy.patch
@@ -0,0 +1,20 @@
+[PATCH] replace susv3 legacy functions with modern equivalents
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ syslog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sysklogd-1.4.1/syslog.c
+===================================================================
+--- sysklogd-1.4.1.orig/syslog.c
++++ sysklogd-1.4.1/syslog.c
+@@ -178,7 +178,7 @@
+ return;
+ (void)strcat(tbuf, "\r\n");
+ cnt += 2;
+- p = index(tbuf, '>') + 1;
++ p = strchr(tbuf, '>') + 1;
+ (void)write(fd, p, cnt - (p - tbuf));
+ (void)close(fd);
+ }
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index d967db10a..0dd39295c 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -25,7 +25,7 @@ $(SYSKLOGD_DIR)/.unpacked: $(DL_DIR)/$(SYSKLOGD_SOURCE)
touch $(SYSKLOGD_DIR)/.unpacked
$(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY): $(SYSKLOGD_DIR)/.unpacked
- $(MAKE) CC=$(TARGET_CC) -C $(SYSKLOGD_DIR)
+ $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -C $(SYSKLOGD_DIR)
$(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY)
$(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY)
diff --git a/package/sysklogd/sysklogd.patch b/package/sysklogd/sysklogd.patch
index 101db0bc1..393a1a333 100644
--- a/package/sysklogd/sysklogd.patch
+++ b/package/sysklogd/sysklogd.patch
@@ -66,11 +66,10 @@
--- sysklogd-1.4.1/ksym_mod.c.orig 2005-11-24 23:15:01.000000000 +1000
+++ sysklogd-1.4.1/ksym_mod.c 2005-11-24 23:11:54.000000000 +1000
-@@ -89,17 +89,22 @@
+@@ -89,17 +89,21 @@
#include <errno.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
-+#include <linux/linkage.h>
+#include <linux/version.h>
#if !defined(__GLIBC__)
#include <linux/time.h>