- merged 3.14.1 from PLD

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

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index f8e59df0addc354708215311147e4111ac8c52f7..efdcf86d5cc86d759eed7c2a6fc38be6d482abfb 100644 (file)
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,37 +1,24 @@
-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
+FIXME: drop this patch and just fix PATH_LOCALSTATEDIR ?
+
+
+--- syslog-ng-3.6.2/lib/syslog-ng.h~   2014-12-15 16:48:45.000000000 +0200
++++ syslog-ng-3.6.2/lib/syslog-ng.h    2015-06-01 08:04:18.542588343 +0300
 @@ -42,7 +42,7 @@
- #if ENABLE_ENV_WRAPPER
- #define PATH_SYSLOGNG           PATH_LIBEXECDIR "/syslog-ng"
+ #if SYSLOG_NG_ENABLE_ENV_WRAPPER
+ #define PATH_SYSLOGNG           SYSLOG_NG_PATH_LIBEXECDIR "/syslog-ng"
  #endif
--#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
+-#define PATH_PERSIST_CONFIG     SYSLOG_NG_PATH_LOCALSTATEDIR "/syslog-ng.persist"
 +#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_PATTERNDB_FILE     "/var/lib/syslog-ng/patterndb.xml"
-+#define PATH_XSDDIR             "/var/lib/syslog-ng/xsd"
- 
- 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@
+ typedef struct _LogPipe LogPipe;
+ typedef struct _LogMessage LogMessage;
+--- 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
+ ${bindir}/pdbtool merge -r --glob *.pdb -D ${sysconfdir}/patterndb.d -p ${localstatedir}/patterndb.xml