diff options
author | Peter Marko <peter.marko@siemens.com> | 2024-04-04 23:18:57 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-04-04 23:55:06 -0700 |
commit | 66d4d29d2ae43c83398fe1d661faa8b1e22f4159 (patch) | |
tree | 218a945c64f56f546fd99d8fdab97a936f714102 /meta-oe/recipes-support | |
parent | 7efd67bcafd0d714c22b16b890cc99f10ec7a3f9 (diff) | |
download | meta-openembedded-66d4d29d2ae43c83398fe1d661faa8b1e22f4159.tar.gz |
syslog-ng: fix build without ipv6 in distro features
Sumbitted to https://github.com/syslog-ng/syslog-ng/pull/4880
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch new file mode 100644 index 000000000..f21ad5d70 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Marko <peter.marko@siemens.com> | ||
3 | Date: Thu, 4 Apr 2024 15:44:18 +0200 | ||
4 | Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 | ||
5 | |||
6 | With ipv6 disabled, there are linking errors currently. | ||
7 | This fixes it by not using the symbols when IPv6 is disabled. | ||
8 | |||
9 | Solves #4810 with my config options | ||
10 | https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] | ||
13 | |||
14 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
15 | --- | ||
16 | lib/template/macros.c | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/lib/template/macros.c b/lib/template/macros.c | ||
20 | index 54142706c..fcb83637f 100644 | ||
21 | --- a/lib/template/macros.c | ||
22 | +++ b/lib/template/macros.c | ||
23 | @@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) | ||
24 | return 0; | ||
25 | if (g_sockaddr_inet_check(msg->saddr)) | ||
26 | return 4; | ||
27 | +#if SYSLOG_NG_ENABLE_IPV6 | ||
28 | if (g_sockaddr_inet6_check(msg->saddr)) | ||
29 | { | ||
30 | if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) | ||
31 | return 4; | ||
32 | return 6; | ||
33 | } | ||
34 | +#endif | ||
35 | return 0; | ||
36 | } | ||
37 | |||
38 | -- | ||
39 | 2.30.2 | ||
40 | |||
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb index 4cc5d8451..458494415 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb | |||
@@ -23,6 +23,7 @@ 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 | file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ | ||
26 | " | 27 | " |
27 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" | 28 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" |
28 | 29 | ||