From nobody Thu Jan 26 19:28:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2rNH6kTDz3bTqk; Thu, 26 Jan 2023 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2rNH6DJdz4KyK; Thu, 26 Jan 2023 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMcGAmCxn+GtjjFXoinLryI5usmUVbeuYUhKVMeUj0o=; b=dHiMfoADp+niEORdCjG9x9U3RzASuOvggwjJZ1o53sBKQ4RskPVuUmEoa5ByUnV/IDMnei 9Eh7qvLxwfcsmvHQ07KQcgPLbPSQOFld6CqF0M9zQBYB9HFUvNLEGAzJKznDqReewFgBQ9 KzLq1ZsWuTyyO+/aGi+pJITS59gTdsXIF1QdGEjPnp54a5l1NW+oOGKp3j6a2IZ4W/2yJP 0rqQp/ZDhGMvH3NyQ9g8nciRHMEPpzr5PhNMeIkuuxIKs6XzAqfFA9jVNDVcV49af0EtaD cTkDr1K3KI5qpFKJkHE2NbeZz4fF71v3VelOM4nHjPpdhv25v+PZBJZz7xxlQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMcGAmCxn+GtjjFXoinLryI5usmUVbeuYUhKVMeUj0o=; b=U2Wi8qPXKyglUmNUrupczWAeRso2hmuKVkbp0zUCbzrlm5CZJmsi0gQcfFDOBgaKS2oKr5 rwPlnK5Bh5LL4LxE/ei2VtzknqozApwHyMUo2ZRPcfPwgDqL2WWr7L5JLrQFvFikj+f0Ib zi0K2uge5kVEE7OeLwzp1yHYqlawEkns8RB3xorrnZ+40uG2XuP4GGy46yY8UBxHZBUu8n 3cvOIVm4y/DyCHbxOTWifHV/hTf7IKHHsjko+gTbZi4o8E5TQDU0p1AIPbUBHXzQBLiTWq 8uNZuWOqaTsBt/CbHRIDRjJ+3kIj8vcMIjoYk1MM/1ItdtqzzeoOseD2DPYhOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761311; a=rsa-sha256; cv=none; b=R1EKHibWepPiyvblTXw+9ayAkr+AXawe0gqVYhwb0F3RXmghGn3J2e4lmCjD/32jyoDKXK YUx8yGhkUbirr3l2qZ6JBAwDkSDH5MVThqaC0QF5Df2exBAsIXewGwD6pP7kEUmjlSR9/f 35LTbFyXP1ailLOPuV0JUSLgUtRe/8dgDgpZFPbwit8MEshIJAiXgHLF67KctHgseelYFH FRd9rlyXE+4DuKAAgg+3s9ZjSwQUxi5q1Dq9XAzqhpHtMn4iYNJPz82nh69sppr+/Rn6/C Joor0HOSf0pM/XxSZ1znWX1PvhjtjvGnc9lWtukOS3ANqcseliiiP2mmgeHGeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2rNH5GlZzgwD; Thu, 26 Jan 2023 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30QJSV8p078491; Thu, 26 Jan 2023 19:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJSVZx078490; Thu, 26 Jan 2023 19:28:31 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:28:31 GMT Message-Id: <202301261928.30QJSVZx078490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 437546a614b9 - main - security/binwalk: update 2.1.1 -> 2.3.3, chase GH_ACCOUNT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 437546a614b9d179cacfdc141bec0f918a82d5af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=437546a614b9d179cacfdc141bec0f918a82d5af commit 437546a614b9d179cacfdc141bec0f918a82d5af Author: Kurt Jaeger AuthorDate: 2023-01-26 19:24:04 +0000 Commit: Kurt Jaeger CommitDate: 2023-01-26 19:24:04 +0000 security/binwalk: update 2.1.1 -> 2.3.3, chase GH_ACCOUNT - no longer supports py2.7 Reported by: salvadore --- security/binwalk/Makefile | 11 +++++------ security/binwalk/distinfo | 5 +++-- .../files/patch-src_binwalk_config_extract.conf | 19 +++++++++++++------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile index 1ded4cf95d98..d42511b007dc 100644 --- a/security/binwalk/Makefile +++ b/security/binwalk/Makefile @@ -1,6 +1,5 @@ PORTNAME= binwalk -PORTVERSION= 2.1.1 -PORTREVISION= 2 +PORTVERSION= 2.3.3 DISTVERSIONPREFIX= v CATEGORIES= security python @@ -10,12 +9,12 @@ WWW= http://www.binwalk.org LICENSE= MIT +RUN_DEPENDS= 7zz:archivers/7-zip \ + cabextract:archivers/cabextract + USES= python:3.6+ USE_GITHUB= yes -GH_ACCOUNT= devttys0 +GH_ACCOUNT= ReFirmLabs USE_PYTHON= autoplist distutils optsuffix concurrent -RUN_DEPENDS= 7zz:archivers/7-zip \ - cabextract:archivers/cabextract - .include diff --git a/security/binwalk/distinfo b/security/binwalk/distinfo index c79911ac93a6..2bf7d40abd76 100644 --- a/security/binwalk/distinfo +++ b/security/binwalk/distinfo @@ -1,2 +1,3 @@ -SHA256 (devttys0-binwalk-v2.1.1_GH0.tar.gz) = 1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a -SIZE (devttys0-binwalk-v2.1.1_GH0.tar.gz) = 263977 +TIMESTAMP = 1674760538 +SHA256 (ReFirmLabs-binwalk-v2.3.3_GH0.tar.gz) = 7e32b94dc77632b51d18732b5456e2a3ef85e4521d7d4a54410e36f93859501f +SIZE (ReFirmLabs-binwalk-v2.3.3_GH0.tar.gz) = 39723775 diff --git a/security/binwalk/files/patch-src_binwalk_config_extract.conf b/security/binwalk/files/patch-src_binwalk_config_extract.conf index a9ead15015fb..8b76eb8c80d4 100644 --- a/security/binwalk/files/patch-src_binwalk_config_extract.conf +++ b/security/binwalk/files/patch-src_binwalk_config_extract.conf @@ -1,6 +1,6 @@ ---- src/binwalk/config/extract.conf.orig 2015-12-23 16:51:01 UTC +--- src/binwalk/config/extract.conf.orig 2021-09-10 17:46:40 UTC +++ src/binwalk/config/extract.conf -@@ -25,17 +25,17 @@ +@@ -26,8 +26,8 @@ # Assumes these utilities are installed in $PATH. ^gzip compressed data:gz:gzip -d -f '%e':0,2 @@ -10,15 +10,22 @@ +^xz compressed data:xz:7zz e -y '%e':0,1 ^bzip2 compressed data:bz2:bzip2 -d '%e' ^compress'd data:Z:gzip -d '%e' --^zip archive data:zip:7z x -y '%e' -p '':0,1 -+^zip archive data:zip:7zz x -y '%e' -p '':0,1 ^posix tar archive:tar:tar xvf '%e' - ^rar archive data:rar:unrar e '%e' +@@ -35,7 +35,7 @@ ^rar archive data:rar:unrar -x '%e' # This is for the 'free' version ^arj archive data.*comment header:arj:arj -y e '%e' - ^lha:lha:lha ei '%e' + ^lha:lha:lha efi '%e' -^iso 9660:iso:7z x '%e' -oiso-root +^iso 9660:iso:7zz x '%e' -oiso-root ^microsoft cabinet archive:cab:cabextract '%e' ^stuffit:sit:unstuff '%e' + ^osx dmg:dmg:7z x '%e' +@@ -53,7 +53,7 @@ + # StarCam firmware CH-sys-48.53.64.67.zip. + ^zip archive data:zip:unzip -P '' -o '%e':0 + ^zip archive data:zip:jar xvf '%e':0 +-^zip archive data:zip:7z x -y '%e' -p '':0,1 ++^zip archive data:zip:7zz x -y '%e' -p '':0,1 + # Try unsquashfs first, or if not installed, sasquatch + ^squashfs filesystem:squashfs:unsquashfs -d '%%squashfs-root%%' '%e':0:False