- rel 2; rediff patches

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

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index 5dfe596e983e36cc02a1cd676415eef4fa28c83d..dee6375812b634fe6943c2c0a1e04d2132c996aa 100644 (file)
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,16 +1,26 @@
-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
-@@ -50,9 +50,9 @@
- #define PATH_SYSLOGNG           PATH_PREFIX "/libexec/syslog-ng"
+
+ -FIXME: drop this patch and just fix PATH_LOCALSTATEDIR ?
+
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/syslog-ng.h syslog-ng-3.29.1/lib/syslog-ng.h
+--- syslog-ng-3.29.1.org/lib/syslog-ng.h       2020-08-28 14:08:43.000000000 +0200
++++ syslog-ng-3.29.1/lib/syslog-ng.h   2021-02-28 14:25:45.374311232 +0100
+@@ -42,7 +42,7 @@
+ #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_QDISK              PATH_LOCALSTATEDIR
--#define PATH_PATTERNDB_FILE     PATH_LOCALSTATEDIR "/patterndb.xml"
+-#define PATH_PERSIST_CONFIG     SYSLOG_NG_PATH_LOCALSTATEDIR "/syslog-ng.persist"
 +#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 LOG_PRIORITY_LISTEN 0
- #define LOG_PRIORITY_READER 0
+ typedef struct _LogPipe LogPipe;
+ typedef struct _LogMessage LogMessage;
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/scripts/update-patterndb.in syslog-ng-3.29.1/scripts/update-patterndb.in
+--- syslog-ng-3.29.1.org/scripts/update-patterndb.in   2020-08-10 20:04:39.000000000 +0200
++++ syslog-ng-3.29.1/scripts/update-patterndb.in       2021-02-28 14:25:45.374311232 +0100
+@@ -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