%endif
# as in git submodule
-%define libivykis_version 0.42.2
+%define libivykis_version 0.42.4
-%define glib2_ver 1:2.26.1
-%define mver 3.27
+%define glib2_ver 1:2.28
+%define mver 3.36
%define docmver 3.12
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.27.1
-Release: 2
+Version: 3.36.1
+Release: 6
License: GPL v2+ with OpenSSL exception
Group: Daemons
-Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5: 8d836a470d9c43c5b51181bad238540b
+#Source0Download: https://github.com/syslog-ng/syslog-ng/releases
+Source0: https://github.com/syslog-ng/syslog-ng/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: a3a39aa2c65c4d291f96ab560ea7a4f9
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.logrotate
Source4: http://www.balabit.com/support/documentation/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-v%{docmver}-guide-admin/pdf/%{name}-ose-v%{docmver}-guide-admin.pdf
# Source4-md5: fce7075b03ba9501911b9812a553e680
Source5: %{name}-simple.conf
+%if 0
+# for git archives (release tarballs include ivykis)
+#Source6Download: https://github.com/buytenh/ivykis/releases
Source6: https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
-# Source6-md5: aeafef422d8dafb84e1fcd16f9f4822e
+# Source6-md5: e09caeb95a01a541ec40d3b757dada12
+%endif
Source7: syslog-ng.service
Patch0: %{name}-datadir.patch
-Patch1: %{name}-types.patch
Patch2: %{name}-nolibs.patch
Patch3: %{name}-systemd.patch
Patch4: man-paths.patch
Patch5: %{name}-link.patch
Patch6: no_shared_ivykis.patch
Patch7: 32bit.patch
+Patch8: openssl3.patch
+Patch9: glib-static.patch
URL: https://syslog-ng.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
%{?with_mongodb:BuildRequires: mongo-c-driver-devel >= 1.0.0}
%{?with_geoip2:BuildRequires: libmaxminddb-devel}
BuildRequires: libnet-devel >= 1:1.1.2.1-3
-%{?with_kafka:BuildRequires: librdkafka-devel >= 1.0.0}
+%{?with_kafka:BuildRequires: librdkafka-devel >= 1.1.0}
BuildRequires: libtool >= 2:2.0
BuildRequires: libwrap-devel
BuildRequires: libxslt-progs
BuildRequires: lz4-devel >= r131-5
+BuildRequires: net-snmp-devel
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: pcre-devel >= 6.1
BuildRequires: pkgconfig
%{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.6.0}
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.623
-%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
+%{?with_systemd:BuildRequires: systemd-devel >= 1:245}
BuildRequires: which
%if %{with tests}
BuildRequires: GeoIP-db-Country
Provides: service(klogd)
Provides: service(syslog)
Provides: syslogdaemon
-Obsoletes: syslog-ng-module-afsocket
-Obsoletes: syslog-ng-module-dbparser
-Obsoletes: syslog-ng-systemd
+Obsoletes: syslog-ng-module-afsocket < 3.3.1-4
+Obsoletes: syslog-ng-module-dbparser < 3.3.1-4
+Obsoletes: syslog-ng-systemd < 3.3.4-3
Conflicts: klogd
Conflicts: msyslog
Conflicts: rsyslog
Group: Libraries
Requires: %{name} = %{version}-%{release}
Requires: json-c >= 0.9
-Obsoletes: syslog-ng-module-tfjson
+Obsoletes: syslog-ng-module-tfjson < 3.4.2
%description module-json-plugin
JSON formatting template function for syslog-ng.
Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów poprzez protokół Apache Kafka
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: librdkafka >= 1.0.0
+Requires: librdkafka >= 1.1.0
%description module-kafka
Apache Kafka destination support module for syslog-ng.
%if %{with dynamic}
Requires: eventlog >= 0.2.12
Requires: glib2 >= %{glib2_ver}
-%{?with_system_libivykis:Requires: libivykis >= 0.42}
+%{?with_system_libivykis:Requires: libivykis >= %{libivykis_version}}
Requires: pcre >= 6.1
%endif
+%{?with_systemd:Requires: systemd-libs >= 1:245}
Conflicts: syslog-ng < 3.3.1-3
%description libs
%if %{with dynamic}
Requires: eventlog-devel >= 0.2.12
Requires: glib2-devel >= %{glib2_ver}
-%{?with_system_libivykis:Requires: libivykis-devel >= 0.42}
+%{?with_system_libivykis:Requires: libivykis-devel >= %{libivykis_version}}
Requires: pcre-devel >= 6.1
%endif
Pakiet pomocniczy do testowania modułów sysloga-ng.
%prep
+%if 1
+# release tarball
+%setup -q
+%else
+# git archive
%setup -q -n %{name}-%{name}-%{version} -a 6
rmdir lib/ivykis
%{__mv} ivykis-%{libivykis_version} lib/ivykis
+%endif
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
cp -p %{SOURCE4} doc
cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
%{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' lib/merge-grammar.py
+%{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' lib/merge-grammar.py
%build
for i in . ; do
%{__make}
-
%if %{with tests}
LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:")
PYTHONPATH=$(pwd)/tests/functional
%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
+sed -e 's,#VERSION#,%{mver},' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}
%triggerpostun -- syslog-ng < 3.3.4-3
%systemd_trigger syslog-ng@.service syslog-ng.service
-%triggerun -- syslog-ng < 3.0
+%triggerun -- syslog-ng < 3.19.1
+grep -q '^@include "/etc/syslog-ng\.d/\*\.conf"' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/*.conf"' >> /etc/syslog-ng/syslog-ng.conf
+# 3.0
sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
sed -i -e 's#pipe ("/proc/kmsg"#file ("/proc/kmsg"#g' /etc/syslog-ng/syslog-ng.conf
sed -i -e 's#log_prefix#program_override#g' /etc/syslog-ng/syslog-ng.conf
sed -i -e "1 s#\(.*\)\$#@version: 3.0\n\1#g" /etc/syslog-ng/syslog-ng.conf
rm -f %{_var}/lib/%{name}/syslog-ng.persist
%service -q syslog-ng restart
-exit 0
-
-%triggerun -- syslog-ng < 3.19.1
-grep -q '^@include "/etc/syslog-ng\.d/\*\.conf"' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/*.conf"' >> /etc/syslog-ng/syslog-ng.conf
-exit 0
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%attr(755,root,root) %{moduledir}/libmap-value-pairs.so
%attr(755,root,root) %{moduledir}/libpacctformat.so
%attr(755,root,root) %{moduledir}/libpseudofile.so
+%attr(755,root,root) %{moduledir}/librate-limit-filter.so
+%attr(755,root,root) %{moduledir}/libregexp-parser.so
%attr(755,root,root) %{moduledir}/libsecure-logging.so
%attr(755,root,root) %{moduledir}/libstardate.so
%attr(755,root,root) %{moduledir}/libtags-parser.so
%attr(755,root,root) %{_bindir}/loggen
%attr(755,root,root) %{_bindir}/pdbtool
%attr(755,root,root) %{_bindir}/persist-tool
-%attr(755,root,root) %{_bindir}/slogimport
+%attr(755,root,root) %{_bindir}/slogencrypt
%attr(755,root,root) %{_bindir}/slogkey
%attr(755,root,root) %{_bindir}/slogverify
%attr(755,root,root) %{_bindir}/update-patterndb
# R: basicfuncs
%{_datadir}/syslog-ng/include/scl/collectd
%{_datadir}/syslog-ng/include/scl/default-network-drivers
+%{_datadir}/syslog-ng/include/scl/fortigate
%{_datadir}/syslog-ng/include/scl/graphite
%{_datadir}/syslog-ng/include/scl/hdfs
%{_datadir}/syslog-ng/include/scl/kafka
%{_datadir}/syslog-ng/include/scl/nodejs
%{_datadir}/syslog-ng/include/scl/osquery
%{_datadir}/syslog-ng/include/scl/pacct
+%{_datadir}/syslog-ng/include/scl/paloalto
%{_datadir}/syslog-ng/include/scl/rewrite
%{_datadir}/syslog-ng/include/scl/snmptrap
%{_datadir}/syslog-ng/include/scl/solaris
%{_mandir}/man1/loggen.1*
%{_mandir}/man1/pdbtool.1*
%{_mandir}/man1/persist-tool.1*
-%{_mandir}/man1/slogimport.1*
+%{_mandir}/man1/slogencrypt.1*
%{_mandir}/man1/slogkey.1*
%{_mandir}/man1/slogverify.1*
%{_mandir}/man1/syslog-ng-ctl.1*
%{_mandir}/man5/syslog-ng.conf.5*
+%{_mandir}/man7/secure-logging.7*
%{_mandir}/man8/syslog-ng.8*
%attr(640,root,logs) %ghost /var/log/cron
%defattr(644,root,root,755)
%attr(755,root,root) %{moduledir}/libjson-plugin.so
# all below configs require json-plugin
+%{_datadir}/syslog-ng/include/scl/cee
+# R: basicfuncs http json-plugin
+%{_datadir}/syslog-ng/include/scl/discord
%{_datadir}/syslog-ng/include/scl/cim
# R: http json-plugin
%{_datadir}/syslog-ng/include/scl/elasticsearch
%if %{with kafka}
%files module-kafka
%defattr(644,root,root,755)
-%doc modules/kafka/README.md
%attr(755,root,root) %{moduledir}/libkafka.so
%endif
%{_includedir}/syslog-ng/control
%{_includedir}/syslog-ng/debugger
%{_includedir}/syslog-ng/filter
-%{_includedir}/syslog-ng/http-auth
%if %{without system_libivykis}
%{_includedir}/syslog-ng/ivykis
%endif
%{_pkgconfigdir}/syslog-ng.pc
%{_pkgconfigdir}/syslog-ng-native-connector.pc
+%if %{with tests}
%files test-devel
%defattr(644,root,root,755)
%if "%{_libdir}/syslog-ng" != "{moduledir}"
%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
%{_includedir}/syslog-ng/libtest
%{_pkgconfigdir}/syslog-ng-test.pc
+%endif
projects / packages / syslog-ng.git / blobdiff