diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/0001-Don-t-create-a-database.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0002-Fix-pidfile-location.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 5 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog index b159b42..e6cd6d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ rsyslog (8.4.0-1) UNRELEASED; urgency=medium * New upstream release. + * Update patches: + - Refresh 0001-Don-t-create-a-database.patch. + - Drop 0002-Fix-pidfile-location.patch, merged upstream. -- Michael Biebl <biebl@debian.org> Mon, 18 Aug 2014 17:49:11 +0200 diff --git a/debian/patches/0001-Don-t-create-a-database.patch b/debian/patches/0001-Don-t-create-a-database.patch index be928d9..b499376 100644 --- a/debian/patches/0001-Don-t-create-a-database.patch +++ b/debian/patches/0001-Don-t-create-a-database.patch @@ -31,11 +31,11 @@ index 211cfb0..1dc6f5c 100644 ID int unsigned not null auto_increment primary key, SystemEventID int NULL , diff --git a/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql -index 2f72a0a..5dab0dd 100644 +index 0c0f7e1..5dab0dd 100644 --- a/plugins/ompgsql/createDB.sql +++ b/plugins/ompgsql/createDB.sql @@ -1,5 +1,3 @@ --CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII'; +-CREATE DATABASE "Syslog" WITH ENCODING 'SQL_ASCII' TEMPLATE template0; -\c Syslog; CREATE TABLE SystemEvents ( diff --git a/debian/patches/0002-Fix-pidfile-location.patch b/debian/patches/0002-Fix-pidfile-location.patch deleted file mode 100644 index d7c4a0b..0000000 --- a/debian/patches/0002-Fix-pidfile-location.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Mon, 9 Jun 2014 19:11:33 +0200 -Subject: Fix pidfile location - -https://github.com/rsyslog/rsyslog/issues/86 ---- - tools/syslogd.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/tools/syslogd.c b/tools/syslogd.c -index ec0beb7..857512b 100644 ---- a/tools/syslogd.c -+++ b/tools/syslogd.c -@@ -134,13 +134,8 @@ 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 diff --git a/debian/patches/series b/debian/patches/series index d09b668..a8e093a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Don-t-create-a-database.patch -0002-Fix-pidfile-location.patch |