[packages/syslog-ng] Up to 4.11.0; disable tcp_wrappers support by default (it's old, unmaintained package that should be
arekm
arekm at pld-linux.org
Mon Mar 2 22:27:58 CET 2026
commit fb44f40f902d3ff787cc0932b3422649bb38be7a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Mar 2 21:27:00 2026 +0100
Up to 4.11.0; disable tcp_wrappers support by default (it's old, unmaintained package that should be gone).
32bit.patch | 26 --------------------------
bad-tests.patch | 11 +++++++++++
glib-static.patch | 22 ----------------------
no_shared_ivykis.patch | 11 -----------
syslog-ng-link.patch | 34 ----------------------------------
syslog-ng.spec | 30 +++++++++++-------------------
6 files changed, 22 insertions(+), 112 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 21ccd6e..7e80f76 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -21,6 +21,7 @@
%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_with tcp_wrappers # tcp_wrappers/libwrap support
%bcond_without amqp # AMQP support
%bcond_without python # python module
%bcond_with java # java modules and support
@@ -35,18 +36,18 @@
%define libivykis_version 0.43.2
%define glib2_ver 1:2.32.0
-%define mver 4.10
+%define mver 4.11
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: 4.10.2
-Release: 5
+Version: 4.11.0
+Release: 1
License: GPL v2+ with OpenSSL exception
Group: Daemons
#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: 0c97637b266efcf932b5fdea5f40235e
+# Source0-md5: 91d6cf2c7ad7e50d2c6ab983ff3386ca
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.logrotate
@@ -60,13 +61,9 @@ Source5: https://downloads.sourceforge.net/libivykis/ivykis-%{libivykis_version}
%endif
Source7: syslog-ng.service
Patch0: %{name}-datadir.patch
-Patch2: %{name}-nolibs.patch
-Patch3: %{name}-systemd.patch
-Patch5: %{name}-link.patch
-Patch6: no_shared_ivykis.patch
-Patch7: 32bit.patch
-Patch8: bad-tests.patch
-Patch9: glib-static.patch
+Patch1: %{name}-nolibs.patch
+Patch2: %{name}-systemd.patch
+Patch3: bad-tests.patch
URL: https://syslog-ng.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -95,7 +92,7 @@ BuildRequires: libcap-devel
BuildRequires: libnet-devel >= 1:1.1.2.1-3
%{?with_kafka:BuildRequires: librdkafka-devel >= 1.1.0}
BuildRequires: libtool >= 2:2.0
-BuildRequires: libwrap-devel
+%{?with_tcp_wrappers:BuildRequires: libwrap-devel}
BuildRequires: libxslt-progs
BuildRequires: lz4-devel >= r131-5
%{?with_mongodb:BuildRequires: mongo-c-driver-devel >= 1.0.0}
@@ -418,13 +415,9 @@ rmdir lib/ivykis
%endif
%patch -P0 -p1
+%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
cp -p %{SOURCE4} contrib/syslog-ng.conf.simple
%{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
@@ -478,7 +471,7 @@ done
--enable-ssl \
--enable-systemd%{!?with_systemd:=no} \
--with-systemd-journal=auto \
- --enable-tcp-wrapper \
+ --enable-tcp-wrapper%{!?with_tcp_wrappers:no} \
%if %{with sql}
--enable-sql \
%endif
@@ -703,7 +696,6 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
%{_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/jellyfin
%{_datadir}/syslog-ng/include/scl/junos
diff --git a/32bit.patch b/32bit.patch
deleted file mode 100644
index 359ba3e..0000000
--- a/32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur syslog-ng-syslog-ng-3.27.1/lib/logsource.c syslog-ng-syslog-ng-3.27.1.32bit/lib/logsource.c
---- syslog-ng-syslog-ng-3.27.1/lib/logsource.c 2020-04-30 16:18:56.000000000 +0200
-+++ syslog-ng-syslog-ng-3.27.1.32bit/lib/logsource.c 2020-05-09 11:36:21.539723717 +0200
-@@ -57,7 +58,7 @@
- return window_size_increment;
- }
-
-- guint32 remaining_window_size_increment = MAX(window_size_increment - old, 0);
-+ guint32 remaining_window_size_increment = MAX((gssize)window_size_increment - old, 0);
- guint32 reclaimed = window_size_increment - remaining_window_size_increment;
- atomic_gssize_add(&self->pending_reclaimed, reclaimed);
-
-diff -ur syslog-ng-syslog-ng-3.27.1/lib/tests/test_window_size_counter.c syslog-ng-syslog-ng-3.27.1.32bit/lib/tests/test_window_size_counter.c
---- syslog-ng-syslog-ng-3.27.1/lib/tests/test_window_size_counter.c 2020-04-30 16:18:56.000000000 +0200
-+++ syslog-ng-syslog-ng-3.27.1.32bit/lib/tests/test_window_size_counter.c 2020-05-09 11:43:12.103043082 +0200
-@@ -59,8 +59,8 @@
- WindowSizeCounter c;
- gboolean suspended = FALSE;
- window_size_counter_set(&c, -1);
-- gint v = (gint)window_size_counter_get(&c, &suspended);
-- cr_assert_eq(v, -1);
-+ gssize v = (gssize)window_size_counter_get(&c, &suspended);
-+ cr_assert_eq(v, G_MAXLONG);
- }
-
- Test(test_window_size_counter, suspend_resume_multiple_times)
diff --git a/bad-tests.patch b/bad-tests.patch
index 7ae397e..d007bca 100644
--- a/bad-tests.patch
+++ b/bad-tests.patch
@@ -17,3 +17,14 @@
def test_hypr_audit_source_complete_lifecycle(minimal_config, mocker):
response_json = [
+--- syslog-ng-4.11.0/modules/http/tests/test_compression.c~ 2026-02-24 15:48:43.000000000 +0100
++++ syslog-ng-4.11.0/modules/http/tests/test_compression.c 2026-03-02 22:14:58.986891033 +0100
+@@ -22,7 +22,7 @@
+
+ #include <syslog-ng-config.h>
+
+-#if SYSLOG_NG_HAVE_ZLIB
++#if 0
+
+ #include <criterion/criterion.h>
+ #include <criterion/redirect.h>
diff --git a/glib-static.patch b/glib-static.patch
deleted file mode 100644
index 5b73761..0000000
--- a/glib-static.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- syslog-ng-4.8.0/configure.ac~ 2024-08-01 19:27:51.000000000 +0200
-+++ syslog-ng-4.8.0/configure.ac 2024-08-01 19:28:54.109970068 +0200
-@@ -1036,15 +1036,17 @@ dnl GLib headers/libraries
- SAFE_C_CHECK_BEGIN
-
- GLIB_ADDONS="gmodule-2.0 gthread-2.0"
--PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
-
- if test "$linking_mode" != "dynamic"; then
-+ PKG_CHECK_MODULES_STATIC(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
- # strip out -ldl & -lrt as it cannot be linked statically
-- GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$" | tr '\n' ' '`
-+ GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)|(-lm)|(-lpcre2-8)$" | tr '\n' ' '`
-
- LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC $BASE_LIBS"
- AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes, blb_cv_static_glib=no)
- LIBS=$LIBS_SAVE
-+else
-+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
- fi
-
- CPPFLAGS="$GLIB_CFLAGS"
diff --git a/no_shared_ivykis.patch b/no_shared_ivykis.patch
deleted file mode 100644
index 2f6f5c4..0000000
--- a/no_shared_ivykis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- syslog-ng-syslog-ng-3.14.1.orig/lib/ivykis/configure.ac 2017-10-18 01:42:59.000000000 +0200
-+++ syslog-ng-syslog-ng-3.14.1/lib/ivykis/configure.ac 2018-03-30 15:58:09.000000000 +0200
-@@ -22,7 +22,7 @@
- esac
-
- # Checks for programs.
--LT_INIT
-+LT_INIT([disable-shared])
- AC_PROG_CC
- AC_PROG_LIBTOOL
-
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
deleted file mode 100644
index 0d653b8..0000000
--- a/syslog-ng-link.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
---- syslog-ng-4.8.0/configure.ac.orig 2024-08-01 19:24:08.129970075 +0200
-+++ syslog-ng-4.8.0/configure.ac 2024-08-01 19:26:09.006636741 +0200
-@@ -2164,7 +2164,7 @@ if test "x$linking_mode" = "xdynamic"; t
- # syslog-ng binary is linked with the default link command (e.g. libtool)
- SYSLOGNG_LINK='$(LINK)'
- else
-- SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE2_LIBS $REGEX_LIBS -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS $LIBUNWIND_LIBS $JSON_LIBS"
-+ SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE2_LIBS $REGEX_LIBS -Wl,${NO_WHOLE_ARCHIVE_OPT} $LD_END_STATIC $IVYKIS_NO_LIBTOOL_LIBS $LIBCAP_LIBS $DL_LIBS $LIBUNWIND_LIBS $JSON_LIBS"
- TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRETSTORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE2_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS $JSON_LIBS"
- CORE_DEPS_LIBS=""
-
-diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am syslog-ng-3.29.1/lib/logproto/tests/Makefile.am
---- syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am 2020-08-10 20:04:39.000000000 +0200
-+++ syslog-ng-3.29.1/lib/logproto/tests/Makefile.am 2021-02-28 14:27:10.230296549 +0100
-@@ -23,7 +23,6 @@ lib_logproto_tests_test_findeom_CFLAGS =
- $(TEST_CFLAGS) \
- -I${top_srcdir}/libtest
- lib_logproto_tests_test_findeom_LDADD = \
-- ${top_builddir}/lib/libsyslog-ng.la \
- ${top_builddir}/libtest/libsyslog-ng-test.a \
- $(TEST_LDADD)
- lib_logproto_tests_test_findeom_SOURCES = \
---- syslog-ng-4.8.0/lib/Makefile.am~ 2024-07-23 13:42:10.000000000 +0200
-+++ syslog-ng-4.8.0/lib/Makefile.am 2024-08-01 19:36:57.976636728 +0200
-@@ -311,7 +311,7 @@ lib_libsyslog_ng_la_SOURCES = \
- lib_libsyslog_ng_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(libsystemd_CFLAGS)
--lib_libsyslog_ng_la_LIBADD += @OPENSSL_LIBS@
-+lib_libsyslog_ng_la_LIBADD += @OPENSSL_LIBS@ @JSON_LIBS@ @LIBUNWIND_LIBS@
-
- # each line with closely related files (e.g. the ones generated from the same source)
- BUILT_SOURCES += lib/cfg-lex.c lib/cfg-lex.h \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/fb44f40f902d3ff787cc0932b3422649bb38be7a
More information about the pld-cvs-commit
mailing list