summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0001-feat-Add-option-in-cmake-to-remove-awk.patch37
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0002-feat-Add-option-in-autotools-to-remove-awk.patch55
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb4
3 files changed, 95 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-feat-Add-option-in-cmake-to-remove-awk.patch b/meta-oe/recipes-support/syslog-ng/files/0001-feat-Add-option-in-cmake-to-remove-awk.patch
new file mode 100644
index 0000000000..931b83a1d0
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0001-feat-Add-option-in-cmake-to-remove-awk.patch
@@ -0,0 +1,37 @@
1From 57df53d6132cc77251cea746ad6ab6cfd9c8a9f1 Mon Sep 17 00:00:00 2001
2From: Alexander Yurkov <alexander.v.yurkov@gmail.com>
3Date: Thu, 28 May 2026 21:01:40 +0000
4Subject: [PATCH] feat: Add option in cmake to remove awk.
5
6Add an option in cmake to remove the need for awk to avoid licensing issues.
7
8Upstream-Status: Backport [cd7ca1019aca0619f83035f2b11e8f3a22c51a33]
9
10Signed-off-by: Alexander Yurkov <alexander.v.yurkov@gmail.com>
11---
12 scl/CMakeLists.txt | 11 ++++++++++-
13 1 file changed, 10 insertions(+), 1 deletion(-)
14
15diff --git a/scl/CMakeLists.txt b/scl/CMakeLists.txt
16index e3f8c1d..bef4d50 100644
17--- a/scl/CMakeLists.txt
18+++ b/scl/CMakeLists.txt
19@@ -54,8 +54,17 @@ set(SCL_DIRS
20 azure
21 )
22
23+option(ENABLE_SCL_SYSLOGCONF_AWK "Install scl/syslogconf/convert-syslogconf.awk" ON)
24+
25 install(DIRECTORY ${SCL_DIRS} DESTINATION share/syslog-ng/include/scl
26- USE_SOURCE_PERMISSIONS)
27+ USE_SOURCE_PERMISSIONS
28+ PATTERN "convert-syslogconf.awk" EXCLUDE)
29+
30+if (ENABLE_SCL_SYSLOGCONF_AWK)
31+ install(FILES syslogconf/convert-syslogconf.awk
32+ DESTINATION share/syslog-ng/include/scl/syslogconf)
33+endif()
34+
35 install(FILES scl.conf DESTINATION share/syslog-ng/include)
36
37 if (NOT EXISTS ${CMAKE_INSTALL_PREFIX}/etc/syslog-ng.conf)
diff --git a/meta-oe/recipes-support/syslog-ng/files/0002-feat-Add-option-in-autotools-to-remove-awk.patch b/meta-oe/recipes-support/syslog-ng/files/0002-feat-Add-option-in-autotools-to-remove-awk.patch
new file mode 100644
index 0000000000..976066c3ff
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0002-feat-Add-option-in-autotools-to-remove-awk.patch
@@ -0,0 +1,55 @@
1From dc42135ae830e34df7939bf3c08934904c402fa6 Mon Sep 17 00:00:00 2001
2From: Alexander Yurkov <alexander.v.yurkov@gmail.com>
3Date: Thu, 28 May 2026 21:04:27 +0000
4Subject: [PATCH] feat: Add option in autotools to remove awk.
5
6The option is to avoid licensing issues, and awk is turned off by
7default.
8
9Upstream-Status: Backport [eda6d019710048e81f00f3497d5f1143f3eca803]
10
11Signed-off-by: Alexander Yurkov <alexander.v.yurkov@gmail.com>
12---
13 configure.ac | 7 +++++++
14 scl/Makefile.am | 3 +++
15 2 files changed, 10 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index b283836..b6c487b 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -639,6 +639,12 @@ AC_ARG_ENABLE(all-modules,
22 AS_HELP_STRING([--enable-all-modules], [Forcibly enable all modules. (default: auto)]),
23 , enable_all_modules="auto")
24
25+AC_ARG_ENABLE([scl-syslogconf-awk],
26+ [AS_HELP_STRING([--disable-scl-syslogconf-awk],
27+ [Do not install scl/syslogconf/convert-syslogconf.awk])],
28+ [],
29+ [enable_scl_syslogconf_awk=yes])
30+
31 if test "x$enable_all_modules" != "xauto"; then
32 state="$enable_all_modules"
33
34@@ -2685,6 +2691,7 @@ AM_CONDITIONAL([HAVE_GETRANDOM], [test x$ac_cv_func_getrandom = xyes])
35 AM_CONDITIONAL([HAVE_FMEMOPEN], [test x$ac_cv_func_fmemopen = xyes])
36 AM_CONDITIONAL([HAVE_JAVAH], [test -n "$JAVAH_BIN"])
37 AM_CONDITIONAL(ENABLE_IPV6, [test $enable_ipv6 = yes])
38+AM_CONDITIONAL([ENABLE_SCL_SYSLOGCONF_AWK], [test "x$enable_scl_syslogconf_awk" = "xyes"])
39
40 AM_CONDITIONAL(OS_TYPE_MACOS, [test $ostype = "Darwin"])
41 AM_CONDITIONAL(OS_TYPE_FREEBSD, [test $ostype = "FreeBSD"])
42diff --git a/scl/Makefile.am b/scl/Makefile.am
43index 17d1a55..62b9d01 100644
44--- a/scl/Makefile.am
45+++ b/scl/Makefile.am
46@@ -71,6 +71,9 @@ scl-install-data-local:
47 $(install_sh_DATA) $(srcdir)/scl/scl.conf $(DESTDIR)/$(config_includedir)/scl.conf; \
48 fi
49 (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner)
50+if !ENABLE_SCL_SYSLOGCONF_AWK
51+ rm -f $(DESTDIR)/$(scldir)/syslogconf/convert-syslogconf.awk
52+endif
53 chmod -R u+rwX $(DESTDIR)/$(scldir)
54
55 scl-uninstall-local:
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb
index 1846758681..9c6f62856b 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.11.0.bb
@@ -23,7 +23,9 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
23 file://syslog-ng-tmp.conf \ 23 file://syslog-ng-tmp.conf \
24 file://syslog-ng.service-the-syslog-ng-service.patch \ 24 file://syslog-ng.service-the-syslog-ng-service.patch \
25 file://0001-Fix-buildpaths-warning.patch \ 25 file://0001-Fix-buildpaths-warning.patch \
26" 26 file://0001-feat-Add-option-in-cmake-to-remove-awk.patch \
27 file://0002-feat-Add-option-in-autotools-to-remove-awk.patch \
28 "
27SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" 29SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
28 30
29SRC_URI[sha256sum] = "37ea0d4588533316de122df4e1b249867b0a0575f646c7478d0cc4d747462943" 31SRC_URI[sha256sum] = "37ea0d4588533316de122df4e1b249867b0a0575f646c7478d0cc4d747462943"