From edf8409c49e1400804ca49b9d3c17552d89dbc1b Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 5 Apr 2020 00:28:26 +0200
Subject: [PATCH] - updated to 3.26.1

---
 syslog-ng-nolibs.patch | 13 +++++++------
 syslog-ng-simple.conf  |  2 +-
 syslog-ng.conf         |  2 +-
 syslog-ng.spec         | 12 ++++++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
index 0906f47..62d743f 100644
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -1,17 +1,18 @@
---- 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 @@
+--- syslog-ng-3.26.1/configure.ac.orig	2020-04-04 21:37:22.891000000 +0200
++++ syslog-ng-3.26.1/configure.ac	2020-04-04 21:40:46.085000000 +0200
+@@ -767,11 +767,11 @@
  dnl ***************************************************************************
  dnl Checks for libraries
  AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
 -AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
 +AC_CHECK_FUNC([socket], [:], [AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")])
  AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt")
--AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")
+-AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl"))
 -AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")
 -AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")
 +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")])
++AC_CHECK_FUNC([resolv], [:], [AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")])
  
- 
- if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
+ AC_CHECK_FUNCS(strdup		\
+ 	strtol			\
diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index b71e3a4..691f933 100644
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,4 +1,4 @@
-@version: 3.25
+@version: 3.26
 #
 # Syslog-ng configuration for TLD Linux
 #
diff --git a/syslog-ng.conf b/syslog-ng.conf
index a94cf98..f845a44 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.25
+@version: 3.26
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux
diff --git a/syslog-ng.spec b/syslog-ng.spec
index bfc5323..1f63606 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -29,18 +29,18 @@
 %define	libivykis_version 0.42.4
 
 %define		glib2_ver	1:2.24.0
-%define		mver	3.25
-%define		docmver	3.25
+%define		mver	3.26
+%define		docmver	3.26
 Summary:	Syslog-ng - new generation of the system logger
 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.25.1
+Version:	3.26.1
 Release:	1
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	56fc16b4165b85e0cc221fce69d1ccf1
+# Source0-md5:	a0d2b117ff8fb9a25e94446271285b87
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
@@ -488,6 +488,7 @@ exit 0
 %attr(755,root,root) %{moduledir}/libafstomp.so
 %attr(755,root,root) %{moduledir}/libafuser.so
 %attr(755,root,root) %{moduledir}/libappmodel.so
+%attr(755,root,root) %{moduledir}/libazure-auth-header.so
 %attr(755,root,root) %{moduledir}/libbasicfuncs.so
 %attr(755,root,root) %{moduledir}/libcef.so
 %attr(755,root,root) %{moduledir}/libconfgen.so
@@ -565,6 +566,7 @@ exit 0
 %{_mandir}/man1/dqtool.1*
 %{_mandir}/man1/loggen.1*
 %{_mandir}/man1/pdbtool.1*
+%{_mandir}/man1/persist-tool.1*
 %{_mandir}/man1/syslog-ng-ctl.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
@@ -671,9 +673,11 @@ exit 0
 %{_includedir}/syslog-ng/logproto
 %{_includedir}/syslog-ng/logthrdest
 %{_includedir}/syslog-ng/logthrsource
+%{_includedir}/syslog-ng/modules
 %{_includedir}/syslog-ng/parser
 %{_includedir}/syslog-ng/rewrite
 %{_includedir}/syslog-ng/scanner
+%{_includedir}/syslog-ng/signal-slot-connector
 %{_includedir}/syslog-ng/stats
 %{_includedir}/syslog-ng/str-repr
 %{_includedir}/syslog-ng/template
-- 
2.46.0