git: bbc6dc87aab1 - main - security/binwalk: using 7-zip instead of p7zip

The branch main has been updated by pi:

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

commit bbc6dc87aab11c9bb8aae8cde453653e457a1cd3
Author:     Kurt Jaeger <pi@FreeBSD.org>
AuthorDate: 2022-01-08 20:01:34 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2022-01-08 20:01:34 +0000

    security/binwalk: using 7-zip instead of p7zip
    
    PR:     260866
---
 security/binwalk/Makefile                          |  4 ++--
 .../files/patch-src_binwalk_config_extract.conf    | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile
index 8623942bbcc0..30e67e04da81 100644
--- a/security/binwalk/Makefile
+++ b/security/binwalk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	binwalk
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 
@@ -14,7 +14,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	devttys0
 USE_PYTHON=	autoplist distutils optsuffix concurrent
 
-RUN_DEPENDS=	7z:archivers/p7zip \
+RUN_DEPENDS=	7zz:archivers/7-zip \
 		cabextract:archivers/cabextract
 
 .include <bsd.port.mk>
diff --git a/security/binwalk/files/patch-src_binwalk_config_extract.conf b/security/binwalk/files/patch-src_binwalk_config_extract.conf
new file mode 100644
index 000000000000..a9ead15015fb
--- /dev/null
+++ b/security/binwalk/files/patch-src_binwalk_config_extract.conf
@@ -0,0 +1,24 @@
+--- src/binwalk/config/extract.conf.orig	2015-12-23 16:51:01 UTC
++++ src/binwalk/config/extract.conf
+@@ -25,17 +25,17 @@
+ 
+ # Assumes these utilities are installed in $PATH.
+ ^gzip compressed data:gz:gzip -d -f '%e':0,2
+-^lzma compressed data:7z:7z e -y '%e':0,1
+-^xz compressed data:xz:7z e -y '%e':0,1
++^lzma compressed data:7z:7zz e -y '%e':0,1
++^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'
+ ^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'
+-^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'
+