X-Git-Url: https://git.tld-linux.org/?p=packages%2Fsyslog-ng.git;a=blobdiff_plain;f=syslog-ng.spec;h=8cae05b9c295367af7e8d8f5bb1cc63ab0675827;hp=0e302c9d76a9c78b590bcba57e81aef49b83e92d;hb=HEAD;hpb=bd1bd29d7ca9f46e8834c76ea332f06c8e8b4872 diff --git a/syslog-ng.spec b/syslog-ng.spec index 0e302c9..6745f20 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 @@ -29,19 +28,19 @@ # as in git submodule %define libivykis_version 0.42.4 -%define glib2_ver 1:2.24.0 -%define mver 3.22 -%define docmver 3.22 +%define glib2_ver 1:2.32.0 +%define mver 4.6 +%define docmver 4.6 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.22.1 -Release: 3 +Version: 4.6.0 +Release: 2 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz -# Source0-md5: ccb7bdadc01e1f28430fcca511258c85 +# Source0-md5: 389d1d5d5b6af8e73d5b6caa37ae1bfe Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.logrotate @@ -56,34 +55,37 @@ Patch2: man-paths.patch Patch3: %{name}-link.patch Patch4: no_shared_ivykis.patch Patch5: bison.patch +Patch6: shebang.patch URL: https://syslog-ng.org/ -%{?with_geoip:BuildRequires: GeoIP-devel >= 1.5.1} BuildRequires: autoconf >= 2.59 BuildRequires: automake -BuildRequires: bison >= 2.4 +BuildRequires: bison >= 3.7.6 %{?with_http:BuildRequires: curl-devel} BuildRequires: docbook-style-xsl %{?with_tests:BuildRequires: findutils} BuildRequires: flex BuildRequires: glib2-devel >= %{glib2_ver} -%{?with_redis:BuildRequires: hiredis-devel} -%{?with_json:BuildRequires: json-c-devel >= 0.9} +%{?with_redis:BuildRequires: hiredis-devel >= 0.11.0} +%{?with_java:BuildRequires: jdk >= 1.8} +%{?with_json:BuildRequires: json-c-devel >= 0.13} +%{?with_java:BuildRequires: gradle >= 3.4} %{?with_mongodb:BuildRequires: libbson-devel} BuildRequires: libcap-devel -%{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2} +%{?with_sql:BuildRequires: libdbi-devel >= 0.9.0} %{?with_smtp:BuildRequires: libesmtp-devel} %{?with_system_libivykis:BuildRequires: libivykis-devel >= %{libivykis_version}} %{?with_mongodb:BuildRequires: mongo-c-driver-devel} %{?with_geoip2:BuildRequires: libmaxminddb-devel} BuildRequires: libnet-devel >= 1:1.1.2.1-3 +%{?with_java:BuildRequires: librdkafka-devel >= 1.1.0} BuildRequires: libtool >= 2:2.0 BuildRequires: libwrap-devel BuildRequires: libxslt-progs BuildRequires: lz4-devel >= r131-5 BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: pcre-devel >= 6.1 +BuildRequires: pcre2-8-devel >= 10.0 BuildRequires: pkgconfig -%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.0.1} +%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.5.3} %{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.0.0} BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.623 @@ -110,13 +112,13 @@ Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.3.0 # for afsocket Requires: libnet >= 1:1.1.2.1-7 -# for afsocket and dbparser Requires: openssl >= 0.9.8 Provides: service(klogd) 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 @@ -220,6 +222,20 @@ HTTP destination support module for syslog-ng (via libcurl). %description module-http -l pl.UTF-8 Moduł sysloga-ng do obsługi zapisu logów poprzez HTTP (via libcurl). +%package module-java +Summary: Java destination support module for syslog-ng +Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów przy pomocy Java +Group: Libraries +Requires: %{name} = %{version}-%{release} +Requires: librdkafka >= 1.1.0 +Requires: %{name}-module-json-plugin = %{version}-%{release} + +%description module-java +Java destination support module for syslog-ng + +%description module-java -l pl.UTF-8 +Moduł sysloga-ng do obsługi zapisu logów przy pomocy Java + %package module-json-plugin Summary: JSON formatting template function for syslog-ng Summary(pl.UTF-8): Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON @@ -234,6 +250,19 @@ JSON formatting template function for syslog-ng. %description module-json-plugin -l pl.UTF-8 Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON. +%package module-python +Summary: Python destination support module for syslog-ng +Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów przy pomocy pythona +Group: Libraries +Requires: %{name} = %{version}-%{release} +Requires: python3 + +%description module-python +Python destination support module for syslog-ng + +%description module-python -l pl.UTF-8 +Moduł sysloga-ng do obsługi zapisu logów przy pomocy pythona + %package module-redis Summary: Redis destination support module for syslog-ng Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów w bazie Redis @@ -260,22 +289,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 @@ -322,6 +335,7 @@ mv ivykis-%{libivykis_version} lib/ivykis %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 cp -p %{SOURCE4} doc cp -p %{SOURCE5} contrib/syslog-ng.conf.simple @@ -336,7 +350,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple %configure \ --sysconfdir=%{_sysconfdir}/syslog-ng \ --disable-silent-rules \ - --with-default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat \ --with-docbook=%{xsl_stylesheets_dir}/manpages/docbook.xsl \ --enable-java%{!?with_java:=no} \ --enable-java-modules%{!?with_java:=no} \ @@ -356,12 +369,14 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple --with-module-dir=%{moduledir} \ --with-pidfile-dir=/var/run \ --with-timezone-dir=%{_datadir}/zoneinfo \ + --with-python-packages=none \ %{__enable_disable amqp} \ - %{__enable_disable geoip} \ + --disable-cloud-auth \ %{__enable_disable geoip2} \ --enable-http%{!?with_http:=no} \ --enable-ipv6 \ --enable-json%{!?with_json:=no} \ + %{__enable_disable java kafka} \ --enable-linux-caps \ --enable-manpages \ --enable-pacct \ @@ -371,7 +386,7 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple --enable-smtp%{!?with_smtp:=no} \ --enable-spoof-source \ --enable-ssl \ - --enable-systemd=no \ + --disable-systemd \ --enable-tcp-wrapper \ %if %{with sql} --enable-sql \ @@ -384,7 +399,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple %{__make} - %if %{with tests} LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:") PYTHONPATH=$(pwd)/tests/functional @@ -436,6 +450,16 @@ ln -s "%{name}" $RPM_BUILD_ROOT/etc/sysconfig/%{name}@default %{__rm} $RPM_BUILD_ROOT%{moduledir}/*.la %{__rm} $RPM_BUILD_ROOT%{moduledir}/loggen/*.la +%if %{with python} +%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/python +%else +%{__rm} $RPM_BUILD_ROOT%{_bindir}/syslog-ng-update-virtualenv +%endif + +%if !%{with java} +%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/syslog-ng/include/scl/{elasticsearch,hdfs,kafka} +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -491,7 +515,6 @@ exit 0 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}@default %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng %attr(754,root,root) /etc/rc.d/init.d/syslog-ng @@ -502,17 +525,18 @@ exit 0 %endif %attr(755,root,root) %{moduledir}/libaffile.so %attr(755,root,root) %{moduledir}/libafprog.so +%attr(755,root,root) %{moduledir}/libafsnmp.so %attr(755,root,root) %{moduledir}/libafsocket.so %attr(755,root,root) %{moduledir}/libafstomp.so %attr(755,root,root) %{moduledir}/libafuser.so %attr(755,root,root) %{moduledir}/libappmodel.so +%attr(755,root,root) %{moduledir}/libazure-auth-header.so %attr(755,root,root) %{moduledir}/libbasicfuncs.so %attr(755,root,root) %{moduledir}/libcef.so %attr(755,root,root) %{moduledir}/libconfgen.so +%attr(755,root,root) %{moduledir}/libcorrelation.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 %if %{with geoip2} @@ -522,17 +546,20 @@ 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 +%attr(755,root,root) %{moduledir}/libmetrics-probe.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 -%attr(755,root,root) %{moduledir}/libsnmpdest.so -%attr(755,root,root) %{moduledir}/libsnmptrapd-parser.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) %{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 @@ -542,18 +569,25 @@ exit 0 %attr(755,root,root) %{_bindir}/loggen %attr(755,root,root) %{_bindir}/pdbtool %attr(755,root,root) %{_bindir}/persist-tool +%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 +%if %{with python} +%attr(755,root,root) %{_bindir}/syslog-ng-update-virtualenv +%endif %dir %{_datadir}/syslog-ng/include %dir %{_datadir}/syslog-ng/include/scl +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/syslog-ng/include/scl.conf %{_datadir}/syslog-ng/include/scl/apache %{_datadir}/syslog-ng/include/scl/checkpoint %{_datadir}/syslog-ng/include/scl/cisco %{_datadir}/syslog-ng/include/scl/collectd +%{_datadir}/syslog-ng/include/scl/darwinosl %{_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/iptables %{_datadir}/syslog-ng/include/scl/junos %{_datadir}/syslog-ng/include/scl/linux-audit @@ -561,10 +595,17 @@ 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/mariadb %{_datadir}/syslog-ng/include/scl/mbox %{_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/pgsql +%{_datadir}/syslog-ng/include/scl/pihole +%{_datadir}/syslog-ng/include/scl/python +%{_datadir}/syslog-ng/include/scl/qbittorrent %{_datadir}/syslog-ng/include/scl/rewrite %{_datadir}/syslog-ng/include/scl/snmptrap %{_datadir}/syslog-ng/include/scl/solaris @@ -576,6 +617,7 @@ exit 0 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk %{_datadir}/syslog-ng/include/scl/syslogconf/plugin.conf %{_datadir}/syslog-ng/include/scl/system +%{_datadir}/syslog-ng/smart-multi-line.fsm %{_datadir}/syslog-ng/xsd %dir %{_var}/lib/%{name} @@ -583,6 +625,11 @@ exit 0 %{_mandir}/man1/dqtool.1* %{_mandir}/man1/loggen.1* %{_mandir}/man1/pdbtool.1* +%{_mandir}/man1/slogencrypt.1* +%{_mandir}/man1/slogkey.1* +%{_mandir}/man1/slogverify.1* +%{_mandir}/man1/persist-tool.1* +%{_mandir}/man7/secure-logging.7* %{_mandir}/man1/syslog-ng-ctl.1* %{_mandir}/man5/syslog-ng.conf.5* %{_mandir}/man8/syslog-ng.8* @@ -626,18 +673,43 @@ exit 0 %{_datadir}/syslog-ng/include/scl/telegram %endif +%if %{with java} +%files module-java +%defattr(644,root,root,755) +%attr(755,root,root) %{moduledir}/libkafka.so +%attr(755,root,root) %{moduledir}/libmod-java.so +%{moduledir}/java-modules +%{_datadir}/syslog-ng/include/scl/elasticsearch +%{_datadir}/syslog-ng/include/scl/hdfs +%{_datadir}/syslog-ng/include/scl/kafka +%endif + %if %{with json} %files module-json-plugin %defattr(644,root,root,755) %attr(755,root,root) %{moduledir}/libjson-plugin.so +%{_datadir}/syslog-ng/include/scl/cee %{_datadir}/syslog-ng/include/scl/cim -%{_datadir}/syslog-ng/include/scl/elasticsearch +%{_datadir}/syslog-ng/include/scl/discord %{_datadir}/syslog-ng/include/scl/ewmm +%{_datadir}/syslog-ng/include/scl/google %{_datadir}/syslog-ng/include/scl/graylog2 %{_datadir}/syslog-ng/include/scl/loggly %{_datadir}/syslog-ng/include/scl/logmatic +%{_datadir}/syslog-ng/include/scl/logscale %{_datadir}/syslog-ng/include/scl/netskope +%{_datadir}/syslog-ng/include/scl/openobserve +%{_datadir}/syslog-ng/include/scl/opensearch %{_datadir}/syslog-ng/include/scl/slack +%{_datadir}/syslog-ng/include/scl/splunk +%{_datadir}/syslog-ng/include/scl/sumologic +%endif + +%if %{with python} +%files module-python +%defattr(644,root,root,755) +%attr(755,root,root) %{moduledir}/libmod-python.so +%{moduledir}/python %endif %if %{with redis} @@ -652,12 +724,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.*.*.* @@ -687,7 +753,7 @@ exit 0 %{_includedir}/syslog-ng/control %{_includedir}/syslog-ng/debugger %{_includedir}/syslog-ng/filter -%{_includedir}/syslog-ng/http-auth +%{_includedir}/syslog-ng/healthcheck %if %{without system_libivykis} %{_includedir}/syslog-ng/ivykis %endif @@ -695,11 +761,12 @@ 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/modules +%{_includedir}/syslog-ng/multi-line %{_includedir}/syslog-ng/parser %{_includedir}/syslog-ng/rewrite %{_includedir}/syslog-ng/scanner +%{_includedir}/syslog-ng/signal-slot-connector %{_includedir}/syslog-ng/stats %{_includedir}/syslog-ng/str-repr %{_includedir}/syslog-ng/template