4 changed files with 41 additions and 178 deletions
--- a/.gitignore
+++ b/.gitignore
@ -37,12 +37,3 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.18.1.tar.gz
 /syslog-ng-3.19.1.tar.gz
 /syslog-ng-3.20.1.tar.gz
-/syslog-ng-3.21.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
-/syslog-ng-3.30.1.tar.gz
-/syslog-ng-3.33.2.tar.gz
-/syslog-ng-3.35.1.tar.gz
-/syslog-ng-3.37.1.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (syslog-ng-3.37.1.tar.gz) = beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
+SHA512 (syslog-ng-3.20.1.tar.gz) = 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@ -1,4 +1,4 @@
-@version: 3.35
+@version: 3.20
@include "scl.conf"

 # syslog-ng configuration file.
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@ -1,7 +1,7 @@
 %global ivykis_ver 0.42.3

 %global syslog_ng_major_ver 3
-%global syslog_ng_minor_ver 37
+%global syslog_ng_minor_ver 20
 %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}
@ -12,19 +12,20 @@ Release: 1%{?dist}
 Summary: Next-generation syslog server

 License: GPLv2+
-URL:     https://www.syslog-ng.com/products/open-source-log-management/
+URL:     https://syslog-ng.org/
 Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 Source3: syslog-ng.service

-BuildRequires: make
 BuildRequires: bison
 BuildRequires: cyrus-sasl-devel
 BuildRequires: flex
-BuildRequires: glib2-devel
+BuildRequires: GeoIP-devel
+BuildRequires: glib2-devel >= 2.10.1
 BuildRequires: hiredis-devel
 BuildRequires: ivykis-devel >= %{ivykis_ver}
+BuildRequires: java-devel
 BuildRequires: json-c-devel
 BuildRequires: libcap-devel
 BuildRequires: libcurl-devel
@ -37,9 +38,8 @@ BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libxslt
 BuildRequires: mongo-c-driver-devel
-BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre-devel >= 6.1
 BuildRequires: perl-generators
 BuildRequires: pkgconfig
 BuildRequires: python3-devel
@ -47,9 +47,6 @@ BuildRequires: riemann-c-client-devel
 BuildRequires: snappy-devel
 BuildRequires: systemd-devel
 BuildRequires: systemd-units
-BuildRequires: librdkafka-devel
-BuildRequires: zlib-devel
-BuildRequires: paho-c-devel

 BuildRequires: /usr/bin/pathfix.py

@ -87,13 +84,6 @@ Key features:
   AMQP), files or databases (like PostgreSQL or MongoDB).


-%package slog
-Summary: secure logging support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description slog
-This module supports secure message transfer and storage (experimental).
-
 %package libdbi
 Summary: Libdbi support for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@ -109,13 +99,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description mongodb
 This module supports the mongodb database via libmongo-client.

-%package kafka
-Summary: Kafka support for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description kafka
-This module supports sending logs to Kafka through librdkafka.
-

 %package smtp
 Summary: SMTP support for %{name}
@ -125,12 +108,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports sending e-mail alerts through an smtp server.


-%package snmp
-Summary: SNMP support for %{name}
+%package java
+Summary: Java destination support for syslog-ng
 Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description snmp
-This module adds support for SNMP destination.
+ 
+%description java
+This package provides java destination support for syslog-ng.


 %package geoip
@ -174,23 +157,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description amqp
 This module supports the AMQP destination.

-%package mqtt
-Summary: mqtt support for %{name}
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description mqtt
-This module supports sending logs to MQTT through paho-c.

 %package python
 Summary: Python support for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: python3-syslog-ng < 3.22
+Requires: python3-%{name} = %{version}-%{release}

 %description python
 This module supports the Python destination.


+%package -n python3-%{name}
+Summary: Python extensions used by %{name}
+
+%description -n python3-%{name}
+This package contains the Python extensions used by the %{name}
+Python module.
+
+
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@ -220,15 +204,17 @@ rm -rf modules/afmongodb/mongo-c-driver

 # Fix python shebang
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" lib/merge-grammar.py
-touch -r lib/cfg-grammar.y lib/merge-grammar.py
+

 %build
+export GEOIP_LIBS=-lGeoIP
+export PYTHON=%{__python3}
 %configure \
    --prefix=%{_prefix} \
    --sysconfdir=%{_sysconfdir}/%{name} \
    --localstatedir=%{_sharedstatedir}/%{name} \
    --datadir=%{_datadir} \
-    --with-module-dir=%{_libdir}/%{name} \
+    --with-module-dir=/%{_libdir}/%{name} \
    --with-systemdsystemunitdir=%{_unitdir} \
    --with-ivykis=system \
    --with-mongoc=system \
@ -238,8 +224,6 @@ touch -r lib/cfg-grammar.y lib/merge-grammar.py
    --enable-spoof-source \
    --with-linux-caps=auto \
    --enable-sql \
-    --enable-kafka \
-    --enable-mqtt \
    --enable-json \
    --enable-ssl \
    --enable-smtp \
@ -250,11 +234,9 @@ touch -r lib/cfg-grammar.y lib/merge-grammar.py
    --enable-systemd \
    --enable-redis \
    --enable-amqp \
-    --enable-python \
-    --with-python=3 \
-    --disable-java \
+    --enable-python=3 \
+    --enable-java \
    --disable-java-modules \
-    --enable-afsnmp \
    --enable-riemann

 make %{_smp_mflags}
@ -387,12 +369,12 @@ fi
 %exclude %{_libdir}/syslog-ng/libafsmtp.so
 %exclude %{_libdir}/syslog-ng/libafsql.so
 %exclude %{_libdir}/syslog-ng/libgeoip2-plugin.so
+%exclude %{_libdir}/syslog-ng/libgeoip-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
-%exclude %{_libdir}/syslog-ng/libkafka.so

 %dir %{_datadir}/syslog-ng
 %{_datadir}/syslog-ng/syslog-ng.vim
@ -411,24 +393,11 @@ fi
 %{_mandir}/man1/dqtool.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
-%{_mandir}/man1/persist-tool.1*


-%files slog
-%{_bindir}/slogkey
-%{_bindir}/slogencrypt
-%{_bindir}/slogverify
-%{_libdir}/syslog-ng/libsecure-logging.so
-%{_mandir}/man1/slogkey.1*
-%{_mandir}/man1/slogencrypt.1*
-%{_mandir}/man1/slogverify.1*
-%{_mandir}/man7/secure-logging.7*
-
 %files libdbi
 %{_libdir}/syslog-ng/libafsql.so

-%files kafka
-%{_libdir}/%{name}/libkafka.so

 %files mongodb
 %{_libdir}/syslog-ng/libafmongodb.so
@ -437,17 +406,19 @@ fi
 %files redis
 %{_libdir}/syslog-ng/libredis.so

-%files mqtt
-%{_libdir}/%{name}/libmqtt.so

 %files smtp
 %{_libdir}/syslog-ng/libafsmtp.so

-%files snmp
-%{_libdir}/%{name}/libafsnmp.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 geoip
+%{_libdir}/syslog-ng/libgeoip-plugin.so
 %{_libdir}/syslog-ng/libgeoip2-plugin.so


@ -465,7 +436,11 @@ fi

 %files python
 %{_libdir}/syslog-ng/libmod-python.so
-%{_libdir}/syslog-ng/python/
+
+
+%files -n python3-%{name}
+%{python3_sitelib}/syslogng/
+%{python3_sitelib}/syslogng-*.egg-info


 %files devel
@ -482,109 +457,6 @@ fi


 %changelog
-* Mon Aug 15 2022 Peter Czanik <peter@czanik.hu> - 3.37.1-1
- update to 3.37.1
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.35.1-4
- Rebuilt for Python 3.11
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 18 2022 Kevin Fenzi <kevin@scrye.com> - 3.35.1-2
- Rebuild for hiredis 1.0.2
-
-* Mon Dec 06 2021 Peter Czanik <peter@czanik.hu> - 3.35.1-1
- update to 3.35.1
-
-* Sun Nov 07 2021 Björn Esser <besser82@fedoraproject.org> - 3.33.2-3
- Rebuild (riemann-c-client)
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3.33.2-2
- Rebuilt with OpenSSL 3.0.0
-
-* Wed Jul 28 2021 Peter Czanik <peter@czanik.hu> - 3.33.2-1
- update to 3.33.2
- enabled MQTT support
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 3.30.1-7
- Rebuild for versioned symbols in json-c
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.30.1-6
- Rebuilt for Python 3.10
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.30.1-5
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Fri Feb  5 2021 Peter Czanik <peter@czanik.hu> - 3.30.1-4
- fix Kafka support packaging
-
-* Mon Feb  1 2021 Peter Czanik <peter@czanik.hu> - 3.30.1-3
- enabled Kafka support
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 8 2020 Peter Czanik <peter@czanik.hu> - 3.30.1-0
- update to 3.30.1
-
-* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 3.27.1-5
- Rebuilt for new net-snmp release
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.27.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 3.27.1-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jun 15 2020 Peter Czanik <peter@czanik.hu> - 3.27.1-2
- do not mask syslog-ng modules to fix rhbz#1846777
-
-* Wed Jun 10 2020 Peter Czanik <peter@czanik.hu> - 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 <mhroncok@redhat.com> - 3.25.1-4
- Rebuilt for Python 3.9
-
-* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 3.25.1-3
- Rebuild (json-c)
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec 13 2019 Peter Czanik <peter@czanik.hu> - 3.25.1-1
- update to version 3.25.1
- removed GeoIP support: geoip2 (MaxMindDB) stays
-
-* Sun Sep 01 2019 My Karlsson <mk@acc.umu.se> - 3.23.1-1
- Update to version 3.23.1
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.22.1-2
- Rebuilt for Python 3.8
-
-* Tue Aug 13 2019 My Karlsson <mk@acc.umu.se> - 3.22.1-1
- Update to version 3.22.1
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 17 2019 My Karlsson <mk@acc.umu.se> - 3.21.1-2
- Exclude unversioned private libraries from Provides: metadata. (rhbz#1726732)
-
-* Sun May 12 2019 My Karlsson <mk@acc.umu.se> - 3.21.1-1
- Update to version 3.21.1
-
 * Sat Mar 02 2019 My Karlsson <mk@acc.umu.se> - 3.20.1-1
 - Update to version 3.20.1