X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng-datadir.patch;h=efdcf86d5cc86d759eed7c2a6fc38be6d482abfb;hb=349922be36c9acd086f70cce76aa702e70fc24fa;hp=1811c06bca687e61c3f8eb722ed9947df963b981;hpb=47c47d1d40c0f46f2e407be50a3d836deee58469;p=packages%2Fsyslog-ng.git diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch index 1811c06..efdcf86 100644 --- a/syslog-ng-datadir.patch +++ b/syslog-ng-datadir.patch @@ -1,12 +1,24 @@ -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 @@ - - #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" +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 SYSLOG_NG_ENABLE_ENV_WRAPPER + #define PATH_SYSLOGNG SYSLOG_NG_PATH_LIBEXECDIR "/syslog-ng" + #endif +-#define PATH_PERSIST_CONFIG SYSLOG_NG_PATH_LOCALSTATEDIR "/syslog-ng.persist" +#define PATH_PERSIST_CONFIG "/var/lib/syslog-ng/syslog-ng.persist" - #define LOG_PRIORITY_LISTEN 0 - #define LOG_PRIORITY_READER 0 + 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