From: "J. S." <[email protected]> Changelog : https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.7.0
Dropped patch - merged in this version : * 0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch New json-c dependency fixes configure failure. Signed-off-by: Jason Schonberg <[email protected]> Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Armin Kuster <[email protected]> --- ...ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch | 40 ------------------- ...{syslog-ng_4.6.0.bb => syslog-ng_4.7.0.bb} | 5 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch rename meta-oe/recipes-support/syslog-ng/{syslog-ng_4.6.0.bb => syslog-ng_4.7.0.bb} (97%) 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 deleted file mode 100644 index f21ad5d70f..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 -From: Peter Marko <[email protected]> -Date: Thu, 4 Apr 2024 15:44:18 +0200 -Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 - -With ipv6 disabled, there are linking errors currently. -This fixes it by not using the symbols when IPv6 is disabled. - -Solves #4810 with my config options -https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb - -Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] - -Signed-off-by: Peter Marko <[email protected]> ---- - lib/template/macros.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/template/macros.c b/lib/template/macros.c -index 54142706c..fcb83637f 100644 ---- a/lib/template/macros.c -+++ b/lib/template/macros.c -@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) - return 0; - if (g_sockaddr_inet_check(msg->saddr)) - return 4; -+#if SYSLOG_NG_ENABLE_IPV6 - if (g_sockaddr_inet6_check(msg->saddr)) - { - if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) - return 4; - return 6; - } -+#endif - return 0; - } - --- -2.30.2 - 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.7.0.bb similarity index 97% rename from meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb rename to meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb index ab4a8d1825..588a38126b 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb @@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c" SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ @@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta file://syslog-ng-tmp.conf \ file://syslog-ng.service-the-syslog-ng-service.patch \ file://0001-Fix-buildpaths-warning.patch \ - file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ " SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" -SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" +SRC_URI[sha256sum] = "b601265362c633a25f26c497a7e57592739d5a583b7963b722ff58f01b853506" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"; -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#113465): https://lists.openembedded.org/g/openembedded-devel/message/113465 Mute This Topic: https://lists.openembedded.org/mt/109406580/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
