- rel 2; rediff patches

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index efdcf86d5cc86d759eed7c2a6fc38be6d482abfb..dee6375812b634fe6943c2c0a1e04d2132c996aa 100644 (file)
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,8 +1,9 @@
-FIXME: drop this patch and just fix PATH_LOCALSTATEDIR ?
 
+ -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
+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"
@@ -12,13 +13,14 @@ FIXME: drop this patch and just fix PATH_LOCALSTATEDIR ?
  
  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 @@
+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
+ ${bindir}/pdbtool merge -r --glob \*.pdb -D ${sysconfdir}/patterndb.d -p ${localstatedir}/patterndb.xml

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 7ce274fe7deb751bb0634c82ec9ea65b13c871c9..382f8f2ae3a0ada0e66ed8dbe9be0c5527d30153 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,7 +1,7 @@
-diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-syslog-ng-3.14.1/configure.ac
---- syslog-ng-syslog-ng-3.14.1.orig/configure.ac       2018-04-03 09:50:19.000000000 +0200
-+++ syslog-ng-syslog-ng-3.14.1/configure.ac    2018-04-03 09:51:38.000000000 +0200
-@@ -1626,9 +1626,9 @@ if test "x$linking_mode" = "xdynamic"; t
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
+--- syslog-ng-3.29.1.org/configure.ac  2021-02-28 14:27:09.946954361 +0100
++++ syslog-ng-3.29.1/configure.ac      2021-02-28 14:27:10.230296549 +0100
+@@ -1775,9 +1775,9 @@ if test "x$linking_mode" = "xdynamic"; t
        # syslog-ng binary is linked with the default link command (e.g. libtool)
        SYSLOGNG_LINK='$(LINK)'
  else
@@ -13,10 +13,10 @@ diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-sys
  
        # bypass libtool in case we want to do mixed linking because it
        # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
-diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am
---- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am     2018-02-26 15:32:28.000000000 +0100
-+++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am  2018-04-03 09:50:43.000000000 +0200
-@@ -24,8 +24,7 @@ lib_logproto_tests_test_findeom_CFLAGS       =
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am syslog-ng-3.29.1/lib/logproto/tests/Makefile.am
+--- syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am        2020-08-10 20:04:39.000000000 +0200
++++ syslog-ng-3.29.1/lib/logproto/tests/Makefile.am    2021-02-28 14:27:10.230296549 +0100
+@@ -23,7 +23,6 @@ lib_logproto_tests_test_findeom_CFLAGS       =
        $(TEST_CFLAGS) \
        -I${top_srcdir}/libtest
  lib_logproto_tests_test_findeom_LDADD = \
@@ -24,4 +24,3 @@ diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefil
        ${top_builddir}/libtest/libsyslog-ng-test.a \
        $(TEST_LDADD)
  lib_logproto_tests_test_findeom_SOURCES = \
-

diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
index fabd57b2fdacbce909fb2a1ba6210c98183a7bf1..8c40a2383805955b3b47346223f5c47139810591 100644 (file)
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -1,6 +1,7 @@
---- syslog-ng-3.3.1/configure.ac.orig  2011-09-29 08:35:39.000000000 +0200
-+++ syslog-ng-3.3.1/configure.ac       2011-11-11 10:37:51.371629795 +0100
-@@ -465,11 +465,10 @@
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
+--- syslog-ng-3.29.1.org/configure.ac  2020-08-28 14:08:43.000000000 +0200
++++ syslog-ng-3.29.1/configure.ac      2021-02-28 14:26:43.099448649 +0100
+@@ -765,11 +765,10 @@ fi
  dnl ***************************************************************************
  dnl Checks for libraries
  AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
@@ -13,5 +14,5 @@
 +AC_CHECK_FUNC([gethostbyname], [:], [AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")])
 +AC_CHECK_FUNC([regexec], [:], [AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")])
  
- 
- if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
+ AC_CHECK_FUNCS(strdup         \
+       strtol                  \

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1a7b82052486f54c8f4a7c91c836abb0090ad5fb..8b76ee1f45c9b69d2fc2f62502e35cb6da340dde 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -39,7 +39,7 @@ Summary(pl.UTF-8):    Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.29.1
-Release:       1
+Release:       2
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 #Source0Download: https://github.com/syslog-ng/syslog-ng/releases