summaryrefslogtreecommitdiff
path: root/app-misc/binwalk
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/binwalk')
-rw-r--r--app-misc/binwalk/Manifest3
-rw-r--r--app-misc/binwalk/files/2.3.3-tests.patch12
-rw-r--r--app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch14
-rw-r--r--app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch36
4 files changed, 0 insertions, 65 deletions
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 5bdd72ed2f8b..2a71a5f832d3 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,6 +1,3 @@
-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
-AUX binwalk-2.3.3-syntax-fix.patch 1581 BLAKE2B d60d265cbb54343c08f16a9ea212e938059d2bc9eda43458a95d6255c2ce55f8ba205322e0903c8f910c7e6475df3d8bd4a005b119cff057c6a6109e060d6031 SHA512 0f3e4f4b21e31d79c3a91b436029c4c3261d7abfc823caace0218f19b6ad6c3b02fac9270f21ac37c13aa2e8df46326225b404d1d1c8b45cfc355527598b43e9
DIST binwalk-2.3.6.tar.gz 39723335 BLAKE2B 20710dc32f67981b1ba69ced649bfddc0247b9054a30ba9a8ab17710094fa4f45a44b32b18e2de6e0c63d632044432e8d4a8ec8cdacb007996b7d91b983547bc SHA512 05e06682a9b8aa6b68b580b6818a2f08d8d81d89961f6cacfd9d14185c26727bbdf6dedb2f26079fffebf7de6f45002944ed8f3475ba04e4b05ac6d5c19560ea
EBUILD binwalk-2.3.6.ebuild 939 BLAKE2B f609bbedcb2fe082a4cab39e3e876eba377d26e0ed9574227a3ba21ddbbd91906093c18b0f1aada61fa138f479c471c2dafbb7d5ea218d161bdcde158928ce41 SHA512 c8e45be2364d7a3a59d1c320a4d3628011cf1ca026d31c86d414a773dc3eec5404a7a3e119a376d0f5988be26fe9671cdfb3b1d4372226eef108afaf35b08df6
EBUILD binwalk-9999.ebuild 939 BLAKE2B f609bbedcb2fe082a4cab39e3e876eba377d26e0ed9574227a3ba21ddbbd91906093c18b0f1aada61fa138f479c471c2dafbb7d5ea218d161bdcde158928ce41 SHA512 c8e45be2364d7a3a59d1c320a4d3628011cf1ca026d31c86d414a773dc3eec5404a7a3e119a376d0f5988be26fe9671cdfb3b1d4372226eef108afaf35b08df6
diff --git a/app-misc/binwalk/files/2.3.3-tests.patch b/app-misc/binwalk/files/2.3.3-tests.patch
deleted file mode 100644
index dd4f876c7777..000000000000
--- a/app-misc/binwalk/files/2.3.3-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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'],
-
- ]
diff --git a/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch b/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch
deleted file mode 100644
index 5dd322ba6036..000000000000
--- a/app-misc/binwalk/files/binwalk-2.2.0-disable-test-coverage.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Avoid having to pull in dev-python/coverage test dep since we don't care about
-coverage.
-
---- binwalk-2.2.0/setup.py
-+++ binwalk-2.2.0/setup.py
-@@ -303,7 +303,7 @@
- os.chdir(testing_directory)
-
- # Run the tests
-- retval = nose.core.run(argv=['--exe','--with-coverage'])
-+ retval = nose.core.run(argv=['--exe'])
-
- sys.stdout.write("\n")
-
diff --git a/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch b/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch
deleted file mode 100644
index 5edd530b2293..000000000000
--- a/app-misc/binwalk/files/binwalk-2.3.3-syntax-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/ReFirmLabs/binwalk/pull/585
-
-From bce53d1bb57c2e6dccf718147ebe9472779b7903 Mon Sep 17 00:00:00 2001
-From: Cameron Katri <me@cameronkatri.com>
-Date: Mon, 3 Jan 2022 15:20:39 -0500
-Subject: [PATCH] Fix SyntaxWarning message
-
-/usr/lib/python3/dist-packages/binwalk/modules/extractor.py:969: SyntaxWarning: "is" with a literal. Did you mean "=="?
- if child_pid is 0:
-/usr/lib/python3/dist-packages/binwalk/modules/extractor.py:984: SyntaxWarning: "is" with a literal. Did you mean "=="?
- if child_pid is 0:
---- a/src/binwalk/modules/extractor.py
-+++ b/src/binwalk/modules/extractor.py
-@@ -966,7 +966,7 @@ def shell_call(self, command):
-
- # Fork a child process
- child_pid = os.fork()
-- if child_pid is 0:
-+ if child_pid == 0:
- # Switch to the run-as user privileges, if one has been set
- if self.runas_uid is not None and self.runas_gid is not None:
- os.setgid(self.runas_uid)
-@@ -981,10 +981,10 @@ def shell_call(self, command):
- rval = subprocess.call(shlex.split(command), stdout=tmp, stderr=tmp)
-
- # A true child process should exit with the subprocess exit value
-- if child_pid is 0:
-+ if child_pid == 0:
- sys.exit(rval)
- # If no os.fork() happened, just return the subprocess exit value
-- elif child_pid is None:
-+ elif child_pid == None:
- return rval
- # Else, os.fork() happened and we're the parent. Wait and return the child's exit value.
- else:
-