From patchwork Wed Sep 25 21:42:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. S." X-Patchwork-Id: 49617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A61B0CCFA01 for ; Wed, 25 Sep 2024 21:43:01 +0000 (UTC) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by mx.groups.io with SMTP id smtpd.web10.28503.1727300575522736748 for ; Wed, 25 Sep 2024 14:42:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VoE1Uv2e; spf=pass (domain: gmail.com, ip: 209.85.210.48, mailfrom: schonm@gmail.com) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-7124395ca86so141469a34.0 for ; Wed, 25 Sep 2024 14:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727300574; x=1727905374; darn=lists.openembedded.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=3NCsHJvTdaAwbTzpk2duswNJFoEF0laRMDwDjjq333E=; b=VoE1Uv2eVnjkZMVnbBEJaF2R9be22spj+mc0APhm9HOoWUGwddcxPVBRF/BZiy3QWO X7Rwc0DDJBSt5sT2SAtvPA/W+kwGK+srWor+gM7SBIzPIwXw8S05US33200G2Yp/IENL DaMSRuhaZ/DJ5XZ0YaT35CxD5fNkzhfVtvXuhhj6ZjvjC8od2SL0rxHeMFNE9B3HDwRc gVW9aGiSPNr3D7WKmYBh+PmIyLEuQ5qm5kdzg3g+enU7DfJ5WxhVTd33ji9dJ7zkglGB fAlcLqNrSZRvdbHV2aA9QfGsOmloKP4HFETBvEsZ0kmu8GbV7kpnHnrAE54og5mg/FPG bPxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727300574; x=1727905374; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3NCsHJvTdaAwbTzpk2duswNJFoEF0laRMDwDjjq333E=; b=Ky5CKBebQT32lwJ3XeDp1WoQvuG+JJLXSJi0iV/5CHe7SnZ94wrB03xhYbCQOHyq8+ H1q2dJwSh3KmGe7buVw8MOE8UqHDS/UdKFAH2qrXLAVNpMkwHM6XKA/LBuUmHJxou9vw 3bas9BTXMMYcDmXDzp7TKa8AGD0mrut9HSTiKTT91jW3csFvG6G5lCArm7590yLngyah 4IDa7UwcnuyoQ8asxarBedBVzvBSNpqHQu8NLWz5kwiyDiGdcgRlXtKMwk79BouZlf9u DRtd/yhLwLBOZI9QLD/6NDO5LQedVpElDiKEwsv30y2qfD84KZ96evADCf+UmG3f62HD Xidw== X-Gm-Message-State: AOJu0YxkdwQEsWzKk2quteQgXs/SFE3nlpGAiAAvrjqmHHqSxmURC+ML f3UuaDycGUsTxxqsXUufrTYYieOIErLyrIqy3SulNj/jhkl1GJnDoPt0tZMCnBplPTpX2l+Mjqz Y628kfIprdNXuWMahTYX2OnAObNq3Cd0l X-Google-Smtp-Source: AGHT+IGO6ucBO5M3wbWHVIXF2lTDYhNfFk41iiVV0iK7yqC5zFalWJtjVcFpEYutCuXVG2buMT0HxHDY71noHq+QkF8= X-Received: by 2002:a05:6830:3894:b0:70c:9c46:b83d with SMTP id 46e09a7af769-713c7e22dbbmr5128236a34.25.1727300574234; Wed, 25 Sep 2024 14:42:54 -0700 (PDT) MIME-Version: 1.0 From: "J. S." Date: Wed, 25 Sep 2024 17:42:43 -0400 Message-ID: Subject: [meta-oe][PATCH] syslog-ng: upgrade 4.6.0 -> 4.7.0 To: openembedded-devel@lists.openembedded.org List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 25 Sep 2024 21:43:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112501 Please find attached a patch to upgrade syslong-ng from version 4.6.0 to 4.7.0. Thank you, Jason Schonberg commit 4b61d48e8e97b428e145441058dc5de7bbcf18c3 Author: Jason Schonberg Date: Wed Sep 25 15:25:44 2024 -0400 syslog-ng: upgrade 4.6.0 -> 4.7.0 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 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 f21ad5d70..000000000 --- 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 -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 ---- - 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 ab4a8d182..588a38126 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"