diff options
| author | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:30 +0100 |
| commit | 60ca71394b49d283841f91facefadb2d43de4313 (patch) | |
| tree | af8b1a5dcfa0031a1d54ce318145a81e6f6e5c01 /debian/patches | |
| parent | 1ff3d60958bd7f477cf3dfaf8b20a4637109c18f (diff) | |
| download | rsyslog-60ca71394b49d283841f91facefadb2d43de4313.tar.gz | |
Imported Debian patch 1.19.2-1debian/1.19.2-1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/ignore_non_conf_files.patch | 23 | ||||
| -rw-r--r-- | debian/patches/no_create_db.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/ignore_non_conf_files.patch b/debian/patches/ignore_non_conf_files.patch new file mode 100644 index 0000000..b335221 --- /dev/null +++ b/debian/patches/ignore_non_conf_files.patch @@ -0,0 +1,23 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c (Revision 864) ++++ syslogd.c (Arbeitskopie) +@@ -3675,6 +3675,7 @@ + size_t iDirNameLen; + size_t iFileNameLen; + uchar szFullFileName[MAXFNAME]; ++ uchar *ext = NULL; + + assert(pDirName != NULL); + +@@ -3696,6 +3697,10 @@ + continue; /* we are not interested in special files */ + if(res->d_name[0] == '.') + continue; /* these files we are also not interested in */ ++ ext = strstr(res->d_name, ".conf"); ++ if(ext == NULL || strlen(ext) != 5) ++ continue; /* Ignore files not ending in *.conf */ ++ + ++iEntriesDone; + /* construct filename */ + iFileNameLen = strnlen(res->d_name, NAME_MAX); diff --git a/debian/patches/no_create_db.patch b/debian/patches/no_create_db.patch new file mode 100644 index 0000000..1576706 --- /dev/null +++ b/debian/patches/no_create_db.patch @@ -0,0 +1,21 @@ +Index: rsyslog/createDB.sql +=================================================================== +--- rsyslog.orig/createDB.sql 2007-08-30 01:05:00.000000000 +0200 ++++ rsyslog/createDB.sql 2007-08-30 01:07:50.000000000 +0200 +@@ -1,6 +1,4 @@ +-CREATE DATABASE Syslog; +-USE Syslog; +-CREATE TABLE SystemEvents ++CREATE TABLE IF NOT EXISTS SystemEvents + ( + ID int unsigned not null auto_increment primary key, + CustomerID bigint, +@@ -28,7 +26,7 @@ + SystemID int NULL + ); + +-CREATE TABLE SystemEventsProperties ++CREATE TABLE IF NOT EXISTS SystemEventsProperties + ( + ID int unsigned not null auto_increment primary key, + SystemEventID int NULL , diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a73faf0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +ignore_non_conf_files.patch -p0 +no_create_db.patch |