1 files changed, 23 insertions, 35 deletions
diff --git a/main/rsyslog/musl-fix-headers.patch b/main/rsyslog/musl-fix-headers.patch
index c14c94085a..a6dafc428a 100644
--- a/main/rsyslog/musl-fix-headers.patch
+++ b/main/rsyslog/musl-fix-headers.patch
@@ -1,38 +1,26 @@
---- rsyslog-6.4.2.orig/tools/omfile.c
-+++ rsyslog-6.4.2/tools/omfile.c
-@@ -37,6 +37,7 @@
-  */
- #include "config.h"
- #include "rsyslog.h"
-+#include <fcntl.h>
- #include <stdio.h>
- #include <stdarg.h>
- #include <stdlib.h>
---- rsyslog-6.4.2.orig/tools/pidfile.c
-+++ rsyslog-6.4.2/tools/pidfile.c
-@@ -29,6 +29,7 @@
-  *	First version (v0.2) released
-  */
- 
-+#include <fcntl.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/stat.h>
---- rsyslog-6.4.2.orig/tools/syslogd.c
-+++ rsyslog-6.4.2/tools/syslogd.c
-@@ -46,13 +46,14 @@
- #define DEFUPRI		(LOG_USER|LOG_NOTICE)
- #define TIMERINTVL	30		/* interval for checking flush, mark */
- 
-+#define GNU_SOURCE
+--- ./tools/omfile.c.orig
++++ ./tools/omfile.c
+@@ -47,10 +47,7 @@
+ #include <ctype.h>
+ #include <libgen.h>
  #include <unistd.h>
- #include <stdlib.h>
- #include <stdio.h>
+-#include <sys/file.h>
+-#ifdef OS_SOLARIS
+-#	include <fcntl.h>
+-#endif
 +#include <fcntl.h>
- #include <stddef.h>
- #include <ctype.h>
- #include <limits.h>
--#define GNU_SOURCE
+ #ifdef HAVE_ATOMIC_BUILTINS
+ #	include <pthread.h>
+ #endif
+--- ./tools/pidfile.c.orig
++++ ./tools/pidfile.c
+@@ -36,9 +36,7 @@
  #include <string.h>
- #include <stdarg.h>
- #include <time.h>
+ #include <errno.h>
+ #include <signal.h>
+-#ifdef __sun
+ #include <fcntl.h>
+-#endif
+ 
+ #include "srUtils.h"
+