git: 437546a614b9 - main - security/binwalk: update 2.1.1 -> 2.3.3, chase GH_ACCOUNT

The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=437546a614b9d179cacfdc141bec0f918a82d5af

commit 437546a614b9d179cacfdc141bec0f918a82d5af
Author:     Kurt Jaeger <pi@FreeBSD.org>
AuthorDate: 2023-01-26 19:24:04 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
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 <bsd.port.mk>
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