-# TODO:
-# - switch to LTS version??? where???
-# - relies on libs in /usr which is wrong
-# (well, for modules bringing additional functionality it's acceptable IMO --q)
-# - package python module
+# NOTE: only core functionality is available without /usr;
+# some non-trivial extension modules rely in libraries/daemons existing in /usr.
#
# Conditional build:
%bcond_with dynamic # link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
%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 kafka # support for Apache Kafka protocol
%bcond_without riemann # support for Riemann monitoring system
%bcond_without systemd # systemd (daemon and journal) support
%bcond_without amqp # AMQP support
-%bcond_with python # python module
+%bcond_without python # python module
%bcond_with java # java modules and support
%bcond_without system_libivykis # use system libivykis
%bcond_without system_rabbitmq # use system librabbitmq
%endif
# as in git submodule
-%define libivykis_version 0.42.2
+%define libivykis_version 0.42.4
-%if "%{pld_release}" == "ac"
-%define glib2_ver 1:2.16.0
-%else
-%define glib2_ver 1:2.24.0
-%endif
-%define mver 3.14
+%define glib2_ver 1:2.28
+%define mver 3.29
%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.14.1
-Release: 7
+Version: 3.29.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: 60c58c5e50860c5b81afb6e80abb0a04
+#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: 5bc0c28d37310a3487efe0a6d79db8ab
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: cap_syslog-vserver-workaround.patch
+# https://github.com/syslog-ng/syslog-ng/commit/1d90d844a39eb25ac3423f663b0409f61a064330.patch
+# https://github.com/syslog-ng/syslog-ng/commit/46fa90bdd3adee5bcbb2687cf00c08925c504c07.patch
+Patch1: %{name}-tests-fixes.patch
Patch2: %{name}-nolibs.patch
Patch3: %{name}-systemd.patch
Patch4: man-paths.patch
Patch5: %{name}-link.patch
Patch6: no_shared_ivykis.patch
-Patch7: am_deps.patch
+Patch7: 32bit.patch
URL: https://syslog-ng.org/
-%{?with_geoip:BuildRequires: GeoIP-devel >= 1.5.1}
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bison >= 2.4
+%if %{with tests}
+BuildRequires: criterion-devel >= 2.3.3-5
+%endif
%{?with_http:BuildRequires: curl-devel}
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl-nons
BuildRequires: eventlog-devel >= 0.2.12
-%{?with_tests:BuildRequires: findutils}
BuildRequires: flex
BuildRequires: glib2-devel >= %{glib2_ver}
-%{?with_redis:BuildRequires: hiredis-devel}
+%{?with_java:BuildRequires: gradle >= 2.2}
+%{?with_redis:BuildRequires: hiredis-devel >= 0.11.0}
+%{?with_java:BuildRequires: jdk >= 1.7}
%{?with_json:BuildRequires: json-c-devel >= 0.9}
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_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}
BuildRequires: libtool >= 2:2.0
BuildRequires: libwrap-devel
BuildRequires: libxslt-progs
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: pcre-devel >= 6.1
BuildRequires: pkgconfig
-%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.0.1}
-%{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.0.0}
+%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.5.3}
+%{?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:195}
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: which
%if %{with tests}
BuildRequires: GeoIP-db-Country
BuildRequires: pylint
-BuildRequires: python
-BuildRequires: python-pep8
-BuildRequires: python-ply
+BuildRequires: python3
+%{?with_python:BuildRequires: python3-devel >= 1:3.2}
+BuildRequires: python3-pep8
+BuildRequires: python3-ply
BuildRequires: tzdata
%endif
%if %{without dynamic}
Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-libs = %{version}-%{release}
Requires: psmisc >= 20.1
-%{?with_system_rabbitmq:Requires: rabbitmq-c >= 0.0.1}
+%{?with_system_rabbitmq:Requires: rabbitmq-c >= 0.5.3}
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
# for afsocket
Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libmongo-client >= 0.1.8
+Requires: mongo-c-driver >= 1.0.0
%description module-afmongodb
MongoDB destination support module for syslog-ng.
Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów w bazach SQL
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libdbi >= 0.8.3-2
+Requires: libdbi >= 0.9.0
Requires: openssl >= 0.9.8
%description module-afsql
%description module-json-plugin -l pl.UTF-8
Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON.
+%package module-kafka
+Summary: Apache Kafka destination support module 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
+
+%description module-kafka
+Apache Kafka destination support module for syslog-ng.
+
+%description module-kafka -l pl.UTF-8
+Moduł sysloga-ng do obsługi zapisu logów poprzez protokół Apache
+Kafka.
+
+%package module-python
+Summary: Python support module for syslog-ng
+Summary(pl.UTF-8): Moduł obsługi Pythona dla sysloga-ng
+Group: Librares
+Requires: %{name} = %{version}-%{release}
+
+%description module-python
+Python support module for syslog-ng.
+
+%description module-python -l pl.UTF-8
+Moduł obsługi Pythona dla sysloga-ng.
+
%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
Group: Libraries
Requires: %{name} = %{version}-%{release}
+Requires: hiredis >= 0.11.0
%description module-redis
Redis destination support module for syslog-ng (via libhiredis).
Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: riemann-c-client >= 1.0.0
+Requires: riemann-c-client >= 1.6.0
%description module-riemann
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
%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
Conflicts: syslog-ng < 3.3.1-3
%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
%description devel -l pl.UTF-8
Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
+%package test-devel
+Summary: syslog-ng test library
+Summary(pl.UTF-8): Biblioteka testowa sysloga-ng
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description test-devel
+Test helper package for syslog-ng modules.
+
+%description test-devel -l pl.UTF-8
+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
+%{__mv} ivykis-%{libivykis_version} lib/ivykis
+%endif
%patch0 -p1
%patch1 -p1
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
%build
for i in . ; do
cd -
done
%configure \
+ PYTHON="%{__python3}" \
--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} \
- --enable-python%{!?with_python:=no} \
-%if %{with mongodb}
- --enable-mongodb \
- --with-mongoc=system \
-%else
- --disable-mongodb \
-%endif
-%if %{with system_libivykis}
- --with-ivykis=system \
+ %{__enable_disable amqp} \
+%if %{with dynamic}
+ --enable-dynamic-linking \
%else
- --with-ivykis=internal \
+ --enable-mixed-linking \
%endif
- %{?with_system_rabbitmq:--with-librabbitmq-client=system} \
- --with-module-dir=%{moduledir} \
- --with-pidfile-dir=/var/run \
- --with-systemdsystemunitdir=%{systemdunitdir} \
- --with-timezone-dir=%{_datadir}/zoneinfo \
- %{__enable_disable amqp} \
- %{__enable_disable geoip} \
%{__enable_disable geoip2} \
--enable-http%{!?with_http:=no} \
--enable-ipv6 \
+ --enable-java%{!?with_java:=no} \
+ --enable-java-modules%{!?with_java:=no} \
--enable-json%{!?with_json:=no} \
--enable-linux-caps \
+ --enable-kafka%{!?with_kafka:=no} \
--enable-manpages \
+%if %{with mongodb}
+ --enable-mongodb \
+ --with-mongoc=system \
+%else
+ --disable-mongodb \
+%endif
--enable-pacct \
--enable-pcre \
+ --enable-python%{!?with_python:=no} \
--enable-redis%{!?with_redis:=no} \
--enable-riemann%{!?with_riemann:=no} \
--enable-smtp%{!?with_smtp:=no} \
%if %{with sql}
--enable-sql \
%endif
-%if %{with dynamic}
- --enable-dynamic-linking
+ --with-default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat \
+ --with-docbook=%{xsl_stylesheets_dir}/manpages/docbook.xsl \
+%if %{with system_libivykis}
+ --with-ivykis=system \
%else
- --enable-mixed-linking
+ --with-ivykis=internal \
%endif
+ %{?with_system_rabbitmq:--with-librabbitmq-client=system} \
+ --with-module-dir=%{moduledir} \
+ --with-pidfile-dir=/var/run \
+ --with-systemdsystemunitdir=%{systemdunitdir} \
+ --with-timezone-dir=%{_datadir}/zoneinfo
%{__make}
-
%if %{with tests}
LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:")
PYTHONPATH=$(pwd)/tests/functional
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{syslog-ng.d,sysconfig,logrotate.d,rc.d/init.d} \
$RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
$RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
%{__mv} $RPM_BUILD_ROOT%{_libdir}/libevtlog-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libevtlog-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libevtlog.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
+
%{__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
%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}
%{__rm} $RPM_BUILD_ROOT%{_sbindir}/syslog-ng-debun
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/syslog-ng-debun.1
+%{__rm} $RPM_BUILD_ROOT%{moduledir}/libexamples.so
%{__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
%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
%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(750,root,root) %dir %{_sysconfdir}/syslog-ng.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
%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}/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
%if %{with geoip2}
%attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
%endif
%attr(755,root,root) %{moduledir}/libgraphite.so
+%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}/libmap-value-pairs.so
%attr(755,root,root) %{moduledir}/libpacctformat.so
%attr(755,root,root) %{moduledir}/libpseudofile.so
-%attr(755,root,root) %{moduledir}/libsnmptrapd-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
%if %{with systemd}
%attr(755,root,root) %{moduledir}/libsdjournal.so
%endif
%attr(755,root,root) %{moduledir}/libsyslogformat.so
%attr(755,root,root) %{moduledir}/libsystem-source.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) %{_sbindir}/syslog-ng
%attr(755,root,root) %{_sbindir}/syslog-ng-ctl
%attr(755,root,root) %{_bindir}/dqtool
%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
%dir %{_datadir}/syslog-ng/include
%dir %{_datadir}/syslog-ng/include/scl
%{_datadir}/syslog-ng/include/scl/apache
+%{_datadir}/syslog-ng/include/scl/checkpoint
+%{_datadir}/syslog-ng/include/scl/cisco
+# R: basicfuncs
+%{_datadir}/syslog-ng/include/scl/collectd
%{_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
-#%{_datadir}/syslog-ng/include/scl/iptables
+%{_datadir}/syslog-ng/include/scl/iptables
+%{_datadir}/syslog-ng/include/scl/junos
+%{_datadir}/syslog-ng/include/scl/linux-audit
%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
%{_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
-#%{_datadir}/syslog-ng/include/scl/sudo
+%{_datadir}/syslog-ng/include/scl/sudo
+%{_datadir}/syslog-ng/include/scl/sumologic
+%{_datadir}/syslog-ng/include/scl/websense
%{_datadir}/syslog-ng/include/scl/windowseventlog
%dir %{_datadir}/syslog-ng/include/scl/syslogconf
%{_datadir}/syslog-ng/include/scl/syslogconf/README
%{_mandir}/man1/dqtool.1*
%{_mandir}/man1/loggen.1*
%{_mandir}/man1/pdbtool.1*
+%{_mandir}/man1/persist-tool.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
%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}
%files module-json-plugin
%defattr(644,root,root,755)
%attr(755,root,root) %{moduledir}/libjson-plugin.so
+# all below configs require json-plugin
%{_datadir}/syslog-ng/include/scl/cim
-%{_datadir}/syslog-ng/include/scl/cisco
+# R: http json-plugin
+%{_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
+%{_datadir}/syslog-ng/include/scl/netskope
+# R: basicfuncs http json-plugin
+%{_datadir}/syslog-ng/include/scl/slack
+%endif
+
+%if %{with kafka}
+%files module-kafka
+%defattr(644,root,root,755)
+%attr(755,root,root) %{moduledir}/libkafka.so
+%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}
%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.*.*.*
%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.*.*.*
%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
%dir %{_includedir}/syslog-ng
%{_includedir}/syslog-ng/*.h
+%{_includedir}/syslog-ng/ack-tracker
%{_includedir}/syslog-ng/compat
%{_includedir}/syslog-ng/control
%{_includedir}/syslog-ng/debugger
%endif
%{_includedir}/syslog-ng/logmsg
%{_includedir}/syslog-ng/logproto
-%dir %{_includedir}/syslog-ng/modules
-%{_includedir}/syslog-ng/modules/add-contextual-data
+%{_includedir}/syslog-ng/logthrdest
+%{_includedir}/syslog-ng/logthrsource
+%{_includedir}/syslog-ng/modules
%{_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
+%{_includedir}/syslog-ng/timeutils
%{_includedir}/syslog-ng/transport
%{_includedir}/syslog-ng/value-pairs
%{_datadir}/syslog-ng/tools
%{_pkgconfigdir}/syslog-ng.pc
-%{_pkgconfigdir}/syslog-ng-add-contextual-data.pc
%{_pkgconfigdir}/syslog-ng-native-connector.pc
-# test-devel ?
+%files test-devel
+%defattr(644,root,root,755)
%if "%{_libdir}/syslog-ng" != "{moduledir}"
%dir %{_libdir}/syslog-ng
%endif