Adding debian version 8.2402.0-1.debian/8.2402.0-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 100 insertions, 0 deletions

diff --git a/debian/patches/Don-t-create-a-database.patch b/debian/patches/Don-t-create-a-database.patch
new file mode 100644
index 0000000..0b905a4
--- /dev/null
+++ b/debian/patches/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 6261284..9dc48de 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 2f1ade0..879a1b5 100644
+--- a/plugins/ompgsql/createDB.sql
++++ b/plugins/ompgsql/createDB.sql
+@@ -1,5 +1,3 @@
+-CREATE DATABASE "Syslog" WITH ENCODING 'SQL_ASCII' TEMPLATE template0;
+-\c Syslog;
+ CREATE TABLE SystemEvents
+ (
+         ID serial not null primary key,
diff --git a/debian/patches/Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch b/debian/patches/Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch
new file mode 100644
index 0000000..c95154b
--- /dev/null
+++ b/debian/patches/Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch
@@ -0,0 +1,56 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Fri, 28 Feb 2020 00:56:33 +0100
+Subject: Increase timeouts in imfile-basic-2GB-file and
+ imfile-truncate-2GB-file
+
+Those tests can take a long time, especially on slow architectures like
+armhf, so bump the test timeouts considerably.
+---
+ tests/imfile-basic-2GB-file.sh    | 4 ++--
+ tests/imfile-truncate-2GB-file.sh | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/imfile-basic-2GB-file.sh b/tests/imfile-basic-2GB-file.sh
+index d6b40d1..2fa7b9f 100755
+--- a/tests/imfile-basic-2GB-file.sh
++++ b/tests/imfile-basic-2GB-file.sh
+@@ -5,7 +5,7 @@
+ # adds a couple of messages to get it over 2GiB.
+ # This is part of the rsyslog testbench, licensed under ASL 2.0
+ . ${srcdir:=.}/diag.sh init
+-export TB_TEST_MAX_RUNTIME=3600 # test is very slow as it works on large files
++export TB_TEST_MAX_RUNTIME=8000 # test is very slow as it works on large files
+ generate_conf
+ add_conf '
+ module(load="../plugins/imfile/.libs/imfile")
+@@ -22,7 +22,7 @@ startup
+ ls -lh $RSYSLOG_DYNNAME.input
+ export NUMMESSAGES="$(cat $RSYSLOG_DYNNAME.msgcnt)"
+ 
+-wait_file_lines --delay 2500 --abort-on-oversize "$RSYSLOG_OUT_LOG" $NUMMESSAGES 3000
++wait_file_lines --delay 2500 --abort-on-oversize "$RSYSLOG_OUT_LOG" $NUMMESSAGES 6000
+ 
+ # add one message --> exactly 2GB
+ ./inputfilegen -m1 -d47 -i$NUMMESSAGES>> $RSYSLOG_DYNNAME.input
+diff --git a/tests/imfile-truncate-2GB-file.sh b/tests/imfile-truncate-2GB-file.sh
+index 67c9ac1..df45813 100755
+--- a/tests/imfile-truncate-2GB-file.sh
++++ b/tests/imfile-truncate-2GB-file.sh
+@@ -5,7 +5,7 @@
+ # adds a couple of messages to get it over 2GiB.
+ # This is part of the rsyslog testbench, licensed under ASL 2.0
+ . ${srcdir:=.}/diag.sh init
+-export TB_TEST_MAX_RUNTIME=3600 # test is very slow as it works on large files
++export TB_TEST_MAX_RUNTIME=8000 # test is very slow as it works on large files
+ generate_conf
+ add_conf '
+ module(load="../plugins/imfile/.libs/imfile")
+@@ -22,7 +22,7 @@ startup
+ ls -lh $RSYSLOG_DYNNAME.input
+ export NUMMESSAGES="$(cat $RSYSLOG_DYNNAME.msgcnt)"
+ 
+-wait_file_lines --delay 2500 --abort-on-oversize "$RSYSLOG_OUT_LOG" $NUMMESSAGES 3000
++wait_file_lines --delay 2500 --abort-on-oversize "$RSYSLOG_OUT_LOG" $NUMMESSAGES 6000
+ 
+ # add one message --> exactly 2GB
+ ./inputfilegen -m1 -d47 -i$NUMMESSAGES>> $RSYSLOG_DYNNAME.input
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d44f829
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Don-t-create-a-database.patch
+Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch