summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sysklogd/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/sysklogd/files')
-rw-r--r--meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch132
-rw-r--r--meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch28
-rw-r--r--meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch35
-rw-r--r--meta/recipes-extended/sysklogd/files/klogd.service13
-rw-r--r--meta/recipes-extended/sysklogd/files/no-strip-install.patch17
-rw-r--r--meta/recipes-extended/sysklogd/files/no-vectorization.patch20
-rwxr-xr-xmeta/recipes-extended/sysklogd/files/sysklogd4
-rw-r--r--meta/recipes-extended/sysklogd/files/syslog.conf71
-rw-r--r--meta/recipes-extended/sysklogd/files/syslogd.service14
-rw-r--r--meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf1
10 files changed, 2 insertions, 333 deletions
diff --git a/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch b/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
deleted file mode 100644
index 9567946c0c..0000000000
--- a/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
1From f0af5bcfd753691652eac35efbcb208c933253f1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 Aug 2015 05:11:53 +0000
4Subject: [PATCH] Fix build with musl
5
6Explicitly include fcntl.h since with glibc is comes in as indirect
7include but not with musl
8
9linux/time.h inclusion is not required on musl so using !__GLIBC__ is
10not right for musl here
11
12wait type is glibc specific
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Pending
17
18 klogd.c | 10 +---------
19 ksym_mod.c | 5 +----
20 pidfile.c | 1 +
21 syslog.c | 3 ++-
22 syslogd.c | 4 +---
23 5 files changed, 6 insertions(+), 17 deletions(-)
24
25diff --git a/klogd.c b/klogd.c
26index 6cc80ed..9219671 100644
27--- a/klogd.c
28+++ b/klogd.c
29@@ -260,11 +260,8 @@
30 #include <unistd.h>
31 #include <signal.h>
32 #include <errno.h>
33-#include <sys/fcntl.h>
34+#include <fcntl.h>
35 #include <sys/stat.h>
36-#if !defined(__GLIBC__)
37-#include <linux/time.h>
38-#endif /* __GLIBC__ */
39 #include <stdarg.h>
40 #include <paths.h>
41 #include <stdlib.h>
42@@ -277,13 +274,8 @@
43
44 #define __LIBRARY__
45 #include <linux/unistd.h>
46-#if !defined(__GLIBC__)
47-# define __NR_ksyslog __NR_syslog
48-_syscall3(int,ksyslog,int, type, char *, buf, int, len);
49-#else
50 #include <sys/klog.h>
51 #define ksyslog klogctl
52-#endif
53
54 #define LOG_BUFFER_SIZE 4096
55 #define LOG_LINE_LENGTH 1000
56diff --git a/ksym_mod.c b/ksym_mod.c
57index 68cd6b6..6e26da1 100644
58--- a/ksym_mod.c
59+++ b/ksym_mod.c
60@@ -113,12 +113,9 @@
61 #include <unistd.h>
62 #include <signal.h>
63 #include <errno.h>
64-#include <sys/fcntl.h>
65+#include <fcntl.h>
66 #include <sys/stat.h>
67 #include "module.h"
68-#if !defined(__GLIBC__)
69-#include <linux/time.h>
70-#endif /* __GLIBC__ */
71 #include <stdarg.h>
72 #include <paths.h>
73 #include <linux/version.h>
74diff --git a/pidfile.c b/pidfile.c
75index e0959a0..6daa2e0 100644
76--- a/pidfile.c
77+++ b/pidfile.c
78@@ -31,6 +31,7 @@
79 #include <string.h>
80 #include <errno.h>
81 #include <signal.h>
82+#include <fcntl.h>
83
84 /* read_pid
85 *
86diff --git a/syslog.c b/syslog.c
87index bdb3ff2..ef7b34e 100644
88--- a/syslog.c
89+++ b/syslog.c
90@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90";
91 #include <sys/types.h>
92 #include <sys/socket.h>
93 #include <sys/file.h>
94-#include <sys/signal.h>
95+//#include <sys/signal.h>
96 #include <sys/syslog.h>
97 #if 0
98 #include "syslog.h"
99@@ -72,6 +72,7 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90";
100 #include <stdarg.h>
101 #include <paths.h>
102 #include <stdio.h>
103+#include <fcntl.h>
104
105 #define _PATH_LOGNAME "/dev/log"
106
107diff --git a/syslogd.c b/syslogd.c
108index ea73ea5..1ca0595 100644
109--- a/syslogd.c
110+++ b/syslogd.c
111@@ -818,9 +818,7 @@ void doexit(int sig);
112 void init();
113 void cfline(char *line, register struct filed *f);
114 int decode(char *name, struct code *codetab);
115-#if defined(__GLIBC__)
116 #define dprintf mydprintf
117-#endif /* __GLIBC__ */
118 static void dprintf(char *, ...);
119 static void allocate_log(void);
120 void sighup_handler();
121@@ -2094,7 +2092,7 @@ void reapchild()
122 (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
123 wait ((int *)0);
124 #else
125- union wait status;
126+ int status;
127
128 while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
129 ;
130--
1312.5.1
132
diff --git a/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch b/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
deleted file mode 100644
index 56431af845..0000000000
--- a/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 30 Jun 2017 18:20:06 -0700
4Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some
5 conditions
6
7Upstream-Status: Inappropriate [ no upstream ]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 ksym_mod.c | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/ksym_mod.c b/ksym_mod.c
15index 6e26da1..a3daa7d 100644
16--- a/ksym_mod.c
17+++ b/ksym_mod.c
18@@ -186,7 +186,6 @@ extern int InitMsyms()
19 else
20 Syslog(LOG_ERR, "Error loading kernel symbols " \
21 "- %s\n", strerror(errno));
22- fclose(ksyms);
23 return(0);
24 }
25
26--
272.13.2
28
diff --git a/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch b/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
deleted file mode 100644
index ebbdef303b..0000000000
--- a/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Jul 2017 00:01:50 -0700
4Subject: [PATCH 2/2] Make way for respecting flags from environment
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 Makefile | 4 +---
11 1 file changed, 1 insertion(+), 3 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index 5af1689..af699d2 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -17,14 +17,12 @@
18 # along with this program; if not, write to the Free Software
19 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20
21-CC= gcc
22 #SKFLAGS= -g -DSYSV -Wall
23 #LDFLAGS= -g
24-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
25+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
26 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
27 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
28 # $(shell getconf LFS_SKFLAGS)
29-LDFLAGS= -s
30
31 # Look where your install program is.
32 INSTALL = /usr/bin/install
33--
342.13.2
35
diff --git a/meta/recipes-extended/sysklogd/files/klogd.service b/meta/recipes-extended/sysklogd/files/klogd.service
deleted file mode 100644
index 0c888c497d..0000000000
--- a/meta/recipes-extended/sysklogd/files/klogd.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=Kernel Logging Service
3After=syslogd.service
4
5[Service]
6Type=forking
7ExecStart=/sbin/klogd
8PIDFile=/var/run/klogd.pid
9StandardOutput=null
10Restart=on-failure
11
12[Install]
13WantedBy=multi-user.target
diff --git a/meta/recipes-extended/sysklogd/files/no-strip-install.patch b/meta/recipes-extended/sysklogd/files/no-strip-install.patch
deleted file mode 100644
index d426c83bf2..0000000000
--- a/meta/recipes-extended/sysklogd/files/no-strip-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: sysklogd-1.5.1/Makefile
4===================================================================
5--- sysklogd-1.5.1.orig/Makefile
6+++ sysklogd-1.5.1/Makefile
7@@ -127,8 +127,8 @@ clobber: clean
8 rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
9
10 install_exec: syslogd klogd
11- ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
12- ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
13+ ${INSTALL} -m 500 syslogd ${BINDIR}/syslogd
14+ ${INSTALL} -m 500 klogd ${BINDIR}/klogd
15
16 install_man:
17 ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
diff --git a/meta/recipes-extended/sysklogd/files/no-vectorization.patch b/meta/recipes-extended/sysklogd/files/no-vectorization.patch
deleted file mode 100644
index c1cc042c9c..0000000000
--- a/meta/recipes-extended/sysklogd/files/no-vectorization.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate
2
3The compiler should not be generating vectorized instructions on this target.
4This is a work around until I can determine why this is occuring on this
5particular recipe
6
7Index: sysklogd-1.5/Makefile
8===================================================================
9--- sysklogd-1.5.orig/Makefile
10+++ sysklogd-1.5/Makefile
11@@ -20,7 +20,8 @@
12 CC= gcc
13 #SKFLAGS= -g -DSYSV -Wall
14 #LDFLAGS= -g
15-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
16+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce \
17+ -fno-tree-vectorize
18 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
19 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
20 # $(shell getconf LFS_SKFLAGS)
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd
index 73424840ba..4a4ca8a78e 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/meta/recipes-extended/sysklogd/files/sysklogd
@@ -19,8 +19,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
19 19
20pidfile_syslogd=/var/run/syslogd.pid 20pidfile_syslogd=/var/run/syslogd.pid
21pidfile_klogd=/var/run/klogd.pid 21pidfile_klogd=/var/run/klogd.pid
22binpath_syslogd=/sbin/syslogd 22binpath_syslogd=/usr/sbin/syslogd
23binpath_klogd=/sbin/klogd 23binpath_klogd=/usr/sbin/klogd
24 24
25test -x $binpath || exit 0 25test -x $binpath || exit 0
26 26
diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
deleted file mode 100644
index 0849de1268..0000000000
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ /dev/null
@@ -1,71 +0,0 @@
1# /etc/syslog.conf Configuration file for syslogd.
2#
3# Ported from debian by Yu Ke <ke.yu@intel.com>
4#
5
6#
7# First some standard logfiles. Log by facility.
8#
9
10auth,authpriv.* /var/log/auth.log
11*.*;auth,authpriv.none -/var/log/syslog
12#cron.* /var/log/cron.log
13daemon.* -/var/log/daemon.log
14kern.* -/var/log/kern.log
15lpr.* -/var/log/lpr.log
16mail.* -/var/log/mail.log
17user.* -/var/log/user.log
18
19#
20# Logging for the mail system. Split it up so that
21# it is easy to write scripts to parse these files.
22#
23mail.info -/var/log/mail.info
24mail.warn -/var/log/mail.warn
25mail.err /var/log/mail.err
26
27# Logging for INN news system
28#
29news.crit /var/log/news.crit
30news.err /var/log/news.err
31news.notice -/var/log/news.notice
32
33#
34# Some `catch-all' logfiles.
35#
36*.=debug;\
37auth,authpriv.none;\
38news.none;mail.none -/var/log/debug
39
40*.=info;*.=notice;*.=warn;\
41auth,authpriv.none;\
42cron,daemon.none;\
43mail,news.none -/var/log/messages
44
45#
46# Emergencies are sent to everybody logged in.
47#
48*.emerg *
49
50#
51# I like to have messages displayed on the console, but only on a virtual
52# console I usually leave idle.
53#
54#daemon,mail.*;\
55#news.=crit;news.=err;news.=notice;\
56#*.=debug;*.=info;\
57#*.=notice;*.=warn /dev/tty8
58
59# The named pipe /dev/xconsole is for the `xconsole' utility. To use it,
60# you must invoke `xconsole' with the `-file' option:
61#
62# $ xconsole -file /dev/xconsole [...]
63#
64# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
65# busy site..
66#
67daemon.*;mail.*;\
68news.err;\
69*.=debug;*.=info;\
70*.=notice;*.=warn |/dev/xconsole
71
diff --git a/meta/recipes-extended/sysklogd/files/syslogd.service b/meta/recipes-extended/sysklogd/files/syslogd.service
deleted file mode 100644
index eeaff3d38d..0000000000
--- a/meta/recipes-extended/sysklogd/files/syslogd.service
+++ /dev/null
@@ -1,14 +0,0 @@
1[Unit]
2Description=System Logging Service
3Requires=syslog.socket
4
5[Service]
6Type=forking
7ExecStart=/sbin/syslogd
8PIDFile=/var/run/syslogd.pid
9StandardOutput=null
10Restart=on-failure
11
12[Install]
13WantedBy=multi-user.target
14Alias=syslog.service
diff --git a/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf b/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
deleted file mode 100644
index f4aecd385b..0000000000
--- a/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
+++ /dev/null
@@ -1 +0,0 @@
1p /dev/xconsole 0640 root adm
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 23:42:30 +0000