diff --git a/.gitignore b/.gitignore index 94bfbe2..799471c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ syslog-ng_3.1.1.tar.gz /syslog-ng-3.11.1.tar.gz /syslog-ng-3.14.1.tar.gz /syslog-ng-3.15.1.tar.gz +/syslog-ng-3.16.1.tar.gz diff --git a/sources b/sources index ba4da99..e5ea4b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syslog-ng-3.15.1.tar.gz) = 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13 +SHA512 (syslog-ng-3.16.1.tar.gz) = 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999 diff --git a/syslog-ng.conf b/syslog-ng.conf index 2d2967f..4a8aef4 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:3.15 +@version:3.16 @include "scl.conf" # syslog-ng configuration file. diff --git a/syslog-ng.spec b/syslog-ng.spec index 2abfeaf..239ee34 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,13 +1,19 @@ -%global ivykis_ver 0.42.2 +%global ivykis_ver 0.42.3 -Name: syslog-ng -Version: 3.15.1 -Release: 3%{?dist} +%global syslog_ng_major_ver 3 +%global syslog_ng_minor_ver 16 +%global syslog_ng_patch_ver 1 +%global syslog_ng_major_minor_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver} +%global syslog_ng_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver}.%{syslog_ng_patch_ver} + +Name: syslog-ng +Version: %{syslog_ng_ver} +Release: 1%{?dist} Summary: Next-generation syslog server -Group: System Environment/Daemons +Group: System Environment/Daemons License: GPLv2+ -URL: https://syslog-ng.org/ +URL: https://syslog-ng.org/ Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz Source1: syslog-ng.conf Source2: syslog-ng.logrotate @@ -65,7 +71,7 @@ Obsoletes: syslog-ng-vim < 2.0.8-1 # Fedora 17’s unified filesystem (/usr-move) Conflicts: filesystem < 3 -Obsoletes: syslog-ng-json +Obsoletes: syslog-ng-json < 3.8 %description syslog-ng is an enhanced log daemon, supporting a wide range of input and @@ -304,45 +310,63 @@ fi %doc AUTHORS COPYING NEWS.md %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%dir %{_sysconfdir}/%{name}/patterndb.d -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/%{name}/scl.conf +%dir %{_sysconfdir}/syslog-ng +%dir %{_sysconfdir}/syslog-ng/conf.d +%dir %{_sysconfdir}/syslog-ng/patterndb.d %config(noreplace) %{_sysconfdir}/logrotate.d/syslog -%{_unitdir}/%{name}.service +%config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf +%config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf -%dir %{_sharedstatedir}/%{name} -%{_sbindir}/%{name} -%{_sbindir}/%{name}-debun +%{_unitdir}/syslog-ng.service + +%dir %{_sharedstatedir}/syslog-ng + +%{_sbindir}/syslog-ng %{_sbindir}/syslog-ng-ctl +%{_sbindir}/syslog-ng-debun + +%{_bindir}/dqtool %{_bindir}/loggen %{_bindir}/pdbtool -%{_bindir}/dqtool %{_bindir}/update-patterndb -%{_libdir}/lib%{name}-*.so.* -%{_libdir}/libevtlog-*.so.* -%{_libdir}/libsecret-storage.so.* -%{_libdir}/%{name}/*.so -%exclude %{_libdir}/%{name}/libafsql.so -%exclude %{_libdir}/%{name}/libafmongodb.so -%exclude %{_libdir}/%{name}/libredis.so -%exclude %{_libdir}/%{name}/libafsmtp.so -%exclude %{_libdir}/%{name}/libriemann.so -%exclude %{_libdir}/%{name}/libgeoip-plugin.so -%exclude %{_libdir}/%{name}/libgeoip2-plugin.so -%exclude %{_libdir}/%{name}/libhttp.so -%exclude %{_libdir}/%{name}/libmod-java.so -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/syslog-ng.vim +%{_libdir}/libevtlog-%{syslog_ng_major_minor_ver}.so.0 +%{_libdir}/libevtlog-%{syslog_ng_major_minor_ver}.so.0.0.0 +%{_libdir}/libloggen_helper-%{syslog_ng_major_minor_ver}.so.0 +%{_libdir}/libloggen_helper-%{syslog_ng_major_minor_ver}.so.0.0.0 +%{_libdir}/libloggen_plugin-%{syslog_ng_major_minor_ver}.so.0 +%{_libdir}/libloggen_plugin-%{syslog_ng_major_minor_ver}.so.0.0.0 +%{_libdir}/libsecret-storage.so.0 +%{_libdir}/libsecret-storage.so.0.0.0 +%{_libdir}/libsyslog-ng-%{syslog_ng_major_minor_ver}.so.0 +%{_libdir}/libsyslog-ng-%{syslog_ng_major_minor_ver}.so.0.0.0 + +%dir %{_libdir}/syslog-ng +%{_libdir}/syslog-ng/*.so + +%dir %{_libdir}/syslog-ng/loggen +%{_libdir}/syslog-ng/loggen/libloggen_socket_plugin.so +%{_libdir}/syslog-ng/loggen/libloggen_ssl_plugin.so + +%exclude %{_libdir}/syslog-ng/libafmongodb.so +%exclude %{_libdir}/syslog-ng/libafsmtp.so +%exclude %{_libdir}/syslog-ng/libafsql.so +%exclude %{_libdir}/syslog-ng/libgeoip2-plugin.so +%exclude %{_libdir}/syslog-ng/libgeoip-plugin.so +%exclude %{_libdir}/syslog-ng/libhttp.so +%exclude %{_libdir}/syslog-ng/libmod-java.so +%exclude %{_libdir}/syslog-ng/libredis.so +%exclude %{_libdir}/syslog-ng/libriemann.so + +%dir %{_datadir}/syslog-ng +%{_datadir}/syslog-ng/syslog-ng.vim %ghost %{_datadir}/vim/ # scl files -%{_datadir}/%{name}/include/ +%{_datadir}/syslog-ng/include/ # uhm, some better places for those? -%{_datadir}/%{name}/xsd/ +%{_datadir}/syslog-ng/xsd/ %{_mandir}/man1/loggen.1* %{_mandir}/man1/pdbtool.1* @@ -353,44 +377,49 @@ fi %{_mandir}/man8/syslog-ng.8* %files libdbi -%{_libdir}/%{name}/libafsql.so +%{_libdir}/syslog-ng/libafsql.so %files mongodb -%{_libdir}/%{name}/libafmongodb.so +%{_libdir}/syslog-ng/libafmongodb.so %files redis -%{_libdir}/%{name}/libredis.so +%{_libdir}/syslog-ng/libredis.so %files smtp -%{_libdir}/%{name}/libafsmtp.so +%{_libdir}/syslog-ng/libafsmtp.so %files java %attr(755,root,root) %{_libdir}/syslog-ng/libmod-java.so -%dir %{_libdir}/%{name}/java-modules/ -%{_libdir}/%{name}/java-modules/* +%dir %{_libdir}/syslog-ng/java-modules/ +%{_libdir}/syslog-ng/java-modules/* %files geoip -%{_libdir}/%{name}/libgeoip-plugin.so -%{_libdir}/%{name}/libgeoip2-plugin.so +%{_libdir}/syslog-ng/libgeoip-plugin.so +%{_libdir}/syslog-ng/libgeoip2-plugin.so %files riemann -%{_libdir}/%{name}/libriemann.so +%{_libdir}/syslog-ng/libriemann.so %files http -%{_libdir}/%{name}/libhttp.so +%{_libdir}/syslog-ng/libhttp.so %files devel -%{_libdir}/libsyslog-ng.so -%{_libdir}/libsyslog-ng-native-connector.a +%{_datadir}/syslog-ng/tools/ +%{_includedir}/syslog-ng/ %{_libdir}/libevtlog.so +%{_libdir}/libloggen_helper.so +%{_libdir}/libloggen_plugin.so %{_libdir}/libsecret-storage.so -%{_includedir}/%{name}/ -%{_libdir}/pkgconfig/syslog-ng.pc +%{_libdir}/libsyslog-ng-native-connector.a +%{_libdir}/libsyslog-ng.so %{_libdir}/pkgconfig/syslog-ng-native-connector.pc -%{_datadir}/%{name}/tools/ +%{_libdir}/pkgconfig/syslog-ng.pc %changelog +* Wed Jun 20 2018 My Karlsson - 3.16.1-1 +- Update to version 3.16.1 + * Fri Jun 8 2018 Remi Collet - 3.15.1-3 - rebuild with libbson and libmongc 1.10.2 (soname back to 0)