From nobody Sat Jan 08 20:02:43 2022 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 2F9511940CC7; Sat, 8 Jan 2022 20:02:44 +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 4JWWGW6QGvz3q4c; Sat, 8 Jan 2022 20:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BC2D924DB5; Sat, 8 Jan 2022 20:02:43 +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 208K2hAX075011; Sat, 8 Jan 2022 20:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 208K2heo075010; Sat, 8 Jan 2022 20:02:43 GMT (envelope-from git) Date: Sat, 8 Jan 2022 20:02:43 GMT Message-Id: <202201082002.208K2heo075010@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: bbc6dc87aab1 - main - security/binwalk: using 7-zip instead of p7zip 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: bbc6dc87aab11c9bb8aae8cde453653e457a1cd3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641672163; 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=KojE/y1b2vJ9ADQw/vKp7Gk0KXqBv0L9HvDpk3RN69o=; b=cuQIkGDYy6bQ2MwnJjtW+YFd1VRzOSB0r1N3MqSyTeeRcqM2mZ2jxfcdWk/1AhU9YmJ6pw gGNO+iL6ubZbFRDEZhazwMlJjUSarmLBAQF6S+13Q/IpfgIZGx/m8of2QAMSJQD0+gVZC/ RriAUGxybJEiAYNqepMZOSoWVGpWTAQl30i5MRTThtDr/4iDBpU8wWGnJXVEK6bD2vdy0w Pn4ZHN2I6UWa26sudHP+g3ONN5EB5Kw9VbT0YQT167isansLXzGpQ8cgXaShg5zh3ZwLmT pWU3CFVclPyLTJJkjGisq/GtNTfdp1e4BI86mlBMTK+wFD9ghwgu7nRKA2rvaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641672163; a=rsa-sha256; cv=none; b=dot9txAxN9ftEAIzY6aZbGeBi/B7/H6KTHUGrLnDeLYqfDEYM06SPINf+CrOyFOl9IRn/1 w4PPmXLeUGNdcUTyzFfeMu0Vg1rSQjKdp8I979Lhdxl2EYeqAEXSVYBzDAPsh1hP9H5Ixe b/PmI6N6z3csudXwkcnjEVQNn2+MTBxXNukJW2LA+1ncGSOxZtFlvBbDVoAmqhtvTJme/l AgLsFWq+2tY+YCO1kdSoio316K4RUxmnenamlQBKtwHG+V/U3BcJd68OQZpmjfPhiD+WM3 bgIQI4kpH96rc2oVXGKHkt+NqxPTnWIpBdHAXeSBYeI+dt+B3JdIyjq9ShbTVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbc6dc87aab11c9bb8aae8cde453653e457a1cd3 commit bbc6dc87aab11c9bb8aae8cde453653e457a1cd3 Author: Kurt Jaeger AuthorDate: 2022-01-08 20:01:34 +0000 Commit: Kurt Jaeger 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 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' +