From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 15 Dec 2019 23:24:09 +0000 (+0100)
Subject: - updated to 3.25.1
X-Git-Url: https://git.tld-linux.org/?p=packages%2Fsyslog-ng.git;a=commitdiff_plain;h=b1edae0d8502a9189fc73cf290e50bd0b93de085

- updated to 3.25.1
---

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index ce07958..b71e3a4 100644
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,4 +1,4 @@
-@version: 3.23
+@version: 3.25
 #
 # Syslog-ng configuration for TLD Linux
 #
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 46793a8..a94cf98 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.23
+@version: 3.25
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 278486d..bfc5323 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -13,7 +13,6 @@
 %bcond_without	mongodb			# support for mongodb destination
 %bcond_without	redis			# support for Redis destination
 %bcond_without	smtp			# support for logging into SMTP
-%bcond_without	geoip			# support for GeoIP
 %bcond_without	geoip2			# support for GeoIP2
 %bcond_without	riemann			# support for Riemann monitoring system
 %bcond_without	amqp			# AMQP support
@@ -30,23 +29,23 @@
 %define	libivykis_version 0.42.4
 
 %define		glib2_ver	1:2.24.0
-%define		mver	3.23
-%define		docmver	3.23
+%define		mver	3.25
+%define		docmver	3.25
 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.23.1
+Version:	3.25.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:	05fbee31597a73148387e943a327fc95
+# Source0-md5:	56fc16b4165b85e0cc221fce69d1ccf1
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
 Source4:	https://syslog-ng.com/documents/html/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-guide-admin/pdf/syslog-ng-ose-guide-admin.pdf
-# Source4-md5:	46b021e8b47ddbe15bfc9134aa54c183
+# Source4-md5:	306cd320be8237a8587e531b4b64a18c
 Source5:	%{name}-simple.conf
 Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # Source6-md5:	e09caeb95a01a541ec40d3b757dada12
@@ -57,7 +56,6 @@ Patch3:		%{name}-link.patch
 Patch4:		no_shared_ivykis.patch
 Patch5:		bison.patch
 URL:		https://syslog-ng.org/
-%{?with_geoip:BuildRequires:	GeoIP-devel >= 1.5.1}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	bison >= 2.4
@@ -117,6 +115,7 @@ Provides:	service(syslog)
 Provides:	syslogdaemon
 Obsoletes:	syslog-ng-module-afsocket
 Obsoletes:	syslog-ng-module-dbparser
+Obsoletes:	syslog-ng-module-tfgeoip
 Obsoletes:	syslog-ng-systemd
 Conflicts:	klogd
 Conflicts:	msyslog
@@ -260,22 +259,6 @@ Riemann destination support module for syslog-ng.
 %description module-riemann -l pl.UTF-8
 Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann.
 
-%package module-tfgeoip
-Summary:	syslog-ng template function module to get GeoIP info from an IPv4 addresses
-Summary(pl.UTF-8):	Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z adresów IPv4
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	GeoIP-db-Country
-Requires:	GeoIP-libs >= 1.5.1
-
-%description module-tfgeoip
-syslog-ng template function module to get GeoIP info from an IPv4
-addresses.
-
-%description module-tfgeoip -l pl.UTF-8
-Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z
-adresów IPv4.
-
 %package libs
 Summary:	Shared library for syslog-ng
 Summary(pl.UTF-8):	Biblioteka współdzielona sysloga-ng
@@ -357,7 +340,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 	--with-pidfile-dir=/var/run \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
 	%{__enable_disable amqp} \
-	%{__enable_disable geoip} \
 	%{__enable_disable geoip2} \
 	--enable-http%{!?with_http:=no} \
 	--enable-ipv6 \
@@ -511,7 +493,6 @@ exit 0
 %attr(755,root,root) %{moduledir}/libconfgen.so
 %attr(755,root,root) %{moduledir}/libcryptofuncs.so
 %attr(755,root,root) %{moduledir}/libcsvparser.so
-%attr(755,root,root) %{moduledir}/libdate.so
 %attr(755,root,root) %{moduledir}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
 %attr(755,root,root) %{moduledir}/libexamples.so
@@ -533,6 +514,7 @@ exit 0
 %attr(755,root,root) %{moduledir}/libstardate.so
 %attr(755,root,root) %{moduledir}/libtags-parser.so
 %attr(755,root,root) %{moduledir}/libtfgetent.so
+%attr(755,root,root) %{moduledir}/libtimestamp.so
 %attr(755,root,root) %{moduledir}/libxml.so
 %attr(755,root,root) %{moduledir}/libsyslogformat.so
 %attr(755,root,root) %{moduledir}/libsystem-source.so
@@ -652,12 +634,6 @@ exit 0
 %attr(755,root,root) %{moduledir}/libriemann.so
 %endif
 
-%if %{with geoip}
-%files module-tfgeoip
-%defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libgeoip-plugin.so
-%endif
-
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.*.*.*
@@ -695,8 +671,6 @@ exit 0
 %{_includedir}/syslog-ng/logproto
 %{_includedir}/syslog-ng/logthrdest
 %{_includedir}/syslog-ng/logthrsource
-%dir %{_includedir}/syslog-ng/modules
-%{_includedir}/syslog-ng/modules/add-contextual-data
 %{_includedir}/syslog-ng/parser
 %{_includedir}/syslog-ng/rewrite
 %{_includedir}/syslog-ng/scanner