From patchwork Sun Oct 16 20:16:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13904 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 7F533C4332F for ; Sun, 16 Oct 2022 20:17:18 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web09.33769.1665951434066426954 for ; Sun, 16 Oct 2022 13:17:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=j3U2yDqQ; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id z97so13396406ede.8 for ; Sun, 16 Oct 2022 13:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j4g2p5lkzaVSbi+9yeSMT9FALkY87Xi+YQd9Yhk+/Hk=; b=j3U2yDqQRemvcgAvzHxi3nwKfCrE+LtCCm9GKhEAESM8icgqdH0ExbqPV/DRUF7RXf pFtgJrWz2cv2jq+Kjip+IAm/ffdpBsMjKD+JscLSjNYhlk3U2crBPDKIsoULjX9/Jk18 glGBj8J4G1GdgbNUqq8ueiQgvfmvS8xUwXUv9hXLZAkTcVR2p9rCHO9gWhMvV9FB/4Xr AEGPJ89+IzB7z+hF+tmJrbGG4HfDiXoAEe1Js0RQMRL+mJt8RfoSbg1400yrzVrgz+az tAKia9pPAzMFVrIJtSo1yUfSOWsVUujelwNevuC9/YPl949Y7CwfdL1pRUvsXy6+XBCB st6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j4g2p5lkzaVSbi+9yeSMT9FALkY87Xi+YQd9Yhk+/Hk=; b=pzQV9gKx4WcGk6rA0wLy8hjTYAnlmgzlNiAE/0BPcabOWBCWQ7coNLx4dlo1xgnQcU b7JtkV3YMOX5jYQO4f7STfiHMWjPGkIOSX/5xmE5f4BPBLXm47YL6TBOBuYTLacjCTfi eSugtmCxhW7c4bRAJq7AcCsx2XzF5v7HW0OBHD9emzBU6Phal4nVrDAh365CR1tRwE+t f4gwxBjvv416Z4KWKfgl1RlCraxCzlquCXZqzLeWg25ez+D76Zonr8+Hc4q2KeQl0KH+ W9QSrmxJw0gvbtpwlieEsbepWXY+Z9w78OletTHj1V8iR7Bjuj2RaYFDegIGz8aFr2F2 O0/g== X-Gm-Message-State: ACrzQf2d0AlqJL7U9uUer0nM3W81Pz+4Q7DVs4I4y/M93f0p0suTEj6X 3rY+LHxKp0HKhi+un5myq1zWLbmhbWI= X-Google-Smtp-Source: AMsMyM5x8XxQwxsl7ZZKySPRXNpDjz9wVmYkXUaJaLe+b9hb/nknS3DOn9DUpSjtnJ5IfKA1RgTTXw== X-Received: by 2002:a05:6402:1205:b0:458:c1b2:e428 with SMTP id c5-20020a056402120500b00458c1b2e428mr7263258edw.94.1665951432129; Sun, 16 Oct 2022 13:17:12 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ti5-20020a170907c20500b0078d8c1eee44sm4950672ejc.158.2022.10.16.13.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Oct 2022 13:17:11 -0700 (PDT) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-networking][PATCH 1/3] conntrack-tools: Upgrade 1.4.6 -> 1.4.7 Date: Sun, 16 Oct 2022 21:16:57 +0100 Message-Id: <20221016201659.14759-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 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 ; Sun, 16 Oct 2022 20:17:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99180 Signed-off-by: Alex Kiernan --- .../{conntrack-tools_1.4.6.bb => conntrack-tools_1.4.7.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-networking/recipes-filter/conntrack-tools/{conntrack-tools_1.4.6.bb => conntrack-tools_1.4.7.bb} (90%) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb similarity index 90% rename from meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb rename to meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb index 8f57e823b88e..7d8ce9f80aa7 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb @@ -8,12 +8,11 @@ DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ EXTRA_OECONF += "LIBS=-ltirpc CPPFLAGS=-I${STAGING_INCDIR}/tirpc" -SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \ +SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2 \ file://conntrack-failover \ file://init \ " -SRC_URI[tar.md5sum] = "a9dc7567921213007def78ad72313109" -SRC_URI[tar.sha256sum] = "590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f" +SRC_URI[sha256sum] = "099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d" inherit autotools update-rc.d pkgconfig From patchwork Sun Oct 16 20:16:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13906 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 8051CC4332F for ; Sun, 16 Oct 2022 20:18:58 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web10.33418.1665951533373169260 for ; Sun, 16 Oct 2022 13:18:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DC6K7Njb; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id m15so13365639edb.13 for ; Sun, 16 Oct 2022 13:18:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R+zM11CNMvAQ88fjQE6v+aNgkcZUzdnoN19g95sHOrA=; b=DC6K7NjbAdKXQPMFLCg1N2s2XI2T5STGvMpW1l1aswHaKTrHTgvIUdUsHr9Uycdgqo DdA338yzzhcWB2BHkmtdEngqXx2rrp8jO33RrUGN+eJl4pvA7d0RP4lw/ZId3ssoM+Jk 5YKjC6Vx8n1qm//eqtEV/sg0sF2VZxaakga5rkTxg5Ww4ujvQvo30uhN0JvrKT1J4eSs XOyLWPRsBYcXzb7Elr2hpFXs3y3NAkFCMEa5WsbhtvWNc8stWwLOrhKI9GhWxR7pfxV/ T/tDORbFcOp/URWHYgnrcJmEJlEkFyVk6Erge3w97xCQnx7d+NfrHRULR1bxq0A/33H1 NU1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R+zM11CNMvAQ88fjQE6v+aNgkcZUzdnoN19g95sHOrA=; b=V3wyzBpbV+jTEasw9AlnETg04LLLdjrZOKFDwXk/XNZRt7fpk9ALNHUCmbVj3t+PM2 j/0v3M0FvTe+aVYzqN+yKSVn3VOAXIhZLn9sOZEWrW0y9TcEXQ2jmwcdTfZaAfa8HDRO RtqULJyCjHNnxSJqW/yCJNNlbUuHNBzAqTsVemGCDhyh6/U+4bgDzQpxg05YCvLExBMv kylYLZo0aapd1wG7/u1df3G0wtnnOU5ikjyMZHSV5rDgXxl5DrFMiu6R8WiXcJhy6JIS TW/XzAjGMw661mhcg/+MgiDa8CE4DJ4/tUN6V/SL66tFaKe380Qyus3o1HHJsE5ZjmCg 3C4Q== X-Gm-Message-State: ACrzQf0UYaciDiXzrZicA6KBK6gJfN6+mEfyoCcU9Yz15Z6J1qWT7Lwi HnjSANkgdwvcgp56PWpE/MWacF72OQg= X-Google-Smtp-Source: AMsMyM5usZi2QMbzLqpvpXXWOcuYGSUkYINnAJQgYWd6jaaz0UW5nFKpf8+/XHwLj13IZiWGgiSEXw== X-Received: by 2002:a05:6402:ea0:b0:454:38bf:aa3d with SMTP id h32-20020a0564020ea000b0045438bfaa3dmr7409505eda.291.1665951531530; Sun, 16 Oct 2022 13:18:51 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ti5-20020a170907c20500b0078d8c1eee44sm4950672ejc.158.2022.10.16.13.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Oct 2022 13:18:51 -0700 (PDT) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-networking][PATCH 2/3] conntrack-tools: Add PACKAGECONFIGs for build options Date: Sun, 16 Oct 2022 21:16:58 +0100 Message-Id: <20221016201659.14759-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221016201659.14759-1-alex.kiernan@gmail.com> References: <20221016201659.14759-1-alex.kiernan@gmail.com> MIME-Version: 1.0 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 ; Sun, 16 Oct 2022 20:18:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99181 Signed-off-by: Alex Kiernan --- .../conntrack-tools/conntrack-tools_1.4.7.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb index 7d8ce9f80aa7..6f88b5fe31b8 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb @@ -14,7 +14,14 @@ SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-too " SRC_URI[sha256sum] = "099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d" -inherit autotools update-rc.d pkgconfig +inherit autotools update-rc.d pkgconfig systemd + +PACKAGECONFIG ?= "cthelper cttimeout \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[cthelper] = "--enable-cthelper,--disable-cthelper" +PACKAGECONFIG[cttimeout] = "--enable-cttimeout,--disable-cttimeout" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" INITSCRIPT_NAME = "conntrackd" From patchwork Sun Oct 16 20:16:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13905 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 811B1C43217 for ; Sun, 16 Oct 2022 20:18:58 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web08.33595.1665951534291186592 for ; Sun, 16 Oct 2022 13:18:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jGn7Bmyb; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id ot12so20867148ejb.1 for ; Sun, 16 Oct 2022 13:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CB2lC5RAu29u8ZsjkCRI6hYsQ2us0hHrSHEVxD2jB7E=; b=jGn7Bmyb+2qAM1fdq8T6H+M+nK1PRCACAY9G8GtRlVDtoy7GyYWRpU+ioPBfkDiHDg hkrSHAfQ5SqtBIh04SPtRcPJka+OiGyRynPVm2rnP6VcIO/kFIl24jbaSmnM5yz2+cqf BGUjNtynYjT8mHqiUBGzlGfmjBruAtFBUBlnaYSgFKp39fZKlIhQ4ZG72SwgUcgOQ3+t wyGnEK8oxiuMG14WgehJBPiRls/xFLwr5gH8FAG6+sYgKjIZQ1zjizC/dz0vhqtQDRKK MC/Gs5JHZO3zcb8WG3z7tqIIjYwiGNg2CSnoiN0sPu/TADIbjW/Y9mtA3W8bTwWc4RFJ ZLRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CB2lC5RAu29u8ZsjkCRI6hYsQ2us0hHrSHEVxD2jB7E=; b=sPj3q2N5fFIo/+IM2dxB7lRMhhG2McN/Ep3bs5dQS9SyDMiUKaVKjGuAWH33EO9gNF pZ/9vTGDVneUkeRjASpuvh9CpBCErQvQdz/dzdhviCEjIMvlgeMU/wG7KDavZy5ywsHD 2z2z8AzzeE+ytcEYqXogoYgzsr5gOLV7okneA9qx/QOPshhwwoCjJ4yPv+87J7IRFsqA lp+QCTJSMbh9mNXfihmaMI9jJT5u6SDNNT0kxsseN+zF6hg8A8lo5J+mkTl+A9Mh81mH FjfcfhHXWroTroEuYEMFvM11n9LNe+juCbxrVdklvlI+U85T/zSdR07W7TZXlkhk4kwq GgrQ== X-Gm-Message-State: ACrzQf24eQW8hZb5vXEC3mF4M36+kf/+lKJBvvWwbvbJE67jwTleefjm ArH5Y9AMB6oAGXw35wpRO0ISc6HuDhU= X-Google-Smtp-Source: AMsMyM6dMIcSb4OLFXPbhjSqEjxFruZWE2JRNrjo0/2nCT58lVUZkkeMiLI5TuDxbfpdCtc64H/zww== X-Received: by 2002:a17:907:b0b:b0:78d:8877:9f9e with SMTP id h11-20020a1709070b0b00b0078d88779f9emr6102429ejl.693.1665951532404; Sun, 16 Oct 2022 13:18:52 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ti5-20020a170907c20500b0078d8c1eee44sm4950672ejc.158.2022.10.16.13.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Oct 2022 13:18:51 -0700 (PDT) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-networking][PATCH 3/3] conntrack-tools: Use canonical shell spacing Date: Sun, 16 Oct 2022 21:16:59 +0100 Message-Id: <20221016201659.14759-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221016201659.14759-1-alex.kiernan@gmail.com> References: <20221016201659.14759-1-alex.kiernan@gmail.com> MIME-Version: 1.0 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 ; Sun, 16 Oct 2022 20:18:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99182 Signed-off-by: Alex Kiernan --- .../conntrack-tools/conntrack-tools_1.4.7.bb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb index 6f88b5fe31b8..8b47ceb1c054 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb @@ -26,21 +26,21 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" INITSCRIPT_NAME = "conntrackd" do_install:append() { - install -d ${D}/${sysconfdir}/conntrackd - install -d ${D}/${sysconfdir}/init.d - install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample - install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd - - # Fix hardcoded paths in scripts - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd - sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample - sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd + install -d ${D}/${sysconfdir}/conntrackd + install -d ${D}/${sysconfdir}/init.d + install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample + install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd + + # Fix hardcoded paths in scripts + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd + sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample + sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd } # fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-) pkg_postinst:${PN} () { - setcap cap_net_admin+ep "$D/${sbindir}/conntrack" + setcap cap_net_admin+ep "$D/${sbindir}/conntrack" } PACKAGE_WRITE_DEPS += "libcap-native"