diff --git a/.gitignore b/.gitignore index e94caec..2f2c84c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ syslog-ng_3.1.1.tar.gz /syslog-ng-3.22.1.tar.gz /syslog-ng-3.23.1.tar.gz /syslog-ng-3.25.1.tar.gz +/syslog-ng-3.27.1.tar.gz diff --git a/sources b/sources index 6a1a912..185838f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syslog-ng-3.25.1.tar.gz) = 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13 +SHA512 (syslog-ng-3.27.1.tar.gz) = a845e27b76904841fbf47af8ec0af79916b8782e982d202889669e2f569cc7aa3af4d8da7d3f56bae223f335589cb20d5bab082c98339cd952e6a7de1e65aef4 diff --git a/syslog-ng.conf b/syslog-ng.conf index bc89c20..45aa8e3 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.25 +@version: 3.27 @include "scl.conf" # syslog-ng configuration file. diff --git a/syslog-ng.spec b/syslog-ng.spec index aef9a37..9f66768 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,14 +1,14 @@ %global ivykis_ver 0.42.3 %global syslog_ng_major_ver 3 -%global syslog_ng_minor_ver 25 +%global syslog_ng_minor_ver 27 %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: 4%{?dist} +Release: 1%{?dist} Summary: Next-generation syslog server License: GPLv2+ @@ -24,7 +24,6 @@ BuildRequires: flex BuildRequires: glib2-devel BuildRequires: hiredis-devel BuildRequires: ivykis-devel >= %{ivykis_ver} -BuildRequires: java-devel BuildRequires: json-c-devel BuildRequires: libcap-devel BuildRequires: libcurl-devel @@ -37,6 +36,7 @@ BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: libxslt BuildRequires: mongo-c-driver-devel +BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: perl-generators @@ -109,12 +109,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This module supports sending e-mail alerts through an smtp server. -%package java -Summary: Java destination support for syslog-ng +%package snmp +Summary: SNMP support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} - -%description java -This package provides java destination support for syslog-ng. + +%description snmp +This module adds support for SNMP destination. %package geoip @@ -227,8 +227,9 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" lib/merge-grammar.py --enable-amqp \ --enable-python \ --with-python=3 \ - --enable-java \ + --disable-java \ --disable-java-modules \ + --enable-afsnmp \ --enable-riemann make %{_smp_mflags} @@ -337,6 +338,10 @@ fi %{_bindir}/pdbtool %{_bindir}/persist-tool %{_bindir}/update-patterndb +%{_bindir}/slogkey +%{_bindir}/slogimport +%{_bindir}/slogverify + %{_libdir}/libevtlog-%{syslog_ng_major_minor_ver}.so.0 %{_libdir}/libevtlog-%{syslog_ng_major_minor_ver}.so.0.0.0 @@ -362,10 +367,10 @@ fi %exclude %{_libdir}/syslog-ng/libafsql.so %exclude %{_libdir}/syslog-ng/libgeoip2-plugin.so %exclude %{_libdir}/syslog-ng/libhttp.so -%exclude %{_libdir}/syslog-ng/libmod-java.so %exclude %{_libdir}/syslog-ng/libmod-python.so %exclude %{_libdir}/syslog-ng/libredis.so %exclude %{_libdir}/syslog-ng/libriemann.so +%exclude %{_libdir}/syslog-ng/libafsnmp.so %dir %{_datadir}/syslog-ng %{_datadir}/syslog-ng/syslog-ng.vim @@ -384,6 +389,10 @@ fi %{_mandir}/man1/dqtool.1* %{_mandir}/man5/syslog-ng.conf.5* %{_mandir}/man8/syslog-ng.8* +%{_mandir}/man1/slogkey.1* +%{_mandir}/man1/slogimport.1* +%{_mandir}/man1/slogverify.1* +%{_mandir}/man1/persist-tool.1* %files libdbi @@ -401,11 +410,8 @@ fi %files smtp %{_libdir}/syslog-ng/libafsmtp.so - -%files java -%attr(755,root,root) %{_libdir}/syslog-ng/libmod-java.so -%dir %{_libdir}/syslog-ng/java-modules/ -%{_libdir}/syslog-ng/java-modules/* +%files snmp +%{_libdir}/%{name}/libafsnmp.so %files geoip @@ -443,6 +449,13 @@ fi %changelog +* Wed Jun 10 2020 Peter Czanik - 3.27.1-1 +- update to 3.27.1 +- add secure logging files +- add persist-tool man page +- fix snmp support +- disable Java bindings (requires ancient JDK) + * Tue May 26 2020 Miro HronĨok - 3.25.1-4 - Rebuilt for Python 3.9