From e888cd41b4759c1454b83bdba8a2964f194d6b06 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Mar 2009 15:30:57 +0000
Subject: sysklogd: fix build

---
 package/sysklogd/sysklogd-susv3-legacy.patch | 20 ++++++++++++++++++++
 package/sysklogd/sysklogd.mk                 |  2 +-
 package/sysklogd/sysklogd.patch              |  3 +--
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 package/sysklogd/sysklogd-susv3-legacy.patch

(limited to 'package/sysklogd')

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>
-- 
cgit v1.2.3