X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=0b832ccff6a25d6562e5805c5948ee2fe16c14fb;hb=d44347bcdc512d7cf5d83baf2b730aa2d873ba01;hp=e8cd9fccd0e502143038cedeeeb509a90a684a8a;hpb=e6f743ed99776ecfa18bf2fe4e78e9778e72bca3;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index e8cd9fc..0b832cc 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -27,29 +27,29 @@
 %endif
 
 # as in git submodule
-%define	libivykis_version 0.42.2
+%define	libivykis_version 0.42.3
 
 %define		glib2_ver	1:2.24.0
-%define		mver	3.15
-%define		docmver	3.15
+%define		mver	3.16
+%define		docmver	3.16
 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.15.1
-Release:	1
+Version:	3.16.1
+Release:	2
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	ad97a307a9ae2f26615f0aa8f7ec320f
+# Source0-md5:	c00fac07d8403b44cb9a3942ad63b3d8
 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:	4c22ec5a700f29d4d8dacb2d7c14797d
+# Source4-md5:	8214f912f16cb4c456e1b2b8ef89f465
 Source5:	%{name}-simple.conf
 Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
-# Source6-md5:	aeafef422d8dafb84e1fcd16f9f4822e
+# Source6-md5:	4d84813d011ff671e66eccc952a5c78f
 Patch0:		%{name}-datadir.patch
 Patch1:		cap_syslog-vserver-workaround.patch
 Patch2:		%{name}-nolibs.patch
@@ -412,13 +412,19 @@ ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libevtlog-%{mver}.so.*.*
 
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so.* $RPM_BUILD_ROOT%{slibdir}
 ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsecret-storage.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so
+
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_helper-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_helper-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_helper.so
+
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_plugin-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin.so
 %endif
 
 %{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-for n in cron daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog; do
+for n in cron daemon debug kernel lpr maillog messages secure shorewall spooler syslog user xferlog; do
 	> $RPM_BUILD_ROOT/var/log/$n
 done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
@@ -428,6 +434,7 @@ ln -s "%{name}" $RPM_BUILD_ROOT/etc/sysconfig/%{name}@default
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/syslog-ng-debun.1
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{moduledir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{moduledir}/loggen/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -514,6 +521,9 @@ exit 0
 %attr(755,root,root) %{moduledir}/libhook-commands.so
 %attr(755,root,root) %{moduledir}/libkvformat.so
 %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so
+%dir %{moduledir}/loggen
+%attr(755,root,root) %{moduledir}/loggen/libloggen_socket_plugin.so
+%attr(755,root,root) %{moduledir}/loggen/libloggen_ssl_plugin.so
 %attr(755,root,root) %{moduledir}/libmap-value-pairs.so
 %attr(755,root,root) %{moduledir}/libpacctformat.so
 %attr(755,root,root) %{moduledir}/libpseudofile.so
@@ -535,7 +545,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl
 %{_datadir}/syslog-ng/include/scl/apache
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
-%{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
@@ -543,8 +552,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
 %{_datadir}/syslog-ng/include/scl/loadbalancer/plugin.conf
-%{_datadir}/syslog-ng/include/scl/loggly
-%{_datadir}/syslog-ng/include/scl/logmatic
 %{_datadir}/syslog-ng/include/scl/mbox
 %{_datadir}/syslog-ng/include/scl/nodejs
 %{_datadir}/syslog-ng/include/scl/osquery
@@ -573,12 +580,12 @@ exit 0
 %attr(640,root,logs) %ghost /var/log/cron
 %attr(640,root,logs) %ghost /var/log/daemon
 %attr(640,root,logs) %ghost /var/log/debug
-%attr(640,root,logs) %ghost /var/log/iptables
 %attr(640,root,logs) %ghost /var/log/kernel
 %attr(640,root,logs) %ghost /var/log/lpr
 %attr(640,root,logs) %ghost /var/log/maillog
 %attr(640,root,logs) %ghost /var/log/messages
 %attr(640,root,logs) %ghost /var/log/secure
+%attr(640,root,logs) %ghost /var/log/shorewall
 %attr(640,root,logs) %ghost /var/log/spooler
 %attr(640,root,logs) %ghost /var/log/syslog
 %attr(640,root,logs) %ghost /var/log/user
@@ -606,6 +613,7 @@ exit 0
 %files module-http
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/libhttp.so
+%{_datadir}/syslog-ng/include/scl/telegram
 %endif
 
 %if %{with json}
@@ -614,8 +622,11 @@ exit 0
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
 %{_datadir}/syslog-ng/include/scl/cim
 %{_datadir}/syslog-ng/include/scl/cisco
+%{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/ewmm
 %{_datadir}/syslog-ng/include/scl/graylog2
+%{_datadir}/syslog-ng/include/scl/loggly
+%{_datadir}/syslog-ng/include/scl/logmatic
 %endif
 
 %if %{with redis}
@@ -640,6 +651,10 @@ exit 0
 %defattr(644,root,root,755)
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.*.*.*
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.0
+%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.*.*.*
+%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.0
+%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.*.*.*
+%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.0
 %attr(755,root,root) %{slibdir}/libsecret-storage.so.*.*.*
 %attr(755,root,root) %{slibdir}/libsecret-storage.so.0
 %attr(755,root,root) %{slibdir}/libsyslog-ng-%{mver}.so.*.*.*
@@ -649,6 +664,8 @@ exit 0
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libevtlog.so
+%attr(755,root,root) %{_libdir}/libloggen_helper.so
+%attr(755,root,root) %{_libdir}/libloggen_plugin.so
 %attr(755,root,root) %{_libdir}/libsecret-storage.so
 %attr(755,root,root) %{_libdir}/libsyslog-ng.so
 %{_libdir}/libsyslog-ng-native-connector.a