]> TLD Linux GIT Repositories - packages/syslog-ng.git/blobdiff - syslog-ng.spec
- fix obsoleted keyword stats_freq in config files
[packages/syslog-ng.git] / syslog-ng.spec
index 5026a096e8bdbd6b006574eef54ac7ce74d91d05..6745f204afdea67aa2c27880445d0e2b1e47a358 100644 (file)
-#
 # 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
 #
 # Conditional build:
 %bcond_with    dynamic                 # link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
 %bcond_without sql                     # support for logging to SQL DB
-%bcond_without tests                   # do not perform "make check"
+%bcond_with    tests                   # do not perform "make check"
+%bcond_without http                    # support for HTTP destination
 %bcond_without json                    # support for JSON template formatting
 %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
+%bcond_with    python                  # python module
+%bcond_with    java                    # java modules and support
 %bcond_without system_libivykis        # use system libivykis
-%bcond_with    system_rabbitmq         # use system librabbitmq [not supported yet]
+%bcond_without system_rabbitmq         # use system librabbitmq
+
+%if %{without amqp}
+%undefine with_system_rabbitmq
+%endif
+
+# as in git submodule
+%define        libivykis_version 0.42.4
 
-%define                glib2_ver       1:2.24.0
+%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.5.3
-Release:       1
+Version:       4.6.0
+Release:       2
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
-Source0:       http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: 4cc29efa55fc41e65c48ece9bc88f88b
+Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
+# Source0-md5: 389d1d5d5b6af8e73d5b6caa37ae1bfe
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
-Source4:       http://www.balabit.com/support/documentation/syslog-ng-ose-3.5-guides/en/syslog-ng-ose-v3.5-guide-admin/pdf/%{name}-ose-v3.5-guide-admin.pdf
-# Source4-md5: b5e66123e37f670ff85fc2d74d263b01
+Source4:       https://syslog-ng.com/documents/html/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-guide-admin/pdf/syslog-ng-ose-guide-admin.pdf
+# Source4-md5: 46b021e8b47ddbe15bfc9134aa54c183
 Source5:       %{name}-simple.conf
-Source6:       %{name}.upstart
+Source6:       https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
+# Source6-md5: e09caeb95a01a541ec40d3b757dada12
 Patch0:                %{name}-datadir.patch
-Patch1:                cap_syslog-vserver-workaround.patch
-Patch2:                %{name}-nolibs.patch
-Patch3:                %{name}-systemd.patch
-Patch4:                man-paths.patch
-URL:           http://www.balabit.com/products/syslog_ng/
-%{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
-BuildRequires: autoconf >= 2.53
+Patch1:                %{name}-nolibs.patch
+Patch2:                man-paths.patch
+Patch3:                %{name}-link.patch
+Patch4:                no_shared_ivykis.patch
+Patch5:                bison.patch
+Patch6:                shebang.patch
+URL:           https://syslog-ng.org/
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: bison >= 2.4
+BuildRequires: bison >= 3.7.6
+%{?with_http:BuildRequires:    curl-devel}
 BuildRequires: docbook-style-xsl
-BuildRequires: eventlog-devel >= 0.2.12
 %{?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 >= 0.36.1}
-%{?with_mongodb:BuildRequires: libmongo-client-devel >= 0.1.6}
+%{?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
 BuildRequires: which
 %if %{with tests}
-%{?with_sql:BuildRequires:     libdbi-drivers-sqlite3}
+BuildRequires: GeoIP-db-Country
+BuildRequires: pylint
 BuildRequires: python
-BuildRequires: python-modules
+BuildRequires: python-pep8
+BuildRequires: python-ply
 BuildRequires: tzdata
 %endif
 %if %{without dynamic}
-BuildRequires: eventlog-static >= 0.2.12
 BuildRequires: glib2-static >= %{glib2_ver}
-%{?with_system_libivykis:BuildRequires:        libivykis-static >= 0.36.1}
+%{?with_system_libivykis:BuildRequires:        libivykis-static >= %{libivykis_version}}
 BuildRequires: pcre-static >= 6.1
 BuildRequires: zlib-static
 %endif
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
-Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      eventlog >= 0.2.12
-Requires:      glib2 >= %{glib2_ver}
-Requires:      pcre >= 6.1
 Requires:      psmisc >= 20.1
 %{?with_system_rabbitmq:Requires:      rabbitmq-c >= 0.0.1}
 Requires:      rc-scripts >= 0.4.3.0
-Requires:      systemd-units >= 38
 # 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
 Conflicts:     rsyslog
 Conflicts:     syslog
+Conflicts:     cronie < 1.5.0-3
+Conflicts:     fcron < 3.1.2-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define        xsl_stylesheets_dir /usr/share/sgml/docbook/xsl-stylesheets
 
+%if %{without dynamic}
 # syslog-ng has really crazy linking rules (see their bugzilla).
 # Some rules, according to syslog-ng devs, are like this:
 # - libsyslog-ng.so has undefined symbols for third party libraries
@@ -114,12 +138,14 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # - same applies for modules
 # In dynamic case tests are forcily linked with dynamic modules, which doesn't work with as-needed.
 %define                filterout_ld                    -Wl,--as-needed -Wl,--no-copy-dt-needed-entries
-
-%if %{without dynamic}
 %define                no_install_post_check_so        1
 %define                _sbindir                        /sbin
-%define                _libdir                         /%{_lib}
+%define                slibdir                         /%{_lib}
+%else
+%define                slibdir                         %{_libdir}
 %endif
+# or just %{_libdir}? modules seem to be always linked dynamically
+%define                moduledir                       %{slibdir}/syslog-ng
 
 %description
 syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
@@ -143,28 +169,12 @@ melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
 por seu conteúdo (usando expressões regulares) e não apenas pelo par
 facility/prioridade como o syslog original.
 
-%package upstart
-Summary:       Upstart job description for syslog-ng
-Summary(pl.UTF-8):     Opis zadania Upstart dla demona syslog-ng
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-Conflicts:     avahi-upstart < 0.6.30-2
-Conflicts:     openssh-server-upstart < 2:5.8p2-2
-Conflicts:     postgresql-upstart < 9.0.4-2
-
-%description upstart
-Upstart job description for syslog-ng.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla demona syslog-ng.
-
 %package module-afmongodb
 Summary:       MongoDB destination support module for syslog-ng
 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.6
+Requires:      libmongo-client >= 0.1.8
 
 %description module-afmongodb
 MongoDB destination support module for syslog-ng.
@@ -200,6 +210,32 @@ SQL destination support module for syslog-ng (via libdbi).
 Moduł sysloga-ng do obsługi zapisu logów w bazach SQL (poprzez
 libdbi).
 
+%package module-http
+Summary:       HTTP destination support module for syslog-ng
+Summary(pl.UTF-8):     Moduł sysloga-ng do obsługi zapisu logów poprzez HTTP
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description module-http
+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
@@ -214,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
@@ -227,29 +276,26 @@ Redis destination support module for syslog-ng (via libhiredis).
 Moduł sysloga-ng do obsługi zapisu logów w bazie Redis (poprzez
 libhiredis).
 
-%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
+%package module-riemann
+Summary:       Riemann destination support module for syslog-ng
+Summary(pl.UTF-8):     Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      GeoIP-libs >= 1.5.1
+Requires:      riemann-c-client >= 1.0.0
 
-%description module-tfgeoip
-syslog-ng template function module to get GeoIP info from an IPv4
-addresses.
+%description module-riemann
+Riemann destination support module for syslog-ng.
 
-%description module-tfgeoip -l pl.UTF-8
-Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z
-adresów IPv4.
+%description module-riemann -l pl.UTF-8
+Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann.
 
 %package libs
 Summary:       Shared library for syslog-ng
 Summary(pl.UTF-8):     Biblioteka współdzielona sysloga-ng
 Group:         Libraries
 %if %{with dynamic}
-Requires:      eventlog >= 0.2.12
 Requires:      glib2 >= %{glib2_ver}
-%{?with_system_libivykis:Requires:     libivykis >= 0.36.1}
+%{?with_system_libivykis:Requires:     libivykis >= 0.42}
 Requires:      pcre >= 6.1
 %endif
 Conflicts:     syslog-ng < 3.3.1-3
@@ -266,9 +312,8 @@ Summary(pl.UTF-8):  Pliki nagłówkowe do tworzenia modułów dla sysloga-ng
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %if %{with dynamic}
-Requires:      eventlog-devel >= 0.2.12
 Requires:      glib2-devel >= %{glib2_ver}
-%{?with_system_libivykis:Requires:     libivykis-devel >= 0.36.1}
+%{?with_system_libivykis:Requires:     libivykis-devel >= 0.42}
 Requires:      pcre-devel >= 6.1
 %endif
 
@@ -279,35 +324,39 @@ Header files for syslog-ng modules development.
 Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version} -a 6
+
+rmdir lib/ivykis
+mv ivykis-%{libivykis_version} lib/ivykis
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -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
 
 %build
-for i in . lib/ivykis; do
-cd $i
-       %{__libtoolize}
-       %{__aclocal} `[ -d m4 ] && echo '-I m4'`
-       %{__autoconf}
-       %{__autoheader}
-       %{__automake}
-cd -
-done
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --sysconfdir=%{_sysconfdir}/syslog-ng \
-       --datadir=%{_datadir}/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-libmongo-client=system \
+       --with-mongoc=system \
 %else
        --disable-mongodb \
 %endif
@@ -317,22 +366,27 @@ done
        --with-ivykis=internal \
 %endif
        %{?with_system_rabbitmq:--with-librabbitmq-client=system} \
-       --with-module-dir=%{_libdir}/syslog-ng \
+       --with-module-dir=%{moduledir} \
        --with-pidfile-dir=/var/run \
        --with-timezone-dir=%{_datadir}/zoneinfo \
-       --enable-systemd \
-       --with-systemdsystemunitdir=%{systemdunitdir} \
-       --enable-amqp \
-       --enable-geoip%{!?with_geoip:=no} \
+       --with-python-packages=none \
+       %{__enable_disable amqp} \
+       --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 \
        --enable-pcre \
        --enable-redis%{!?with_redis:=no} \
+       --enable-riemann%{!?with_riemann:=no} \
        --enable-smtp%{!?with_smtp:=no} \
        --enable-spoof-source \
        --enable-ssl \
+       --disable-systemd \
        --enable-tcp-wrapper \
 %if %{with sql}
        --enable-sql \
@@ -343,8 +397,7 @@ done
        --enable-mixed-linking
 %endif
 
-%{__make} \
-       XSL_STYLESHEET=%{xsl_stylesheets_dir}/manpages/docbook.xsl
+%{__make}
 
 %if %{with tests}
 LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:")
@@ -355,7 +408,7 @@ export LD_LIBRARY_PATH PYTHONPATH
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d,init} \
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
        $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
@@ -363,20 +416,48 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d,init} \
        pkgconfigdir=%{_pkgconfigdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if "%{slibdir}" != "%{_libdir}"
+install -d $RPM_BUILD_ROOT%{slibdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libsyslog-ng-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsyslog-ng-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libsyslog-ng.so
+
+%{__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}/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
+
+%{__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
+%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
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-for n in daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog; do
+for n in cron daemon debug kernel lpr maillog messages secure shorewall spooler syslog user xferlog; do
        > $RPM_BUILD_ROOT/var/log/$n
 done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+ln -s "%{name}" $RPM_BUILD_ROOT/etc/sysconfig/%{name}@default
 
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/syslog-ng-debun
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/syslog-ng-debun.1
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
+%{__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 "%{pld_release}" == "th"
-%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE6} > $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%if !%{with java}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/syslog-ng/include/scl/{elasticsearch,hdfs,kafka}
 %endif
 
 %clean
@@ -403,20 +484,11 @@ fi
 /sbin/chkconfig --add syslog-ng
 %service syslog-ng restart "syslog-ng daemon"
 
-%systemd_post syslog-ng.service
-
 %preun
 if [ "$1" = "0" ]; then
        %service syslog-ng stop
        /sbin/chkconfig --del syslog-ng
 fi
-%systemd_preun syslog-ng.service
-
-%postun
-%systemd_reload
-
-%triggerpostun -- syslog-ng < 3.3.4-3
-%systemd_trigger syslog-ng.service
 
 %triggerun -- syslog-ng < 3.0
 sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
@@ -431,143 +503,276 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %service -q syslog-ng restart
 exit 0
 
-%post upstart
-%upstart_post %{name}
-
-%postun upstart
-%upstart_postun %{name}
-
-%triggerun upstart -- syslog-ng-upstart < 3.2.4-3
-#  use SERVICE_syslog=y in upstart job environment instead of SERVICE=syslog
-%{__sed} -i -e 's,SERVICE=syslog,SERVICE_syslog=y,' /etc/init/*.conf || :
-
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS debian/syslog-ng.conf* contrib/relogger.pl
+%doc AUTHORS NEWS.md contrib/relogger.pl
 %doc contrib/syslog-ng.conf.{doc,simple,RedHat}
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v3.5-guide-admin.pdf
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-guide-admin.pdf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%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
-%{systemdunitdir}/syslog-ng.service
-%dir %{_libdir}/syslog-ng
-%attr(755,root,root) %{_libdir}/syslog-ng/libafamqp.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-notls.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-tls.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafstomp.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafuser.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libbasicfuncs.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libconfgen.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libcryptofuncs.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libcsvparser.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so
-%attr(755,root,root) %{_libdir}/syslog-ng/liblinux-kmsg-format.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libpacctformat.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libsyslog-ng-crypto.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libsyslogformat.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libsystem-source.so
+%dir %{moduledir}
+%attr(755,root,root) %{moduledir}/libadd-contextual-data.so
+%if %{with amqp}
+%attr(755,root,root) %{moduledir}/libafamqp.so
+%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}/libdisk-buffer.so
+%attr(755,root,root) %{moduledir}/libexamples.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}/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}/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
 %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
+%if %{with python}
+%attr(755,root,root) %{_bindir}/syslog-ng-update-virtualenv
+%endif
 
 %dir %{_datadir}/syslog-ng/include
 %dir %{_datadir}/syslog-ng/include/scl
-%dir %{_datadir}/syslog-ng/include/scl/pacct
-%{_datadir}/syslog-ng/include/scl/pacct/plugin.conf
-%dir %{_datadir}/syslog-ng/include/scl/rewrite
-%{_datadir}/syslog-ng/include/scl/rewrite/cc-mask.conf
+%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/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/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
+%{_datadir}/syslog-ng/include/scl/sudo
+%{_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
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
 %{_datadir}/syslog-ng/include/scl/syslogconf/plugin.conf
-%dir %{_datadir}/syslog-ng/include/scl/system
-%{_datadir}/syslog-ng/include/scl/system/plugin.conf
-%dir %{_datadir}/syslog-ng/xsd
-%{_datadir}/syslog-ng/xsd/patterndb-*.xsd
+%{_datadir}/syslog-ng/include/scl/system
+%{_datadir}/syslog-ng/smart-multi-line.fsm
+%{_datadir}/syslog-ng/xsd
 
 %dir %{_var}/lib/%{name}
 %dir %{_var}/lib/%{name}/xsd
+%{_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*
 
-%attr(640,root,root) %ghost /var/log/daemon
-%attr(640,root,root) %ghost /var/log/debug
-%attr(640,root,root) %ghost /var/log/iptables
-%attr(640,root,root) %ghost /var/log/kernel
-%attr(640,root,root) %ghost /var/log/lpr
-%attr(640,root,root) %ghost /var/log/maillog
-%attr(640,root,root) %ghost /var/log/messages
-%attr(640,root,root) %ghost /var/log/secure
-%attr(640,root,root) %ghost /var/log/spooler
-%attr(640,root,root) %ghost /var/log/syslog
-%attr(640,root,root) %ghost /var/log/user
-%attr(640,root,root) %ghost /var/log/xferlog
-
-%if "%{pld_release}" == "th"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-%endif
+%attr(640,root,logs) %ghost /var/log/cron
+%attr(640,root,logs) %ghost /var/log/daemon
+%attr(640,root,logs) %ghost /var/log/debug
+%attr(640,root,logs) %ghost /var/log/kernel
+%attr(640,root,logs) %ghost /var/log/lpr
+%attr(640,root,logs) %ghost /var/log/maillog
+%attr(640,root,logs) %ghost /var/log/messages
+%attr(640,root,logs) %ghost /var/log/secure
+%attr(640,root,logs) %ghost /var/log/shorewall
+%attr(640,root,logs) %ghost /var/log/spooler
+%attr(640,root,logs) %ghost /var/log/syslog
+%attr(640,root,logs) %ghost /var/log/user
+%attr(640,root,logs) %ghost /var/log/xferlog
 
 %if %{with mongodb}
 %files module-afmongodb
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libafmongodb.so
+%attr(755,root,root) %{moduledir}/libafmongodb.so
 %endif
 
 %if %{with smtp}
 %files module-afsmtp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsmtp.so
+%attr(755,root,root) %{moduledir}/libafsmtp.so
 %endif
 
 %if %{with sql}
 %files module-afsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsql.so
+%attr(755,root,root) %{moduledir}/libafsql.so
+%endif
+
+%if %{with http}
+%files module-http
+%defattr(644,root,root,755)
+%attr(755,root,root) %{moduledir}/libhttp.so
+%{_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) %{_libdir}/syslog-ng/libjson-plugin.so
+%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/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}
 %files module-redis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libredis.so
+%attr(755,root,root) %{moduledir}/libredis.so
 %endif
 
-%if %{with geoip}
-%files module-tfgeoip
+%if %{with riemann}
+%files module-riemann
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libtfgeoip.so
+%attr(755,root,root) %{moduledir}/libriemann.so
 %endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsyslog-ng-%{version}.so
+%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.*.*.*
+%attr(755,root,root) %ghost %{slibdir}/libsyslog-ng-%{mver}.so.0
 %dir %{_datadir}/syslog-ng
 
 %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
-%{_includedir}/syslog-ng
+%{_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
+%{_includedir}/syslog-ng/filter
+%{_includedir}/syslog-ng/healthcheck
+%if %{without system_libivykis}
+%{_includedir}/syslog-ng/ivykis
+%endif
+%{_includedir}/syslog-ng/logmsg
+%{_includedir}/syslog-ng/logproto
+%{_includedir}/syslog-ng/logthrdest
+%{_includedir}/syslog-ng/logthrsource
+%{_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
+%{_includedir}/syslog-ng/timeutils
+%{_includedir}/syslog-ng/transport
+%{_includedir}/syslog-ng/value-pairs
 %{_datadir}/syslog-ng/tools
 %{_pkgconfigdir}/syslog-ng.pc
+%{_pkgconfigdir}/syslog-ng-native-connector.pc