Update patches.

6 files changed, 44 insertions, 57 deletions

diff --git a/debian/changelog b/debian/changelog
index 15bb7e4..3141ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rsyslog (7.6.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update patches.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 13 Mar 2014 18:07:48 +0100
 
diff --git a/debian/patches/0001-Don-t-create-a-database.patch b/debian/patches/0001-Don-t-create-a-database.patch
new file mode 100644
index 0000000..be928d9
--- /dev/null
+++ b/debian/patches/0001-Don-t-create-a-database.patch
@@ -0,0 +1,42 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Thu, 13 Mar 2014 17:58:08 +0100
+Subject: Don't create a database
+
+dbconfig-common, which is used by rsyslog-mysql and rsyslog-pgsql, takes
+care of creating the database for us.
+---
+ plugins/ommysql/createDB.sql | 6 ++----
+ plugins/ompgsql/createDB.sql | 2 --
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/ommysql/createDB.sql b/plugins/ommysql/createDB.sql
+index 211cfb0..1dc6f5c 100644
+--- a/plugins/ommysql/createDB.sql
++++ b/plugins/ommysql/createDB.sql
+@@ -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 @@ CREATE TABLE SystemEvents
+         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/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql
+index 2f72a0a..5dab0dd 100644
+--- a/plugins/ompgsql/createDB.sql
++++ b/plugins/ompgsql/createDB.sql
+@@ -1,5 +1,3 @@
+-CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII';
+-\c Syslog;
+ CREATE TABLE SystemEvents
+ (
+         ID serial not null primary key,
diff --git a/debian/patches/01-dont_create_db.patch b/debian/patches/01-dont_create_db.patch
deleted file mode 100644
index efd0c75..0000000
--- a/debian/patches/01-dont_create_db.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rsyslog/plugins/ommysql/createDB.sql
-===================================================================
---- rsyslog.orig/plugins/ommysql/createDB.sql	2007-12-12 18:18:29.000000000 +0100
-+++ rsyslog/plugins/ommysql/createDB.sql	2008-02-12 16:03:04.000000000 +0100
-@@ -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 ,
-Index: rsyslog/plugins/ompgsql/createDB.sql
-===================================================================
---- rsyslog.orig/plugins/ompgsql/createDB.sql	2007-12-12 18:18:29.000000000 +0100
-+++ rsyslog/plugins/ompgsql/createDB.sql	2008-02-12 16:03:04.000000000 +0100
-@@ -1,5 +1,3 @@
--CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII';
--\c Syslog;
- CREATE TABLE SystemEvents
- (
-         ID serial not null primary key,
diff --git a/debian/patches/02-mongo-template-not-mandatory.patch b/debian/patches/02-mongo-template-not-mandatory.patch
deleted file mode 100644
index 023bfce..0000000
--- a/debian/patches/02-mongo-template-not-mandatory.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/ommongodb/ommongodb.c
-+++ b/plugins/ommongodb/ommongodb.c
-@@ -81,7 +81,7 @@ static struct cnfparamdescr actpdescr[] = {
- 	{ "collection", eCmdHdlrGetWord, 0 },
- 	{ "uid", eCmdHdlrGetWord, 0 },
- 	{ "pwd", eCmdHdlrGetWord, 0 },
--	{ "template", eCmdHdlrGetWord, 1 }
-+	{ "template", eCmdHdlrGetWord, 0 }
- };
- static struct cnfparamblk actpblk =
- 	{ CNFPARAMBLK_VERSION,
diff --git a/debian/patches/03-json-nul-terminator.patch b/debian/patches/03-json-nul-terminator.patch
deleted file mode 100644
index 783a555..0000000
--- a/debian/patches/03-json-nul-terminator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/template.c
-+++ b/template.c
-@@ -361,7 +361,7 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson, struct
- 							   pTpe->data.field.propName,  &propLen,
- 							   &bMustBeFreed, ttNow);
- 				if(pTpe->data.field.options.bMandatory || propLen > 0) {
--					jsonf = json_object_new_string_len((char*)pVal, propLen);
-+					jsonf = json_object_new_string_len((char*)pVal, propLen+1);
- 					json_object_object_add(json, (char*)pTpe->fieldName, jsonf);
- 				}
- 				if(bMustBeFreed) { /* json-c makes its own private copy! */
diff --git a/debian/patches/series b/debian/patches/series
index 21a3cf2..a8e093a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-# Debian patches for rsyslog
-01-dont_create_db.patch
-02-mongo-template-not-mandatory.patch
-03-json-nul-terminator.patch
+0001-Don-t-create-a-database.patch