From patchwork Tue Oct 12 17:48:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1539984 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=CkPQ1vHk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTNSd289Zz9sS8 for ; Wed, 13 Oct 2021 04:48:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 92CCB60BE4; Tue, 12 Oct 2021 17:48:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JN4o9T6j9pFb; Tue, 12 Oct 2021 17:48:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id EFC0160BD5; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EFBF81BF5AA for ; Tue, 12 Oct 2021 17:48:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DF96081BC6 for ; Tue, 12 Oct 2021 17:48:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDK2VTbdb5Te for ; Tue, 12 Oct 2021 17:48:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0DBDB81BC5 for ; Tue, 12 Oct 2021 17:48:41 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id f21so73396plb.3 for ; Tue, 12 Oct 2021 10:48:41 -0700 (PDT) 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=d8P2/1jMqutAdT+St0TTAMHJCJxGHM5ZMeMxy/uj9Ak=; b=CkPQ1vHkiZqCGNDpduA6e7H/gRma6MX4lGavAowX5ZbMXeZkolOJOaYmg+wb27KRz9 wD2fCoZAGtv4B2ZY+N5Y+tzqYBPCHwMhJUlg2e2zlZLOBEw4CSI+EAFtiOK0+AJl5T51 0Up4g0jG42hMQ70azf1jHhEGEscHqTXOvq8sDeGcShAzN64WkTK2UtmD30uN4OqQBN1U 8A+naH0EpJQk96MGsrNrHMAa5hGrcKt1LuO51aCl5yUoKCiQKJ3Ca3QLALWkrrfyno4h DGUHLWxhnDTfNg4ahH4I3a989ZdXeFW9GU0AofySqcrNgKgyEFBg7ujCh946qcg7VI6f Y1TQ== 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=d8P2/1jMqutAdT+St0TTAMHJCJxGHM5ZMeMxy/uj9Ak=; b=hggT88RzI2rFX4vtJN33Ej+jYaGa+Q/Kt9GfPoPW4OHW+sUIVqvNXxgMrNbtWt87Ur iKeHcvtLq46066yf1xY+b1ivMifb8fO93TnY9JcZ8nR0ZMdpVxIG44h8/ylSvQlKytir Vc+7J5umwHQLzx06B3Jqs7F5PsIl2vI8ffesa2OWuRcH+0KBC4zEw5uNXfi9CMqKOMIX MixJKZ2r9Vj/4arRHkWAtV5KJGhrqj3kPA/JOgP9d9rusVQgQe+Qyik80pL+8I2VBK1O K6R7AQk3swg7WSHfDCedxP9tk8WA4Az56tgsB5OPKsmfz4cH3CZTqaEj3OAGX7XEZXHJ IpBA== X-Gm-Message-State: AOAM532hdeW7ssGkBYwSevBWUucULO0thIIwuIMS/riW3nDd8JNGYbnl Oa/gpj77ASCzFsO6JeFILVAErK/CwD0= X-Google-Smtp-Source: ABdhPJwajdMTc7lfMBn1RJXX2+TYJ9tBoacY+XbOVCWMASOBi6kKgvKVKgoEZEAUNsT5vt/Xr6VTGA== X-Received: by 2002:a17:90a:7892:: with SMTP id x18mr7694191pjk.33.1634060921118; Tue, 12 Oct 2021 10:48:41 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id i125sm11679295pfc.36.2021.10.12.10.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 10:48:40 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 12 Oct 2021 10:48:35 -0700 Message-Id: <20211012174838.1222576-1-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/4] package/nmap: bump to version 7.92 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" In addition: - Remove upstream patch - Update license hash to reflect license version bump from 0.92 to 0.93 Signed-off-by: Adam Duskett --- package/nmap/0002-ncat-unix-socket.patch | 30 ------------------------ package/nmap/nmap.hash | 6 ++--- package/nmap/nmap.mk | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/nmap/0002-ncat-unix-socket.patch diff --git a/package/nmap/0002-ncat-unix-socket.patch b/package/nmap/0002-ncat-unix-socket.patch deleted file mode 100644 index b6484ebeea..0000000000 --- a/package/nmap/0002-ncat-unix-socket.patch +++ /dev/null @@ -1,30 +0,0 @@ -ChangeLog: - -o [Ncat][GH#2154] Ncat no longer crashes when used with Unix domain sockets. - -Backported from: r38121 - -Signed-off-by: Alexey Neyman - -Index: ncat/ncat_main.c -=================================================================== ---- a/ncat/ncat_main.c (revision 38120) -+++ b/ncat/ncat_main.c (revision 38121) -@@ -846,7 +846,7 @@ - targetaddrs->addr.un.sun_family = AF_UNIX; - strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path)); - targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } else - #endif -@@ -865,7 +865,7 @@ - targetaddrs->addr.vm.svm_cid = long_cid; - - targetaddrs->addrlen = sizeof(targetaddrs->addr.vm); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } - } else diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 8f69bbf613..dc379f30d4 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,5 +1,5 @@ -# From https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.digest.txt (lowercase) -sha256 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 nmap-7.91.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.digest.txt (lowercase) +sha256 a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 nmap-7.92.tar.bz2 # Locally calculated -sha256 8254a9bc733f3312c6dcfe0d5a129c29e96ecb8b33408c652a8c7beb2e25b471 LICENSE +sha256 133794301a764dfe8a60e38601e56657b7113e0337b452189725bbbed58baea0 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 34cf61ff0b..f3994e9b38 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.91 +NMAP_VERSION = 7.92 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap From patchwork Tue Oct 12 17:48:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1539985 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=m2AZ2t6H; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTNSr2Zblz9sS8 for ; Wed, 13 Oct 2021 04:49:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 049CB81BE3; Tue, 12 Oct 2021 17:48:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EIcxQthaZys0; Tue, 12 Oct 2021 17:48:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 505EF81BC6; Tue, 12 Oct 2021 17:48:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 60F531BF5AA for ; Tue, 12 Oct 2021 17:48:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5D54260BD5 for ; Tue, 12 Oct 2021 17:48:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21PTeSK_LBAl for ; Tue, 12 Oct 2021 17:48:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by smtp3.osuosl.org (Postfix) with ESMTPS id 96C8B60B86 for ; Tue, 12 Oct 2021 17:48:42 +0000 (UTC) Received: by mail-pg1-x536.google.com with SMTP id s75so14557079pgs.5 for ; Tue, 12 Oct 2021 10:48:42 -0700 (PDT) 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=dlx+rx86XjRehlnDXDF/dlK05qQsWwfkBlk3VeNrFiI=; b=m2AZ2t6HUblc5SN7fmLIny0JZ7khF4yUemuIv3vz/V67MRp8B1ka/gCVuv9LjbvAN8 X+5uJGDHUxd1N/JtPAumcJx06x+rv7aTP6aR/OuRxDsj5/F4Oqj6UZP8KP2Ay/2Ltwuy 6Eq8IKczY/LrUjO/q3j3V1TuBhfSVizshczLE4X26ScWFOlshkpaHZ4qwvpN+m3W9KHr NdzfKxrodC3goPmL9Rd2quliBpbB5+4oZGcwOCUTYxnEKht7nDTyqeFr9OVD8DDVmEEp nbK0Jb7NU3RAHkcbxVZ04b9edt6BWcKoTe25GE0jXu+EPOIIzKA1MC8kHdeQNowx+bbO CAPQ== 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=dlx+rx86XjRehlnDXDF/dlK05qQsWwfkBlk3VeNrFiI=; b=dzqn7ZlAp0NpO7ir6EYcxVZudVWd3CvEpOhBT6RyvA5DA+wdaQTilJo+TQCTW4aKqX u7aejD+8u2/2HV53KmxShUvoqBdeD2ufC8ae2DuQoNcJfLmkodjCvsYLSJ+NvNqjYjs0 la2niko6lT0nLewJalJOuvmaWq6Yj0fFSwk5glswJF4movLvpSfovIh+KaWeqgd7e8QL b2ljEWm+vsF44gmpjtsJqns6aFXCd8a4cJJWG3QwZtyf6r+NZi8qNXiQ8SYfPtzhmhro i4RqQVb0ZSbaZj2ZeLAdlYvN2QDIhVo5L77c6UZnJlLW/xWNcinh/uaxxpMm3neovWRF Kvtg== X-Gm-Message-State: AOAM531T+ih19uTkwb6n+9cKda0vOIQjx68fRVKmOZJWTThqK3NFUi2H lLg/1dSHtlUEgi2BXdN+t1xxfi66x6E= X-Google-Smtp-Source: ABdhPJwdbKbpUUJBMKf1XBqeOiyw38dpPzIC1ZZHV76egeH2JZ/E+1y1sgTovtkk7VuBQwujCYyNfw== X-Received: by 2002:a63:1656:: with SMTP id 22mr23982996pgw.20.1634060921954; Tue, 12 Oct 2021 10:48:41 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id i125sm11679295pfc.36.2021.10.12.10.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 10:48:41 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 12 Oct 2021 10:48:36 -0700 Message-Id: <20211012174838.1222576-2-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012174838.1222576-1-aduskett@gmail.com> References: <20211012174838.1222576-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] package/python-xmljson: new package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This package is a dependency for pyndiff Signed-off-by: Adam Duskett --- package/Config.in | 1 + package/python-xmljson/Config.in | 6 ++++++ package/python-xmljson/python-xmljson.hash | 5 +++++ package/python-xmljson/python-xmljson.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-xmljson/Config.in create mode 100644 package/python-xmljson/python-xmljson.hash create mode 100644 package/python-xmljson/python-xmljson.mk diff --git a/package/Config.in b/package/Config.in index ba1ee4005c..09e9665f48 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1276,6 +1276,7 @@ menu "External python modules" source "package/python-xlsxwriter/Config.in" source "package/python-xlutils/Config.in" source "package/python-xlwt/Config.in" + source "package/python-xmljson/Config.in" source "package/python-xmltodict/Config.in" source "package/python-xmodem/Config.in" source "package/python-yarl/Config.in" diff --git a/package/python-xmljson/Config.in b/package/python-xmljson/Config.in new file mode 100644 index 0000000000..486f344361 --- /dev/null +++ b/package/python-xmljson/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_XMLJSON + bool "python-xmljson" + help + Converts XML into JSON/Python dicts/arrays and vice-versa. + + https://github.com/sanand0/xmljson diff --git a/package/python-xmljson/python-xmljson.hash b/package/python-xmljson/python-xmljson.hash new file mode 100644 index 0000000000..245a74a33e --- /dev/null +++ b/package/python-xmljson/python-xmljson.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/xmljson/json +md5 fc4df2390ad209928ee4311a3540cb17 xmljson-0.2.1.tar.gz +sha256 b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8 xmljson-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 5ce42ba7d76e81428bdacef83658eb6213dbd1ad4a3b6d380bb6e0e8c73f0fb7 LICENSE diff --git a/package/python-xmljson/python-xmljson.mk b/package/python-xmljson/python-xmljson.mk new file mode 100644 index 0000000000..913dce2670 --- /dev/null +++ b/package/python-xmljson/python-xmljson.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-xmljson +# +################################################################################ + +PYTHON_XMLJSON_VERSION = 0.2.1 +PYTHON_XMLJSON_SOURCE = xmljson-$(PYTHON_XMLJSON_VERSION).tar.gz +PYTHON_XMLJSON_SITE = https://files.pythonhosted.org/packages/e8/6f/d9f109ba19be510fd3098bcb72143c67ca6743cedb48ac75aef05ddfe960 +PYTHON_XMLJSON_SETUP_TYPE = setuptools +PYTHON_XMLJSON_LICENSE = MIT +PYTHON_XMLJSON_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From patchwork Tue Oct 12 17:48:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1539987 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IRn+WmBr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTNTH3WXRz9sS8 for ; Wed, 13 Oct 2021 04:49:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A49246064B; Tue, 12 Oct 2021 17:49:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d7Smu36Du2JG; Tue, 12 Oct 2021 17:49:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id DFFBE60678; Tue, 12 Oct 2021 17:49:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EC9611BF9BD for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DB382403FB for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y0rJ0X1DBS2F for ; Tue, 12 Oct 2021 17:48:43 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8C87F40196 for ; Tue, 12 Oct 2021 17:48:43 +0000 (UTC) Received: by mail-pg1-x535.google.com with SMTP id r2so14538405pgl.10 for ; Tue, 12 Oct 2021 10:48:43 -0700 (PDT) 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=uo4x7NNAvOOuLSB/6zBVfJScI/I7DLLaC6FR9g8Ue8Y=; b=IRn+WmBreHeF6Jjrpnpq0cbK928121Og5z/b+a+A6dj535SW5JoWd1aAB2+jtiMM5k z1k7oRdXNwNRXVgs4xcILspS7NpWddWnbz3KPzN6oEMSim6LKfuQ80vaX7cY1LwqaFQe oIWl+sRyMxQxqgQbu8lhdy3xfPkHVwx6XSRSAGI/ik7b50YDZe660i4+Xbc9e45cmdJe 2fLfMd0SqaOR7Ga6tBs3gYj395U6ejW1wPylmVbSthp6kfDwOHO2XZ8brV8YhzVtd1Gl 3g+Nj3rdwI+BqnNYCbGeaLESL/+gBgcX9dgub4hgom4FFHQTe+LNEJH/lMcEqh//Umf/ zTJg== 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=uo4x7NNAvOOuLSB/6zBVfJScI/I7DLLaC6FR9g8Ue8Y=; b=y4xRyfyRT2x5R6zyQlx9+9iqH7cYd9YLlRjZfhDP/+WTGmxr7VPAftf01onns5hduC EfzCaAzH6ebQg0Ho2IiJJKzpLFNFXWcAbw9zl3rQUsZB9qBauKYCJp/ovX+6+rc1zzrz CU9p5k0OHjierTftTCQX4j7wWDhjszdUKS6oRumbJ1pvXenbUC+NFbEcr7ccQE5cDs0r rHVbQefCT9vqHGxUWXzwBQ1C2MqDt5Bd3nqv4/KIBWLlYdY3B+YGAXT5X9WAmEGwHwrP tzUwttkxSjsZLVa6t0ohcYmqdGucmtYugjSJr0nCxwq+1+XbygeGsQhyzAsx1A0b49ET 4HDQ== X-Gm-Message-State: AOAM532BLgQS9LH8fpo6NyQAOK2jzPpcsztGSEXEgdzgOEmZJ9AhkXRM ag3PI8LCTmbM1sT2aznUsTeckDAlSLI= X-Google-Smtp-Source: ABdhPJwkMWWF2Ovv7GlW78/Abg4Avt8VpBv99msiPQxBTy3ooN6GnOLHDhEoH+tIlmx2p/6CxvEt1A== X-Received: by 2002:a65:6a15:: with SMTP id m21mr23731512pgu.415.1634060922759; Tue, 12 Oct 2021 10:48:42 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id i125sm11679295pfc.36.2021.10.12.10.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 10:48:42 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 12 Oct 2021 10:48:37 -0700 Message-Id: <20211012174838.1222576-3-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012174838.1222576-1-aduskett@gmail.com> References: <20211012174838.1222576-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/4] package/python-pyndiff: new package, drop nmap ndiff option X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The ndiff package provided by Nmap relies on python2; moreover, there have been pending pull requests to move ndiff to python3 for over two years with very little engagement by the maintainers (https://github.com/nmap/nmap/pull/1807). Remove the option to select ndiff altogether, and introduce a new package: python-pyndiff, which provides the same functionality (and more) as the ndiff provided by nmap, and is compatible with python3. Signed-off-by: Adam Duskett --- Config.in.legacy | 8 ++++++++ package/Config.in | 1 + package/nmap/Config.in | 12 +----------- package/nmap/nmap.mk | 9 --------- package/python-pyndiff/Config.in | 9 +++++++++ package/python-pyndiff/python-pyndiff.hash | 5 +++++ package/python-pyndiff/python-pyndiff.mk | 14 ++++++++++++++ 7 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 package/python-pyndiff/Config.in create mode 100644 package/python-pyndiff/python-pyndiff.hash create mode 100644 package/python-pyndiff/python-pyndiff.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3ec48edb87..a4b5c88dea 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2021.11" +config BR2_PACKAGE_NMAP_NDIFF + bool "The ndiff utility has been removed." + select BR2_LEGACY + help + The ndiff utility provided by nmap requires python2 which is + deprecated. The same functionality is provided by the python + package pyndiff. + config BR2_GDB_VERSION_8_3 bool "gdb version 8.3.x removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 09e9665f48..fe5c8d43b5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1150,6 +1150,7 @@ menu "External python modules" source "package/python-pymupdf/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" + source "package/python-pyndiff/Config.in" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" diff --git a/package/nmap/Config.in b/package/nmap/Config.in index 51dd3423ea..fc6312d0fc 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_NMAP select BR2_PACKAGE_LIBLINEAR select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_NMAP_NMAP \ - if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF + if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING help Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing. @@ -32,16 +32,6 @@ comment "a symlink from ncat to 'nc' will be installed" depends on !BR2_PACKAGE_NETCAT depends on !BR2_PACKAGE_NETCAT_OPENBSD -config BR2_PACKAGE_NMAP_NDIFF - bool "install ndiff" - # ndiff only works with python2.x - depends on BR2_PACKAGE_PYTHON - help - This option installs the 'ndiff' tool. - -comment "ndiff needs Python 2.x" - depends on !BR2_PACKAGE_PYTHON - config BR2_PACKAGE_NMAP_NMAP bool "install nmap" select BR2_PACKAGE_PCRE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index f3994e9b38..f22a2295b1 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -61,15 +61,6 @@ else NMAP_CONF_OPTS += --without-ncat endif -ifeq ($(BR2_PACKAGE_NMAP_NDIFF),y) -NMAP_DEPENDENCIES += python -NMAP_CONF_OPTS += --with-ndiff -NMAP_MAKE_OPTS += build-ndiff -NMAP_INSTALL_TARGET_OPTS += install-ndiff -else -NMAP_CONF_OPTS += --without-ndiff -endif - ifeq ($(BR2_PACKAGE_NMAP_NMAP),y) NMAP_DEPENDENCIES += pcre NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr" diff --git a/package/python-pyndiff/Config.in b/package/python-pyndiff/Config.in new file mode 100644 index 0000000000..58ca35ba97 --- /dev/null +++ b/package/python-pyndiff/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_PYNDIFF + bool "python-pyndiff" + select BR2_PACKAGE_PYTHON_XMLJSON # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + help + Generate human-readable ndiff output when comparing 2 Nmap + XML scan files. + + https://github.com/rackerlabs/pyndiff diff --git a/package/python-pyndiff/python-pyndiff.hash b/package/python-pyndiff/python-pyndiff.hash new file mode 100644 index 0000000000..0afecfb6e2 --- /dev/null +++ b/package/python-pyndiff/python-pyndiff.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyndiff/json +md5 32a9f994509cb883bbfeb563171f2668 pyndiff-1.0.2.tar.gz +sha256 8a519b18a7bbb315c043d4543719ce9fb6db8098bfcdd04cb8054b276cc91368 pyndiff-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyndiff/python-pyndiff.mk b/package/python-pyndiff/python-pyndiff.mk new file mode 100644 index 0000000000..e25374956c --- /dev/null +++ b/package/python-pyndiff/python-pyndiff.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyndiff +# +################################################################################ + +PYTHON_PYNDIFF_VERSION = 1.0.2 +PYTHON_PYNDIFF_SOURCE = pyndiff-$(PYTHON_PYNDIFF_VERSION).tar.gz +PYTHON_PYNDIFF_SITE = https://files.pythonhosted.org/packages/83/3b/fb13918710c4fba40367140f22e3449998f4f66869a7564d0e547ad99ef8 +PYTHON_PYNDIFF_SETUP_TYPE = setuptools +PYTHON_PYNDIFF_LICENSE = Apache-2.0 +PYTHON_PYNDIFF_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From patchwork Tue Oct 12 17:48:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1539986 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=kzL3RUuO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTNT43MxTz9sS8 for ; Wed, 13 Oct 2021 04:49:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A387340427; Tue, 12 Oct 2021 17:49:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X3JS9kG7KUAV; Tue, 12 Oct 2021 17:49:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id DA0E0403FB; Tue, 12 Oct 2021 17:49:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D240B1BF5AA for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C27A981BC6 for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aFikJgBssJ7f for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4F76281BC5 for ; Tue, 12 Oct 2021 17:48:44 +0000 (UTC) Received: by mail-pf1-x435.google.com with SMTP id m14so188684pfc.9 for ; Tue, 12 Oct 2021 10:48:44 -0700 (PDT) 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=FtfUJAwk9LavrwRqHj5N5SJNixORuQnqFCCEb8OtkK4=; b=kzL3RUuOJJeLnUkbBY1qvynzSq8Q3NizzNjZ3SOmgiQEWl7E0d9z+pHq7ppwtDkn2B YHL0ubHmyNcKnBrJ/4VpxOtrHG5vOd0qAQyMl13vdzY3HIbFD12Xhr6uII4pg4xCA7IJ u9GOZJCWrDEEdKBPmv9G0JMPxX2f3cNpcv2TUfyBDo7m+S4MFioeF/Pyyb5Nz8bxlVFO oywF+2QCMI3taznulJgHGEzmzu5B+Etjq2XFET0NmL5/wfYvmuviOB130PJw0KZt5WlR pSZSndWL/sjOxekx2ThS4utMekuhJQt9netUbSqWM+PMiUz6x5iaQgaoLphi3ugKYFxT GR0A== 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=FtfUJAwk9LavrwRqHj5N5SJNixORuQnqFCCEb8OtkK4=; b=FSMepMePBJgasaEFk2a2YdoGDyBhvIPE/YAQhBOZAeQ/J/39ZN/od6WuRawuXyoq7h dyhAwoWS/D2NOIcpk2m8o0fuF+g5eZYEqx+xUfn6Vwvd5znIg2r9KY43yaJFjMa337Qa TZ7A54yFcWcvm9XSIRSSRlCUedE8VzrdFcfFfBr6SMlIWqggbYuLU+NknbwwGS3oRznq Mq1CkXI2wKkweGnZUbDnA8ZsAFNY6q51BdEZwJr6gpSv6NjnIXr3yg1L6Jecgy8cONRO svrRaIkGPXp0OZxYbd4FVyziZziX4GuTGE1/9DoLbNgO8J1vvblHlAE+Z+qz73HXAnpY 9fUQ== X-Gm-Message-State: AOAM530znzuq4RG5kaM/MFQPLYeiUfCFDb6qLvO6U9XcNBH456ufJGXj GYenpwTlXYk065NUJNYol6hJ/cf+hHM= X-Google-Smtp-Source: ABdhPJxegSLTA9SVQ4GDKMsvTMSf7IzHCiAPjbhRoGshnEby7UttV3mUaO1QTaa5+4H5gppu39ibPA== X-Received: by 2002:a63:9d0d:: with SMTP id i13mr23606610pgd.117.1634060923530; Tue, 12 Oct 2021 10:48:43 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id i125sm11679295pfc.36.2021.10.12.10.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 10:48:43 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 12 Oct 2021 10:48:38 -0700 Message-Id: <20211012174838.1222576-4-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012174838.1222576-1-aduskett@gmail.com> References: <20211012174838.1222576-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/4] support/testing/tests/package/test_python_pyndiff: new test X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" A simple test that runs nmap twice to create the files scanme-1.xml and scanme2.xml, then runs pyndiff on both files. Signed-off-by: Adam Duskett --- .../tests/package/test_python_pyndiff.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 support/testing/tests/package/test_python_pyndiff.py diff --git a/support/testing/tests/package/test_python_pyndiff.py b/support/testing/tests/package/test_python_pyndiff.py new file mode 100644 index 0000000000..86d6c38f8f --- /dev/null +++ b/support/testing/tests/package/test_python_pyndiff.py @@ -0,0 +1,29 @@ +import os +import infra.basetest + + +class TestPyNdiff(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NMAP=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYNDIFF=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + cmd = "nmap -F 127.0.0.1 -oX scanme-1.xml" + self.assertRunOk(cmd) + + cmd = "nmap -F 127.0.0.1 -oX scanme-2.xml" + self.assertRunOk(cmd) + + cmd = "pyndiff -f1 scanme-1.xml -f2 scanme-2.xml -t txt" + self.assertRunOk(cmd)