From 6c576b9c6426bc6b5118c7547a0e79c84401a0a0 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 29 Jan 2015 08:20:34 +0000
Subject: [PATCH] - updated for 3.6.2

---
 syslog-ng-datadir.patch | 36 +++++++++++++++++++++++-------------
 syslog-ng-systemd.patch | 13 ++++++-------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index 9eb4631..f8e59df 100644
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,27 +1,37 @@
---- syslog-ng-3.2.2/lib/syslog-ng.h~	2011-01-04 12:57:06.000000000 +0100
-+++ syslog-ng-3.2.2/lib/syslog-ng.h	2011-01-17 19:31:46.933293237 +0100
-@@ -47,10 +47,10 @@
+diff -urNp syslog-ng-3.6.2.orig/lib/syslog-ng.h syslog-ng-3.6.2/lib/syslog-ng.h
+--- syslog-ng-3.6.2.orig/lib/syslog-ng.h	2014-12-15 14:48:45.000000000 +0000
++++ syslog-ng-3.6.2/lib/syslog-ng.h	2015-01-28 21:25:42.469000000 +0000
+@@ -42,7 +42,7 @@
+ #if ENABLE_ENV_WRAPPER
  #define PATH_SYSLOGNG           PATH_LIBEXECDIR "/syslog-ng"
  #endif
- 
 -#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
--#define PATH_QDISK              PATH_LOCALSTATEDIR
++#define PATH_PERSIST_CONFIG     "/var/lib/syslog-ng/syslog-ng.persist"
+ 
+ #define SAFE_STRING(x) ((x) ? (x) : "NULL")
+ 
+diff -urNp syslog-ng-3.6.2.orig/modules/dbparser/dbparser.h syslog-ng-3.6.2/modules/dbparser/dbparser.h
+--- syslog-ng-3.6.2.orig/modules/dbparser/dbparser.h	2014-12-15 14:48:45.000000000 +0000
++++ syslog-ng-3.6.2/modules/dbparser/dbparser.h	2015-01-28 21:26:58.719000000 +0000
+@@ -27,8 +27,8 @@
+ #include "parser/parser-expr.h"
+ #include "patterndb.h"
+ 
 -#define PATH_PATTERNDB_FILE     PATH_LOCALSTATEDIR "/patterndb.xml"
 -#define PATH_XSDDIR             PATH_DATADIR "/xsd"
-+#define PATH_PERSIST_CONFIG     "/var/lib/syslog-ng/syslog-ng.persist"
-+#define PATH_QDISK              "/var/lib/syslog-ng"
 +#define PATH_PATTERNDB_FILE     "/var/lib/syslog-ng/patterndb.xml"
 +#define PATH_XSDDIR             "/var/lib/syslog-ng/xsd"
  
- #define LOG_PRIORITY_LISTEN 0
- #define LOG_PRIORITY_READER 0
---- syslog-ng-3.2.2/scripts/update-patterndb.in~	2010-11-20 09:47:33.000000000 +0100
-+++ syslog-ng-3.2.2/scripts/update-patterndb.in	2011-01-27 20:43:14.656000204 +0100
-@@ -3,6 +3,6 @@
+ typedef struct _LogDBParser LogDBParser;
+ 
+diff -urNp syslog-ng-3.6.2.orig/scripts/update-patterndb.in syslog-ng-3.6.2/scripts/update-patterndb.in
+--- syslog-ng-3.6.2.orig/scripts/update-patterndb.in	2014-12-15 14:48:45.000000000 +0000
++++ syslog-ng-3.6.2/scripts/update-patterndb.in	2015-01-28 21:24:20.398000000 +0000
+@@ -3,6 +3,6 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
  sysconfdir=@sysconfdir@
 -localstatedir=@localstatedir@
 +localstatedir=/var/lib/syslog-ng
  
- ${bindir}/pdbtool merge -r --glob *.pdb -D ${sysconfdir}/patterndb.d -p ${localstatedir}/patterndb.xml
+ ${bindir}/pdbtool merge -r --glob \*.pdb -D ${sysconfdir}/patterndb.d -p ${localstatedir}/patterndb.xml
diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index ee401fc..2d0a3ca 100644
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -1,15 +1,14 @@
---- syslog-ng-3.5.2/contrib/systemd/syslog-ng.service~	2013-09-17 17:43:11.000000000 +0200
-+++ syslog-ng-3.5.2/contrib/systemd/syslog-ng.service	2013-12-01 22:50:06.249492652 +0100
-@@ -3,9 +3,11 @@
+--- syslog-ng-3.6.2/contrib/systemd/syslog-ng.service	2015-01-28 21:29:05.450000000 +0000
++++ syslog-ng-3.6.2/contrib/systemd/syslog-ng.service	2015-01-28 21:30:25.166000000 +0000
+@@ -3,8 +3,10 @@
  Documentation=man:syslog-ng(8)
  
  [Service]
 +EnvironmentFile=-/etc/sysconfig/syslog-ng
  Type=notify
- Sockets=syslog.socket
 -ExecStart=/usr/sbin/syslog-ng -F
 +ExecStartPre=-/bin/systemctl stop systemd-kmsg-syslogd.service
-+ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024
++ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=102
  ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
- Restart=on-failure
+ StandardOutput=journal
+ StandardError=journal
-- 
2.44.0