From 40fcb11395378803b5e46948ca8050d5aa21a081 Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Wed, 12 Feb 2020 11:49:51 +0300 Subject: [PATCH] app-misc: drop binwalk (use it from the gentoo repo) --- app-misc/binwalk/Manifest | 1 - app-misc/binwalk/binwalk-2.2.0-r2.ebuild | 59 ---------------- ...backports.lzma-when-importing-lzma-m.patch | 67 ------------------- app-misc/binwalk/metadata.xml | 21 ------ 4 files changed, 148 deletions(-) delete mode 100644 app-misc/binwalk/Manifest delete mode 100644 app-misc/binwalk/binwalk-2.2.0-r2.ebuild delete mode 100644 app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch delete mode 100644 app-misc/binwalk/metadata.xml diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest deleted file mode 100644 index dc96e51cb..000000000 --- a/app-misc/binwalk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9 diff --git a/app-misc/binwalk/binwalk-2.2.0-r2.ebuild b/app-misc/binwalk/binwalk-2.2.0-r2.ebuild deleted file mode 100644 index b8bcd06eb..000000000 --- a/app-misc/binwalk/binwalk-2.2.0-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A tool for identifying files embedded inside firmware images" -HOMEPAGE="https://github.com/ReFirmLabs/binwalk" - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk" - inherit git-r3 -else - SRC_URI="https://github.com/ReFirmLabs/binwalk/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="graph squashfs test ubifs yaffs" - -DOCS=( API.md INSTALL.md README.md ) - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7) - dev-libs/capstone[python,${PYTHON_USEDEP}] - !!dev-libs/capstone-bindings - graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] ) - sys-apps/file[${PYTHON_USEDEP}] - squashfs? ( - sys-fs/squashfs-tools:0 - sys-fs/sasquatch - ) - ubifs? ( sys-fs/ubi_reader ) - yaffs? ( sys-fs/yaffshiv )" - -DEPEND="test? ( dev-python/nose[coverage,${PYTHON_USEDEP}] )" - -pkg_setup() { - python_setup -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_postinst() { - einfo "\nbinwalk has many optional dependencies to automatically" - einfo "extract/decompress data, see INSTALL.md for more details.\n" -} - -src_test() { - find testing/tests/input-vectors -type f | while read x; do - ${PYTHON} testing/test_generator.py $x || die - done -} 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 708498060..000000000 --- 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 -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 deleted file mode 100644 index 65d8e9622..000000000 --- a/app-misc/binwalk/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - radhermit@gentoo.org - Tim Harder - - - email@linxon.ru - Yury Martynov - - - ReFirmLabs/binwalk - - - Enable support for generating entropy graphs - Using sys-fs/sasquatch to extract non-standard SquashFS images - Using sys-fs/ubi_reader to extract UBIFS file systems - Using sys-fs/yaffshiv to extract JFFS2 file systems - -