gentoo resync : 30.10.2021

3 files changed, 58 insertions, 0 deletions

diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 415007d6cfcd..d41854bd468c 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,7 +1,10 @@
+AUX 2.3.3-tests.patch 623 BLAKE2B 2f474f0ff9900668576a49beb34e43daaf93bce64f5dbe326b6d7ab7ade35a2be3dd77b384e9ca6f17513d59f886b0286272b2e7903d494cb44a7a9a767c5570 SHA512 4999af720eb5c48fad216c1462af493bbfa83480ada57cc80e6bae109bb1a4f1121cd1a7c5529a33c3baf793a37731489974588f4fb5dc9851ab399120372548
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 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
 EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
 EBUILD binwalk-2.3.1.ebuild 1017 BLAKE2B f7d4cc3be7f3c0831d38cae2886a3b7bdeede846c60ba2708e6b3503802352d9916b5b396eb04e71888221b434854d861d2326fa11cdbb123e7a10de7c22dc8d SHA512 1683871aba7147e332e1681a870a5bb6f02092ef644b256c6bf75128ae235fd849e1d6bf35e64bfe2128013b24e52689d0c0315fb12b856252b8ab10a4e9667c
+EBUILD binwalk-2.3.3.ebuild 1053 BLAKE2B 70d2fc613aab66f4d9397820406b901ec5b57be8ffea614a46275be61671b0940ebcc32375bc63d10660f8321203be91ceef2d79ca8ea73405de568d4594c162 SHA512 7d54aa60f9b5898e19beacc791ed0324e4eea46e510ea27a3104c373c6e8dda0b91cce32878c081b3ee16573d2df38178bc1514b6ddaf271dd177b611cc7cb4b
 EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
 MISC metadata.xml 911 BLAKE2B 6487e4f869597e44106ca7041da5881e8e9c1e2ee4231dfbe3606bcc51257818da35b77a425a815ae7fbc39b71915985559510331f70b2d8b7162599328977c9 SHA512 49e0ad3a76def389ac5657aec056d48d6534d66376623c9cde4751e7e8d52a15b4edb300f07c507ef9e54b4e84d7ec51f5f205d25440f8b1f562980b797ef255
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 000000000000..88ea03d972fa
--- /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 000000000000..dd4f876c7777
--- /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'],
+ 
+     ]