Marius Tomaschewski
3b25bc6d63
- Preliminary AppArmor support. Since those profiles need to be tested properly they'll live in /etc/apparmor/profiles/extras. - Added rsyslog-pid-file.patch to fix a regression that causes the pid file to be created in /etc OBS-URL: https://build.opensuse.org/request/show/241312 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=194
28 lines
832 B
Diff
28 lines
832 B
Diff
Index: rsyslog-8.2.2/tools/syslogd.c
|
|
===================================================================
|
|
--- rsyslog-8.2.2.orig/tools/syslogd.c
|
|
+++ rsyslog-8.2.2/tools/syslogd.c
|
|
@@ -133,19 +133,14 @@ rsRetVal rsyslogdInit(void);
|
|
void rsyslogdDebugSwitch();
|
|
void rsyslogdDoDie(int sig);
|
|
|
|
-
|
|
-#if defined(SYSLOGD_PIDNAME)
|
|
-# undef _PATH_LOGPID
|
|
-# define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME
|
|
-#else
|
|
-# ifndef _PATH_LOGPID
|
|
-# define _PATH_LOGPID "/etc/rsyslogd.pid"
|
|
-# endif
|
|
+#ifndef _PATH_LOGPID
|
|
+# define _PATH_LOGPID "/var/run/rsyslogd.pid"
|
|
#endif
|
|
|
|
#ifndef _PATH_TTY
|
|
# define _PATH_TTY "/dev/tty"
|
|
#endif
|
|
+
|
|
char *PidFile = _PATH_LOGPID; /* read-only after startup */
|
|
|
|
int bHadHUP = 0; /* did we have a HUP? */
|