From patchwork Mon Feb 28 22:21:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 4469 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 5E850C433FE for ; Mon, 28 Feb 2022 22:22:00 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.1425.1646086917097059565 for ; Mon, 28 Feb 2022 14:21:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ESc8Mz52; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id 132so12781499pga.5 for ; Mon, 28 Feb 2022 14:21:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JDj91XuUfxXv2Qs96HSJuqU0tVYMUKeOpjUB0u2SZvg=; b=ESc8Mz52dHLf+Xbvmj4x+MdjIGEDSHRbavrdt2jOfgd6oUB0xmzDqKO1xnxsq/NP/U LNr4LOJ0I3QeaPBWonw/5036TnB/cYuW8GBuyrgVYiJ6eJmXoMCzISiGPtlWbCy18VRw Cu5sSefOZjXLwUcVDQwNQpx43wD7GFQx+4ojSEfimgW8UnErNo9l9wBCtM+dlp8GL/vc buK2Jh9jziVBwevSf/uQT8SoFpg6tbNQD85zzxayH/NS0FbKhSJP6hlMPGGSuIrgzVBo UN/Om4No0de3eB6er04LryfQFlv+l7FBG6oj3fZD5LVEVGqX4oLEo7jKByQ1dFAxr1Ge sq/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JDj91XuUfxXv2Qs96HSJuqU0tVYMUKeOpjUB0u2SZvg=; b=h+hRCEE5Gvjfh4JCrimtyBBlYoH5A0Syipaud0T0jfy8W1dGQfWoozUR82Zw39egX7 tSSS/OwnGoas+VrJIgIZFEZdjj1CXsXl4YHnVGVZEiDq0oNJU5/Lgk2nY0h6TKDQbuT9 LcOe5wKbWZW/z6rQIylywIQnLZumIM98sPG69j58ZeNLc3leP1qTs/FiIVeEaoHZmBG3 6S++GL2jPpAzFyAiJRwi+e8V2b8qlyjgjGCbb3+GDqjJyYkDzDIp/NxMMgCP1VUGDGTM IEe/DRpimzenpoAeWl9O0QKe0qXmsZL1IqmjQ+V7iqO7qAOCCJY5kYUAA3ib5zwgTYEc zGnA== X-Gm-Message-State: AOAM5307fJ+PXZw9hRKyEg6OREQgOpTQPdvoVOeqNgHwQw1ZMG7o/EFt 29fv7jUZ9SttMa/YP1SbGzMhR7vnqom66A== X-Google-Smtp-Source: ABdhPJyLA0CTvGNIyrLdqG10aU6dziu/xv6IIW+yzVb0oJYRBNYDiwkLxJHLvyxN/x/IKzXA4vTCww== X-Received: by 2002:a05:6a00:1307:b0:4b0:b1c:6fd9 with SMTP id j7-20020a056a00130700b004b00b1c6fd9mr24030228pfu.27.1646086916310; Mon, 28 Feb 2022 14:21:56 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1a20]) by smtp.gmail.com with ESMTPSA id o17-20020a056a0015d100b004e1c11d833fsm15430992pfu.90.2022.02.28.14.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 14:21:55 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 1/3] python3-scapy: Define custom PYPA_WHEEL Date: Mon, 28 Feb 2022 14:21:52 -0800 Message-Id: <20220228222154.210195-1-raj.khem@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 ; Mon, 28 Feb 2022 22:22:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95598 Standard defaults are not able to guess it right, so aid it a bit Signed-off-by: Khem Raj --- meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb index d318c27c5a..3a1f102dc9 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb @@ -25,6 +25,8 @@ S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" inherit setuptools3 ptest +PIP_INSTALL_PACKAGE = "scapy" +PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl" do_install:append() { mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 From patchwork Mon Feb 28 22:21:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 4471 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 58F0BC433EF for ; Mon, 28 Feb 2022 22:22:10 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web09.1436.1646086917888275165 for ; Mon, 28 Feb 2022 14:21:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bdrjSwh/; spf=pass (domain: gmail.com, ip: 209.85.215.174, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f174.google.com with SMTP id o23so12746182pgk.13 for ; Mon, 28 Feb 2022 14:21:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fym3ByBi9vBBcziy4Wu+7Ho492Lx2ybgorOiUwCUVCk=; b=bdrjSwh/XnLz17AvZZcTidAMfZwQhwmhf1bp0NmtO0cu/Hz48gjXJ9oSt0ltFXeFd6 L8P5GOFruNOXjj2NMjhZjaFJecZeP0+DUw728XeZkiiANnzKSxT166/dXHPccTckr7OR whQzBGVcd2p3aRKKGlw48Xbn0+SF9RqUT3voAL82dOvU5Qg3XdpHoy8+dXde4ROWXW38 xn4Xazuz2xPC8IKBxjNkIE58PaU1UuFQjsuWOkOFJ/aRvWVLlJ7GuVLOoFzFZ3dCBP1L ulcm6r3QAfPhWHraPgjZN5lPPbx+b9/Hy5fToZhG9CEykm5XkHAs3I6fqLe/xmq1zSMr lR7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fym3ByBi9vBBcziy4Wu+7Ho492Lx2ybgorOiUwCUVCk=; b=R2A/Kb0rqHG0BA9LXy7lLx2si/HW6IRnjLgaoqFNWDKL1rUfZQDesdC2UHf+cIxkI4 ioNbpXPSTeGFfUBWfv09uBA3o/yRT4s4IVy7kS6LpPp9LUzVuMv2txLw06d16ffPEoxU YrIh8JHxqEXVLYwHTNpfr1AQ8yXebSoMtaXoELoh6ABECAZ+cz+364A0RON9kBPLg3tV z8x4OLDHyEKd3DxlENsZSlhir5wTgtfAeZc70Ok5eZ7C+OxjtPkmgN9yhvPriG6eo72Y HCkrZYRTV3R2B0HpPUJdamqsVZA8cAzCWCwGE55RsbnlL7d26CSm4FrlPZVYky2sQBq+ W1BQ== X-Gm-Message-State: AOAM530GjDJE0xG851/QLPzlzwYKiGSpvPchmPM+r5mJ5rvKSYPMwP7t cy8Y3bNb6200LBT08CANlxs+9Ow8wkGt2Q== X-Google-Smtp-Source: ABdhPJw3qCHZK4y6NtcbS6ho+VJ0eYJDKhlC6izj6STPOOdfXNRCSvKUDni0X0pm8jvDpX38kN5LVQ== X-Received: by 2002:a63:6942:0:b0:372:8da5:e137 with SMTP id e63-20020a636942000000b003728da5e137mr18983497pgc.618.1646086917125; Mon, 28 Feb 2022 14:21:57 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1a20]) by smtp.gmail.com with ESMTPSA id o17-20020a056a0015d100b004e1c11d833fsm15430992pfu.90.2022.02.28.14.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 14:21:56 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 2/3] bluepy: Define custom PYPA_WHEEL Date: Mon, 28 Feb 2022 14:21:53 -0800 Message-Id: <20220228222154.210195-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220228222154.210195-1-raj.khem@gmail.com> References: <20220228222154.210195-1-raj.khem@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 ; Mon, 28 Feb 2022 22:22:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95599 Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/bluepy/bluepy_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb index a3b734c2ec..9bf2eed78b 100644 --- a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb +++ b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -15,6 +15,8 @@ S = "${WORKDIR}/git" inherit setuptools3 pkgconfig +PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl" + RDEPENDS:${PN} = "bluez5" TARGET_CC_ARCH += "${LDFLAGS}" From patchwork Mon Feb 28 22:21:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 4470 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 5D5F3C433EF for ; Mon, 28 Feb 2022 22:22:00 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web12.1402.1646086918940276574 for ; Mon, 28 Feb 2022 14:21:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IUdMkBJs; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id k1so1834187pfu.2 for ; Mon, 28 Feb 2022 14:21:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KlpFhkMtFWffGHWepb+INS8xE9T7YtZqkhFhPtR6JoE=; b=IUdMkBJshpJ3CQxDtu/t8BT2JJeM5H0rtITaBKFfgV4XNIXK15Ek8SjScSQuqeweum DRwPwrqT8uAdznqygzRUtZanDPk0AgPOk9OUuEDuK7pB8SRgxbUefLmk9kuvUAUYTTT7 tcDAIi6gSgk1x0OAK6f0wF6MKoQS2Fx99BB/kSGQNMK9zBEQum/izq77IHh6ju9aAGoa 4RSjs4u6wi/KIC593aQjHIFly2dIw4xZpUUV/HQ1MOpwmiZGYQQd6BpLZ7a3mpM9vtF+ 3H04Znq8MHD14SzRThbX3Ae4M+w9V/0GzKzk5wkrpqyukG8qNQsaXJPNhzVAJv9QI4nk WMCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KlpFhkMtFWffGHWepb+INS8xE9T7YtZqkhFhPtR6JoE=; b=bkQvVXZNkBaMFkbOTonHD9tUeqb1ao9P8j5zoCaNGCjZQNd7/uHnnH+PoMe9ENJMSX X2MLbZ6AqZQikDO78kfH4FR/pT/7cHYTzvAFq9euWU+sMMz7V+8yWnHLkqT/EO8Nk1QW WSZjx46bFf8NTmN4/WUBsxRUjWWJb9sm25t4VPyRERekPqFi0cHW3hKu4YRdyonYTTFi 7ozymJG6VRkYcJQijgBX5+o77cBO7PTjK6416RtRRojZ/IUqjcMiBCc/BKMWscb2+wl9 gaSK0aWeZ7Sjr4frp67AeIEW6p9qXAQhqv58stEOOW0/sUdarWB1X8dT+N7NfjVq2jse tI3g== X-Gm-Message-State: AOAM533w9jASzXCrtjoJvBt/ALnZMBCPi94D4IUZZqjuAr0GivATuS2+ eY1IMwI/6JjLWyEhaGhv5Nt2ghHadwMK7Q== X-Google-Smtp-Source: ABdhPJwnXCN7uwWIwgUqm2k0cuarwv+rzvQ64cq+aZVeT+liC0QPyYwfrC3cM/t3CthEHfHaV2GB8g== X-Received: by 2002:a62:ddcc:0:b0:4e1:c248:d4a7 with SMTP id w195-20020a62ddcc000000b004e1c248d4a7mr23842219pff.63.1646086918111; Mon, 28 Feb 2022 14:21:58 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1a20]) by smtp.gmail.com with ESMTPSA id o17-20020a056a0015d100b004e1c11d833fsm15430992pfu.90.2022.02.28.14.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 14:21:57 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 3/3] ufw: Upgrade to 0.36.1 bugfix release Date: Mon, 28 Feb 2022 14:21:54 -0800 Message-Id: <20220228222154.210195-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220228222154.210195-1-raj.khem@gmail.com> References: <20220228222154.210195-1-raj.khem@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 ; Mon, 28 Feb 2022 22:22:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95600 Forward port 0002-add-an-option-to-specify-iptables-location.patch Use distutils3, since it still needs it [1] [1] https://git.launchpad.net/ufw/tree/setup.py#n28 Signed-off-by: Khem Raj --- ...-option-to-specify-iptables-location.patch | 30 +++++++++++-------- .../ufw/{ufw_0.36.bb => ufw_0.36.1.bb} | 8 ++--- 2 files changed, 20 insertions(+), 18 deletions(-) rename meta-networking/recipes-connectivity/ufw/{ufw_0.36.bb => ufw_0.36.1.bb} (88%) diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 884fa1647e..ee935eb615 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -23,11 +23,9 @@ Signed-off-by: Silcet setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -diff --git a/setup.py b/setup.py -index 09204d3..2343bc9 100644 --- a/setup.py +++ b/setup.py -@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging') +@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -36,7 +34,11 @@ index 09204d3..2343bc9 100644 iptables_dir = '' -for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ +- # Historically iptables was in /sbin, then later also symlinked from +- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables +- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate +- # buildds that may still have the old iptables, search /usr/sbin first +- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): @@ -49,6 +51,14 @@ index 09204d3..2343bc9 100644 - if iptables_exe != "": - break - +- +-if iptables_exe == '': +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) +- +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +if "--iptables-dir" in sys.argv: + iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1] + iptables_exe = os.path.join(iptables_dir, "iptables") @@ -59,7 +69,7 @@ index 09204d3..2343bc9 100644 + +if not iptables_set: + for e in ['iptables']: -+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ ++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ + '/usr/local/bin']: + if e == "iptables": + if os.path.exists(os.path.join(dir, e)): @@ -68,16 +78,10 @@ index 09204d3..2343bc9 100644 + print("Found '%s'" % iptables_exe) + else: + continue - --if iptables_exe == '': -- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) -- sys.exit(1) ++ + if iptables_exe != "": + break - --for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: -- if not os.path.exists(os.path.join(iptables_dir, e)): -- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) ++ + if iptables_exe == '': + print("ERROR: could not find required binary 'iptables'", file=sys.stderr) sys.exit(1) diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb similarity index 88% rename from meta-networking/recipes-connectivity/ufw/ufw_0.36.bb rename to meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb index 40188cea21..c6beedf02c 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -8,18 +8,16 @@ SECTION = "net" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" -SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \ +SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \ file://0001-optimize-boot.patch \ file://0002-add-an-option-to-specify-iptables-location.patch \ file://0003-only-make-one-reference-to-env.patch \ " +SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c" UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" -SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781" -SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc" - -inherit setuptools3 features_check systemd update-rc.d +inherit distutils3 features_check systemd update-rc.d RDEPENDS:${PN} = " \ iptables \