- release 2

[packages/syslog-ng.git] / syslog-ng-datadir.patch

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index 1811c06bca687e61c3f8eb722ed9947df963b981..9eb46317a2ef0178d108f0fb0740beda38c09fb0 100644 (file)
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,12 +1,27 @@
-diff -ur syslog-ng-2.0.6.orig/src/syslog-ng.h syslog-ng-2.0.6/src/syslog-ng.h
---- syslog-ng-2.0.6.orig/src/syslog-ng.h       2007-09-22 16:16:15.000000000 +0200
-+++ syslog-ng-2.0.6/src/syslog-ng.h    2007-12-08 08:25:22.000000000 +0100
-@@ -38,7 +38,7 @@
+--- 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 @@
+ #define PATH_SYSLOGNG           PATH_LIBEXECDIR "/syslog-ng"
+ #endif
  
- #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
- #define PATH_PIDFILE            "/var/run/syslog-ng.pid"
 -#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
+-#define PATH_QDISK              PATH_LOCALSTATEDIR
+-#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 @@
+ 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