main/sysklogd: fix musl build

2 files changed, 150 insertions, 0 deletions

diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index 13863564b4..e482fbca4a 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
@@ -20,6 +20,7 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
 	sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
 	sysklogd-1.5-build.patch
 	ksym-fclose-fix.diff
+	fix-includes.patch
 	syslog.conf
 	LICENSE"
 
@@ -65,5 +66,32 @@ e25d7b583b7e4bd8be503b89e1771e90  sysklogd.confd
 6c0a416e40a678cf99c454b0e98185c9  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
 c71826d1a4f3f7e8ffa57adbfc24f1ce  sysklogd-1.5-build.patch
 8e70cdf98cce9defae0c28a3d2db4410  ksym-fclose-fix.diff
+fee8beb8c17f8ff8bbf6523fbb1c627f  fix-includes.patch
 16019757e6af519be8cf3398b97e0f1b  syslog.conf
 7930f7ff5038e1318511624e348581cc  LICENSE"
+sha256sums="6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773  sysklogd-1.5.tar.gz
+603fa42348264aba7bc6e3306582523248a7841a0b02f101af0028e8db14a22a  sysklogd.logrotate
+bd72d336cf70903af1512e81180190de09b84f25b3dced5915869306a63841f2  sysklogd.daily
+379fd137610ff0c3be23387e2b85e1163212c87952a410b3dfa38a24e0215880  sysklogd.initd
+11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d  sysklogd.confd
+f316586561ec40eb185bb83b6e785185b9e33b8290767336cdab626767f88060  sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
+1818aee4cb0d501542721468199e376b73c71d8635b178b6a8d7bd6aff49aa9d  sysklogd-1.4.2-caen-owl-syslogd-bind.diff
+0105d924d9451531645a9957ec7d40228cf2a1cb4ccdf3d89ff255dfec0841b9  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+29fbfc607580a8bed0dc1ae598ddd175fda46dca79f528bc5a5b92c155e1e99b  sysklogd-1.5-build.patch
+7a34ec8ae1d396bb366f07c0375bb1e34cec565e01d7d8b8cc30e801c2df117e  ksym-fclose-fix.diff
+fd235a445a2fb0100cd84e201b7a0a14e515517b74106cf4dcfd8d820af7bc21  fix-includes.patch
+f438fd0f85eb6796289421aa0339d54d5c1cb0a5524df4c866c009a05223bf70  syslog.conf
+5d15a27dc7c6183a61a0e44fa5559b6d53a9f1591767c2322dd797f717c5eb8d  LICENSE"
+sha512sums="19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7  sysklogd-1.5.tar.gz
+d82caedfa61bfefc0162e5c416ff75a5cd8f60abe1cf8a3c5c4e7775aeb7bb64e712c783031659d3793378c8753578adf73ef79aac6a0e7cfbc5bbba5a74bd81  sysklogd.logrotate
+954f2f913e044b11b418aec3157f7757079b2e20b9a6fffd4b6eff94b5c74e62e804cdf870f84ea9412285d5024f3900c9a42cad8ff99534cc1d1a40ee120048  sysklogd.daily
+1734ef2dc9cbfeb14528f08c9dece22e0a8f4b2488b630e462a3967205c01e1ba012376bbc3f2f5d90d6f201b3cbacd0e41b16ebe05b3d0a361a278a855fe5b9  sysklogd.initd
+4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c  sysklogd.confd
+1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a  sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
+995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d  sysklogd-1.4.2-caen-owl-syslogd-bind.diff
+87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+ab979b36f091c62ada916246723cd75a71319a6c3687c034167b9caafc53807e6d224e0d6c836bc4b81b61c1d02ec21a1cb19477396a416c62f097d4b9ccc678  sysklogd-1.5-build.patch
+ceb1f7cb70f526dd285fc8bad5511cdef603fc1296f69cc0e7ec4901f11685fae083d028687765b233ca074dfbe0cdafa921de6c80a5cbced94de1059d9761ee  ksym-fclose-fix.diff
+0208662a0158ecb6b0a387bd1bf467c866105dac02767209aeaaaeb02762d6c2b814a2707315f8f6cd40f46c4b7744b74653e30973c31354998c27cd7c966dbd  fix-includes.patch
+49f73b8a16b92d0cda56db9cfc16d5322e797590dfc998282a62560d54205042af953837f5f94b45a3de403fdf5f63efe65d72e9908c7185a2cd5941275abf33  syslog.conf
+7b3de1d38b50df14ceaada900f2e8f23b0d5035278c9eacb06d2578ccdcf64ffc44bbb76ed6a10d80f4b883bf36a3ecd2bf60897321e4eae7aed7d8a5a36d86c  LICENSE"
diff --git a/main/sysklogd/fix-includes.patch b/main/sysklogd/fix-includes.patch
new file mode 100644
index 0000000000..d15baf5c33
--- /dev/null
+++ b/main/sysklogd/fix-includes.patch
@@ -0,0 +1,122 @@
+--- sysklogd-1.5.orig/klogd.c
++++ sysklogd-1.5/klogd.c
+@@ -260,11 +260,8 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/stat.h>
+-#if !defined(__GLIBC__)
+-#include <linux/time.h>
+-#endif /* __GLIBC__ */
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
+@@ -279,13 +276,8 @@
+ 
+ #define __LIBRARY__
+ #include <linux/unistd.h>
+-#if !defined(__GLIBC__)
+-# define __NR_ksyslog __NR_syslog
+-_syscall3(int,ksyslog,int, type, char *, buf, int, len);
+-#else
+ #include <sys/klog.h>
+ #define ksyslog klogctl
+-#endif
+ 
+ #define LOG_BUFFER_SIZE 4096
+ #define LOG_LINE_LENGTH 1000
+--- sysklogd-1.5.orig/ksym_mod.c
++++ sysklogd-1.5/ksym_mod.c
+@@ -113,12 +113,9 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/stat.h>
+ #include "module.h"
+-#if !defined(__GLIBC__)
+-#include <linux/time.h>
+-#endif /* __GLIBC__ */
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <linux/version.h>
+--- sysklogd-1.5.orig/pidfile.c
++++ sysklogd-1.5/pidfile.c
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+--- sysklogd-1.5.orig/syslog.c
++++ sysklogd-1.5/syslog.c
+@@ -55,7 +55,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/file.h>
+-#include <sys/signal.h>
+ #include <sys/syslog.h>
+ #if 0
+ #include "syslog.h"
+@@ -64,6 +63,8 @@
+ 
+ #include <sys/uio.h>
+ #include <sys/wait.h>
++#include <signal.h>
++#include <fcntl.h>
+ #include <netdb.h>
+ #include <string.h>
+ #include <time.h>
+--- sysklogd-1.5.orig/syslogd.c
++++ sysklogd-1.5/syslogd.c
+@@ -519,9 +519,9 @@
+ #include <time.h>
+ 
+ #define SYSLOG_NAMES
++#include <errno.h>
+ #include <sys/syslog.h>
+ #include <sys/param.h>
+-#include <sys/errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+@@ -823,9 +823,7 @@
+ void init();
+ void cfline(char *line, register struct filed *f);
+ int decode(char *name, struct code *codetab);
+-#if defined(__GLIBC__)
+ #define dprintf mydprintf
+-#endif /* __GLIBC__ */
+ static void dprintf(char *, ...);
+ static void allocate_log(void);
+ void sighup_handler();
+@@ -860,15 +858,9 @@
+ 	register char *p;
+ #ifndef TESTING
+ 	ssize_t msglen;
+-#endif
+-#if !defined(__GLIBC__)
+-	int len, num_fds;
+-#else /* __GLIBC__ */
+-#ifndef TESTING
+ 	socklen_t len;
+ #endif
+ 	int num_fds;
+-#endif /* __GLIBC__ */
+ 	/*
+ 	 * It took me quite some time to figure out how this is
+ 	 * supposed to work so I guess I should better write it down.
+@@ -2126,7 +2118,7 @@
+ 	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
+ 	wait ((int *)0);
+ #else
+-	union wait status;
++	int status;
+ 
+ 	while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
+ 		;