* [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/
@ 2017-04-26 6:24 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2017-04-26 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 3945684939f5ad1650c6a6ade404b966cc69343e
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 06:14:49 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 06:22:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39456849
app-misc/binwalk: backport patch to support backports-lzma
In addition to pyliblzma.
app-misc/binwalk/binwalk-2.1.1.ebuild | 4 +-
...-for-backports.lzma-when-importing-lzma-m.patch | 67 ++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 466c274a8df..031f4169fe8 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -16,10 +16,12 @@ KEYWORDS="~amd64 ~x86"
IUSE="graph"
RDEPEND="
- $(python_gen_cond_dep 'dev-python/pyliblzma[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)
graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch )
+
python_install_all() {
local DOCS=( API.md INSTALL.md README.md )
distutils-r1_python_install_all
diff --git a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
new file mode 100644
index 00000000000..708498060bc
--- /dev/null
+++ b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
@@ -0,0 +1,67 @@
+From 95bce4edcc6e92c9517b80ccb1fb956f591e0738 Mon Sep 17 00:00:00 2001
+From: Craig Heffner <heffnercj@gmail.com>
+Date: Tue, 5 Jan 2016 13:28:24 -0500
+Subject: [PATCH] Added check for backports.lzma when importing lzma module
+
+---
+ src/binwalk/modules/compression.py | 5 ++++-
+ src/binwalk/plugins/lzmaextract.py | 6 +++++-
+ src/binwalk/plugins/lzmavalid.py | 5 ++++-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/binwalk/modules/compression.py b/src/binwalk/modules/compression.py
+index 97ca68d..e919f7e 100644
+--- a/src/binwalk/modules/compression.py
++++ b/src/binwalk/modules/compression.py
+@@ -2,11 +2,14 @@
+
+ import os
+ import zlib
+-import lzma
+ import struct
+ import binwalk.core.compat
+ import binwalk.core.common
+ from binwalk.core.module import Option, Kwarg, Module
++try:
++ import lzma
++except ImportError:
++ from backports import lzma
+
+ class LZMAHeader(object):
+ def __init__(self, **kwargs):
+diff --git a/src/binwalk/plugins/lzmaextract.py b/src/binwalk/plugins/lzmaextract.py
+index 137b4cc..93f6240 100755
+--- a/src/binwalk/plugins/lzmaextract.py
++++ b/src/binwalk/plugins/lzmaextract.py
+@@ -12,7 +12,11 @@ class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
+ # lzma package in Python 2.0 decompress() does not handle multiple
+ # compressed streams, only first stream is extracted.
+ # backports.lzma package could be used to keep consistent behaviour.
+- import lzma
++ try:
++ import lzma
++ except ImportError:
++ from backports import lzma
++
+ self.decompressor = lzma.decompress
+
+ # If the extractor is enabled for the module we're currently loaded
+diff --git a/src/binwalk/plugins/lzmavalid.py b/src/binwalk/plugins/lzmavalid.py
+index a343656..62e15b9 100644
+--- a/src/binwalk/plugins/lzmavalid.py
++++ b/src/binwalk/plugins/lzmavalid.py
+@@ -17,7 +17,10 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
+
+ def init(self):
+ try:
+- import lzma
++ try:
++ import lzma
++ except ImportError:
++ from backports import lzma
+ self.decompressor = lzma.decompress
+ except ImportError as e:
+ self.decompressor = None
+--
+2.12.2
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/
@ 2017-04-26 6:24 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2017-04-26 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 23687f976a125f9b24231d9d8511843083461612
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 05:54:28 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 06:22:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23687f97
app-misc/binwalk: remove old
app-misc/binwalk/Manifest | 1 -
app-misc/binwalk/binwalk-2.0.1.ebuild | 42 ---------------
app-misc/binwalk/files/binwalk-2.0.1-libs.patch | 14 -----
.../binwalk/files/binwalk-2.0.1-makefile.patch | 61 ----------------------
4 files changed, 118 deletions(-)
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index b31bff91ce3..546afb57108 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,2 +1 @@
-DIST binwalk-2.0.1.tar.gz 2234469 SHA256 90ee8426d71e91b62dfe4a1446c457bc7835b475b28717859e275a0494403959 SHA512 de223f61a0a212469c21b8e36d02cadc83f1cdb96a0f6114490d15d8dc12c93a86b46ef74379acb96b32b305e75ca66e940d7a18a8dc3b5036ebe8946dcca0f3 WHIRLPOOL c66ea461132417629f59e3f7562330f038263a0d522aca1db1e85f0bad5e9564d8baa27125acfb67404f0ee8045bd8da71faedcf3d2e352303ca8b0295a2767d
DIST binwalk-2.1.1.tar.gz 263977 SHA256 1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168 WHIRLPOOL 3cb8faedd02c6a4859467c285efe00e73ea3e52c48ce2b55e0344853e8a5b7884f9d15eb502ab16bba7262e38dfdb0cbcfadc7d3af4015e4357d9d2d248e6113
diff --git a/app-misc/binwalk/binwalk-2.0.1.ebuild b/app-misc/binwalk/binwalk-2.0.1.ebuild
deleted file mode 100644
index ac89f6c5272..00000000000
--- a/app-misc/binwalk/binwalk-2.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/devttys0/binwalk"
-SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graph"
-
-RDEPEND="
- app-crypt/ssdeep
- sys-apps/file[${PYTHON_USEDEP}]
- graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${P}-libs.patch
-)
-
-python_configure_all() {
- econf --disable-bundles
-}
-
-python_compile_all() {
- emake
-}
-
-python_install_all() {
- local DOCS=( API.md INSTALL.md )
- distutils-r1_python_install_all
-
- dolib.so src/C/*/*.so
-}
diff --git a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch b/app-misc/binwalk/files/binwalk-2.0.1-libs.patch
deleted file mode 100644
index 5a746a4176f..00000000000
--- a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't install C libs by default since we don't need to install them for
-every python version since they aren't linked with libpython.
-
---- binwalk-2.0.1/setup.py
-+++ binwalk-2.0.1/setup.py
-@@ -134,7 +134,7 @@
-
- # The data files to install along with the module
- data_dirs = ["magic", "config", "plugins", "modules", "core"]
--install_data_files = [os.path.join("libs", "*.so")]
-+install_data_files = []
-
- for data_dir in data_dirs:
- install_data_files.append("%s%s*" % (data_dir, os.path.sep))
diff --git a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch b/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch
deleted file mode 100644
index e70f096ea6b..00000000000
--- a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Don't build python via the makefile and fix parallel make jobs.
-
---- binwalk-2.0.1/Makefile.in
-+++ binwalk-2.0.1/Makefile.in
-@@ -33,21 +33,20 @@
- $(PYTHON) ./setup.py install $(PREFIX)
-
- build:
-- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi
-- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi
-- $(PYTHON) ./setup.py build
-+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR); fi
-+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR); fi
-
- deps:
- ./deps.sh
-
- clean:
-- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi
-- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi
-+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) clean; fi
-+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) clean; fi
- $(PYTHON) ./setup.py clean
-
- distclean: clean
-- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi
-- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi
-+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) distclean; fi
-+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) distclean; fi
- rm -rf Makefile config.* *.cache
-
- uninstall:
---- binwalk-2.0.1/src/C/Makefile
-+++ binwalk-2.0.1/src/C/Makefile
-@@ -3,9 +3,9 @@
- .PHONY: all clean_libs clean distclean
-
- all:
-- make -C miniz
-+ $(MAKE) -C miniz
- cp miniz/*.$(SOEXT) $(LIB_DIR)
-- make -C compress
-+ $(MAKE) -C compress
- cp compress/*.$(SOEXT) $(LIB_DIR)
-
- clean_libs:
-@@ -13,10 +13,10 @@
- rm -f $(LIB_DIR)/libcompress42.$(SOEXT)
-
- clean: clean_libs
-- make -C miniz clean
-- make -C compress clean
-+ $(MAKE) -C miniz clean
-+ $(MAKE) -C compress clean
-
- distclean: clean_libs
-- make -C miniz distclean
-- make -C compress distclean
-+ $(MAKE) -C miniz distclean
-+ $(MAKE) -C compress distclean
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/
@ 2020-06-11 2:00 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2020-06-11 2:00 UTC (permalink / raw
To: gentoo-commits
commit: 845abbef40e2d97c25e111e18cee63424b1bd5ea
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 01:45:26 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 02:00:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845abbef
app-misc/binwalk: drop old
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
app-misc/binwalk/Manifest | 1 -
app-misc/binwalk/binwalk-2.1.1.ebuild | 40 -------------
...-for-backports.lzma-when-importing-lzma-m.patch | 67 ----------------------
app-misc/binwalk/metadata.xml | 3 -
4 files changed, 111 deletions(-)
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 4b66b45413d..dc96e51cb0f 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,2 +1 @@
-DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
deleted file mode 100644
index c69739d3e4d..00000000000
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="graph"
-
-RDEPEND="
- graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch )
-
-python_install_all() {
- local DOCS=( API.md INSTALL.md README.md )
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "binwalk has many optional dependencies to automatically"
- elog "extract/decompress data, see INSTALL.md for more details."
- fi
-}
diff --git a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
deleted file mode 100644
index 708498060bc..00000000000
--- a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 95bce4edcc6e92c9517b80ccb1fb956f591e0738 Mon Sep 17 00:00:00 2001
-From: Craig Heffner <heffnercj@gmail.com>
-Date: Tue, 5 Jan 2016 13:28:24 -0500
-Subject: [PATCH] Added check for backports.lzma when importing lzma module
-
----
- src/binwalk/modules/compression.py | 5 ++++-
- src/binwalk/plugins/lzmaextract.py | 6 +++++-
- src/binwalk/plugins/lzmavalid.py | 5 ++++-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/binwalk/modules/compression.py b/src/binwalk/modules/compression.py
-index 97ca68d..e919f7e 100644
---- a/src/binwalk/modules/compression.py
-+++ b/src/binwalk/modules/compression.py
-@@ -2,11 +2,14 @@
-
- import os
- import zlib
--import lzma
- import struct
- import binwalk.core.compat
- import binwalk.core.common
- from binwalk.core.module import Option, Kwarg, Module
-+try:
-+ import lzma
-+except ImportError:
-+ from backports import lzma
-
- class LZMAHeader(object):
- def __init__(self, **kwargs):
-diff --git a/src/binwalk/plugins/lzmaextract.py b/src/binwalk/plugins/lzmaextract.py
-index 137b4cc..93f6240 100755
---- a/src/binwalk/plugins/lzmaextract.py
-+++ b/src/binwalk/plugins/lzmaextract.py
-@@ -12,7 +12,11 @@ class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
- # lzma package in Python 2.0 decompress() does not handle multiple
- # compressed streams, only first stream is extracted.
- # backports.lzma package could be used to keep consistent behaviour.
-- import lzma
-+ try:
-+ import lzma
-+ except ImportError:
-+ from backports import lzma
-+
- self.decompressor = lzma.decompress
-
- # If the extractor is enabled for the module we're currently loaded
-diff --git a/src/binwalk/plugins/lzmavalid.py b/src/binwalk/plugins/lzmavalid.py
-index a343656..62e15b9 100644
---- a/src/binwalk/plugins/lzmavalid.py
-+++ b/src/binwalk/plugins/lzmavalid.py
-@@ -17,7 +17,10 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
-
- def init(self):
- try:
-- import lzma
-+ try:
-+ import lzma
-+ except ImportError:
-+ from backports import lzma
- self.decompressor = lzma.decompress
- except ImportError as e:
- self.decompressor = None
---
-2.12.2
-
diff --git a/app-misc/binwalk/metadata.xml b/app-misc/binwalk/metadata.xml
index 12e5ca8a3e8..6064ade4c2b 100644
--- a/app-misc/binwalk/metadata.xml
+++ b/app-misc/binwalk/metadata.xml
@@ -18,7 +18,4 @@
<upstream>
<remote-id type="github">ReFirmLabs/binwalk</remote-id>
</upstream>
- <use>
- <flag name="graph">Enable support for generating entropy graphs</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/
@ 2021-10-28 16:16 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2021-10-28 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 06789739f53acc5ca9e1d75d2a70a004123cf676
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 16:14:17 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 16:16:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06789739
app-misc/binwalk: add 2.3.3, enable py3.10
also partially revert test result change
https://github.com/ReFirmLabs/binwalk/issues/566
Closes: https://bugs.gentoo.org/820359
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
app-misc/binwalk/Manifest | 1 +
app-misc/binwalk/binwalk-2.3.3.ebuild | 43 ++++++++++++++++++++++++++++++++
app-misc/binwalk/files/2.3.3-tests.patch | 12 +++++++++
3 files changed, 56 insertions(+)
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index dc6ea2eca11..2013e4d87bb 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,2 +1,3 @@
DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
DIST binwalk-2.3.1.tar.gz 39603558 BLAKE2B c3de5baaec18242d3db2b9492edadb3607a45fbc1237185223bf7bb04afcf0f8936607f9e0f4a99bd1796f5c7acfaef318855fe2c3ff05ae0676961bf60cc6c9 SHA512 3c9057c6f56d4bb1d604d3a361b0e682622a93d6d36c67a9f831ae7b17139c4684f52e96ce204d1d1256b79c4a3b806e7a78e2069b6c62eec188fa1586839670
+DIST binwalk-2.3.3.tar.gz 39723775 BLAKE2B d29b709dae0ae406e0ef6142e878a2bbbf0ddb3bd8f49d3335dd1e7ab385c331c021489b3d96b3c2364038b870c1aae53c8d82e7a3d9ab1983ff4520e20f6e73 SHA512 d7e8d576cfc92b1488ceda7d4577aeaaefb2a251a5aca0b4a497da0dff7c6e6e862e0a77346593c77fb4e54b7de3d3a0c1c8c9421ecec8f06aabbc4b336920c5
diff --git a/app-misc/binwalk/binwalk-2.3.3.ebuild b/app-misc/binwalk/binwalk-2.3.3.ebuild
new file mode 100644
index 00000000000..557b9217f68
--- /dev/null
+++ b/app-misc/binwalk/binwalk-2.3.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch
+ "${FILESDIR}"/2.3.3-tests.patch
+
+)
+
+distutils_enable_tests --install nose
+
+python_install_all() {
+ local DOCS=( API.md INSTALL.md README.md )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "binwalk has many optional dependencies to automatically"
+ elog "extract/decompress data, see INSTALL.md for more details."
+ fi
+}
diff --git a/app-misc/binwalk/files/2.3.3-tests.patch b/app-misc/binwalk/files/2.3.3-tests.patch
new file mode 100644
index 00000000000..dd4f876c777
--- /dev/null
+++ b/app-misc/binwalk/files/2.3.3-tests.patch
@@ -0,0 +1,12 @@
+reverted:
+--- b/testing/tests/test_firmware_zip.py
++++ a/testing/tests/test_firmware_zip.py
+@@ -10,6 +10,8 @@
+ '''
+ expected_results = [
+ [0, 'Zip archive data, at least v1.0 to extract, name: dir655_revB_FW_203NA/'],
++ [51, 'Zip archive data, at least v2.0 to extract, compressed size: 6395868, uncompressed size: 6422554, name: dir655_revB_FW_203NA/DIR655B1_FW203NAB02.bin'],
++ [6395993, 'Zip archive data, at least v2.0 to extract, compressed size: 14243, uncompressed size: 61440, name: dir655_revB_FW_203NA/dir655_revB_release_notes_203NA.doc'],
+ [6410581, 'End of Zip archive, footer length: 22'],
+
+ ]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-28 16:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-11 2:00 [gentoo-commits] repo/gentoo:master commit in: app-misc/binwalk/, app-misc/binwalk/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2021-10-28 16:16 Georgy Yakovlev
2017-04-26 6:24 Tim Harder
2017-04-26 6:24 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox