From ff7f2d076ea7e257472483eca458ace1fd1fee3f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 14:07:25 +0000 Subject: [PATCH 01/48] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 6e2c2c1..3eadf1e 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -40,6 +40,9 @@ chmod -c +x src/build/lib/binwalk/libs/*.so %{python3_sitearch}/%{name}-%{version}*.egg-info %changelog +* Tue Nov 10 2015 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Mon Aug 24 2015 Scott Talbert - 2.0.0-6 - Needed to specify python3 to configure From 340720f1440ca588c7f808414c63308d99699cfe Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 4 Jan 2016 19:54:14 -0500 Subject: [PATCH 02/48] New upstream release 2.1.1 - Remove patches (all upstream/obsolete), switch to noarch, add suggests --- .gitignore | 1 + binwalk-1.2-ignore-matplotlib-fail.patch | 21 -- binwalk-2.0.0-fix-binvis-python3.patch | 15 - binwalk-2.0.0-unbundle-miniz.patch | 336 ----------------------- binwalk-2.0.0-use-system-miniz.patch | 38 --- binwalk.spec | 32 ++- sources | 2 +- 7 files changed, 19 insertions(+), 426 deletions(-) delete mode 100644 binwalk-1.2-ignore-matplotlib-fail.patch delete mode 100644 binwalk-2.0.0-fix-binvis-python3.patch delete mode 100644 binwalk-2.0.0-unbundle-miniz.patch delete mode 100644 binwalk-2.0.0-use-system-miniz.patch diff --git a/.gitignore b/.gitignore index 9c45754..f0fa31a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /binwalk-0.4.5.tar.gz /binwalk-1.2.tar.gz /binwalk-2.0.0.tar.gz +/binwalk-2.1.1.tar.gz diff --git a/binwalk-1.2-ignore-matplotlib-fail.patch b/binwalk-1.2-ignore-matplotlib-fail.patch deleted file mode 100644 index 87900b8..0000000 --- a/binwalk-1.2-ignore-matplotlib-fail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up binwalk-1.2/src/setup.py.ignore-matplotlibfail binwalk-1.2/src/setup.py ---- binwalk-1.2/src/setup.py.ignore-matplotlibfail 2013-04-08 16:47:13.975048629 -0400 -+++ binwalk-1.2/src/setup.py 2013-04-08 16:47:36.047047840 -0400 -@@ -30,12 +30,12 @@ try: - except Exception, e: - print "\n", "*" * WIDTH - print "Pre-requisite check warning:", str(e) -- print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module." -- print "*" * WIDTH, "\n" -+ # print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module." -+ # print "*" * WIDTH, "\n" - -- if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'): -- print 'Quitting...\n' -- sys.exit(1) -+ # if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'): -+ # print 'Quitting...\n' -+ # sys.exit(1) - - - # Generate a new magic file from the files in the magic directory diff --git a/binwalk-2.0.0-fix-binvis-python3.patch b/binwalk-2.0.0-fix-binvis-python3.patch deleted file mode 100644 index 90b4be6..0000000 --- a/binwalk-2.0.0-fix-binvis-python3.patch +++ /dev/null @@ -1,15 +0,0 @@ -This is part of upstream commit bfd3f88652f4c0eb055776238c1083e4e0916510 - -diff --git a/src/binwalk/modules/binvis.py b/src/binwalk/modules/binvis.py -index 4835537..a542cff 100644 ---- a/src/binwalk/modules/binvis.py -+++ b/src/binwalk/modules/binvis.py -@@ -98,7 +98,7 @@ def _generate_plot_points(self, data_points): - - # If the number of data points exceeds the maximum number of allowed data points, use a - # weighting system to eliminate data points that occur less freqently. -- if sum(data_points.itervalues()) > self.max_points: -+ if sum(data_points.values()) > self.max_points: - - # First, generate a set of weight values 1 - 10 - for i in range(1, 11): diff --git a/binwalk-2.0.0-unbundle-miniz.patch b/binwalk-2.0.0-unbundle-miniz.patch deleted file mode 100644 index 69dc136..0000000 --- a/binwalk-2.0.0-unbundle-miniz.patch +++ /dev/null @@ -1,336 +0,0 @@ -From 9b16315e00bbb3d26f21713cba8500d1db4910ef Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Mon, 13 Oct 2014 23:29:14 -0400 -Subject: [PATCH] Move most of binwalk's tinfl additions to a separate file - -This will make downstream use of unbundled tinfl easier. ---- - src/C/miniz/Makefile | 8 +-- - src/C/miniz/tinfl.c | 131 ------------------------------------------- - src/C/miniz/tinfl_wrapper.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 137 insertions(+), 135 deletions(-) - create mode 100644 src/C/miniz/tinfl_wrapper.c - -diff --git a/src/C/miniz/Makefile b/src/C/miniz/Makefile -index d8c7448..9930e7f 100644 ---- a/src/C/miniz/Makefile -+++ b/src/C/miniz/Makefile -@@ -2,12 +2,12 @@ LIBNAME=libtinfl.$(SOEXT) - - all: $(LIBNAME) - --$(LIBNAME): tinfl.o -- $(CC) $(CFLAGS) -shared -Wl,$(SONAME),$(LIBNAME) tinfl.o -o $(LIBNAME) $(LDFLAGS) -+$(LIBNAME): tinfl_wrapper.o -+ $(CC) $(CFLAGS) -shared -Wl,$(SONAME),$(LIBNAME) tinfl_wrapper.o -o $(LIBNAME) $(LDFLAGS) - chmod +x $(LIBNAME) - --tinfl.o: -- $(CC) $(CFLAGS) -c tinfl.c -+tinfl_wrapper.o: -+ $(CC) $(CFLAGS) -c tinfl_wrapper.c - - install: - mkdir -p $(DESTDIR)$(LIBDIR) -diff --git a/src/C/miniz/tinfl.c b/src/C/miniz/tinfl.c -index 23fbe93..401168c 100644 ---- a/src/C/miniz/tinfl.c -+++ b/src/C/miniz/tinfl.c -@@ -8,7 +8,6 @@ - #ifndef TINFL_HEADER_INCLUDED - #define TINFL_HEADER_INCLUDED - --#include - #include - - typedef unsigned char mz_uint8; -@@ -70,10 +69,6 @@ size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const voi - typedef int (*tinfl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser); - int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); - --// Checks to see if the first block of data in in_buf is valid zlib compressed data. --// Returns 1 if valid, 0 if invalid. --int is_valid_zlib_data(char *in_buf, size_t in_buf_size); -- - struct tinfl_decompressor_tag; typedef struct tinfl_decompressor_tag tinfl_decompressor; - - // Max size of LZ dictionary. -@@ -573,117 +568,6 @@ int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, - return result; - } - --#define BLOCK_SIZE (32*1024) --char *inflate_block(char *buf, size_t buf_size) --{ -- size_t out_size = BLOCK_SIZE; -- return (char *) tinfl_decompress_mem_to_heap((const void *) buf, buf_size, (size_t *) &out_size, 0); --} -- --/* CJH */ -- --int is_deflated_callback(const void *pBuf, int len, void *pUser) --{ -- int *decomp_size = pUser; -- -- *decomp_size += len; -- -- if(len > 0) -- { -- return 1; -- } -- -- return 0; --} -- --/* -- * Tries to determine if a given buffer contains valid deflated data. -- * -- * @buf - The buffer of data to check for deflated data. -- * @buf_size - The size of @buf. -- * @includes_zlib_header - Set to 1 if the buffer should start with a valid zlib header. -- * -- * Returns the size of the inflated data if @buf inflated to a value larger than 32KB, -- * or if it contained a valid zlib header/footer; else, returns 0. -- * -- * Thus, it is recommended to provide more than 32KB of data in @buf for the most accurate results. -- */ --int is_deflated(char *buf, size_t buf_size, int includes_zlib_header) --{ -- int flags = TINFL_FLAG_HAS_MORE_INPUT; -- int retval = 0, decomp_size = 0; -- -- if(includes_zlib_header) -- { -- flags |= TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32; -- } -- -- retval = tinfl_decompress_mem_to_callback(buf, &buf_size, is_deflated_callback, (void *) &decomp_size, flags); -- -- if(retval == 1 || decomp_size > BLOCK_SIZE) -- { -- return decomp_size; -- } -- -- return 0; --} -- --int inflate_raw_file_callback(const void *pBuf, int len, void *pUser) --{ -- if(fwrite(pBuf, 1, len, (FILE *) pUser) == len) -- { -- return 1; -- } -- -- return 0; --} -- --/* Inflates a file containing raw deflated data. -- * -- * @in_file - Input file containing raw deflated data. -- * @out_file - Output file where inflated data will be saved. -- * -- * Returns void. -- */ --void inflate_raw_file(char *in_file, char *out_file) --{ -- char *compressed_data = NULL; -- size_t in_size = 0, nbytes = 0; -- FILE *fp_in = NULL, *fp_out = NULL; -- -- fp_in = fopen(in_file, "rb"); -- if(fp_in) -- { -- fp_out = fopen(out_file, "wb"); -- if(fp_out) -- { -- -- fseek(fp_in, 0L, SEEK_END); -- in_size = ftell(fp_in); -- fseek(fp_in, 0L, SEEK_SET); -- -- compressed_data = malloc(in_size); -- if(compressed_data) -- { -- memset(compressed_data, 0, in_size); -- -- nbytes = fread(compressed_data, 1, in_size, fp_in); -- if(nbytes > 0) -- { -- tinfl_decompress_mem_to_callback(compressed_data, &nbytes, inflate_raw_file_callback, (void *) fp_out, 0); -- } -- -- free(compressed_data); -- } -- } -- } -- -- if(fp_in) fclose(fp_in); -- if(fp_out) fclose(fp_out); -- -- return; --} -- - #endif // #ifndef TINFL_HEADER_FILE_ONLY - - /* -@@ -712,18 +596,3 @@ void inflate_raw_file(char *in_file, char *out_file) - - For more information, please refer to - */ -- --#ifdef MAIN --int main(int argc, char *argv[]) --{ -- if(argc != 3) -- { -- fprintf(stderr, "Usage: %s \n", argv[0]); -- return EXIT_FAILURE; -- } -- -- inflate_raw_file(argv[1], argv[2]); -- -- return EXIT_SUCCESS; --} --#endif -diff --git a/src/C/miniz/tinfl_wrapper.c b/src/C/miniz/tinfl_wrapper.c -new file mode 100644 -index 0000000..f942853 ---- /dev/null -+++ b/src/C/miniz/tinfl_wrapper.c -@@ -0,0 +1,133 @@ -+#include -+#include -+#include "tinfl.c" -+ -+// Checks to see if the first block of data in in_buf is valid zlib compressed data. -+// Returns 1 if valid, 0 if invalid. -+int is_valid_zlib_data(char *in_buf, size_t in_buf_size); -+ -+#define BLOCK_SIZE (32*1024) -+char *inflate_block(char *buf, size_t buf_size) -+{ -+ size_t out_size = BLOCK_SIZE; -+ return (char *) tinfl_decompress_mem_to_heap((const void *) buf, buf_size, (size_t *) &out_size, 0); -+} -+ -+/* CJH */ -+ -+int is_deflated_callback(const void *pBuf, int len, void *pUser) -+{ -+ int *decomp_size = pUser; -+ -+ *decomp_size += len; -+ -+ if(len > 0) -+ { -+ return 1; -+ } -+ -+ return 0; -+} -+ -+/* -+ * Tries to determine if a given buffer contains valid deflated data. -+ * -+ * @buf - The buffer of data to check for deflated data. -+ * @buf_size - The size of @buf. -+ * @includes_zlib_header - Set to 1 if the buffer should start with a valid zlib header. -+ * -+ * Returns the size of the inflated data if @buf inflated to a value larger than 32KB, -+ * or if it contained a valid zlib header/footer; else, returns 0. -+ * -+ * Thus, it is recommended to provide more than 32KB of data in @buf for the most accurate results. -+ */ -+int is_deflated(char *buf, size_t buf_size, int includes_zlib_header) -+{ -+ int flags = TINFL_FLAG_HAS_MORE_INPUT; -+ int retval = 0, decomp_size = 0; -+ -+ if(includes_zlib_header) -+ { -+ flags |= TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32; -+ } -+ -+ retval = tinfl_decompress_mem_to_callback(buf, &buf_size, is_deflated_callback, (void *) &decomp_size, flags); -+ -+ if(retval == 1 || decomp_size > BLOCK_SIZE) -+ { -+ return decomp_size; -+ } -+ -+ return 0; -+} -+ -+int inflate_raw_file_callback(const void *pBuf, int len, void *pUser) -+{ -+ if(fwrite(pBuf, 1, len, (FILE *) pUser) == len) -+ { -+ return 1; -+ } -+ -+ return 0; -+} -+ -+/* Inflates a file containing raw deflated data. -+ * -+ * @in_file - Input file containing raw deflated data. -+ * @out_file - Output file where inflated data will be saved. -+ * -+ * Returns void. -+ */ -+void inflate_raw_file(char *in_file, char *out_file) -+{ -+ char *compressed_data = NULL; -+ size_t in_size = 0, nbytes = 0; -+ FILE *fp_in = NULL, *fp_out = NULL; -+ -+ fp_in = fopen(in_file, "rb"); -+ if(fp_in) -+ { -+ fp_out = fopen(out_file, "wb"); -+ if(fp_out) -+ { -+ -+ fseek(fp_in, 0L, SEEK_END); -+ in_size = ftell(fp_in); -+ fseek(fp_in, 0L, SEEK_SET); -+ -+ compressed_data = malloc(in_size); -+ if(compressed_data) -+ { -+ memset(compressed_data, 0, in_size); -+ -+ nbytes = fread(compressed_data, 1, in_size, fp_in); -+ if(nbytes > 0) -+ { -+ tinfl_decompress_mem_to_callback(compressed_data, &nbytes, inflate_raw_file_callback, (void *) fp_out, 0); -+ } -+ -+ free(compressed_data); -+ } -+ } -+ } -+ -+ if(fp_in) fclose(fp_in); -+ if(fp_out) fclose(fp_out); -+ -+ return; -+} -+ -+#ifdef MAIN -+int main(int argc, char *argv[]) -+{ -+ if(argc != 3) -+ { -+ fprintf(stderr, "Usage: %s \n", argv[0]); -+ return EXIT_FAILURE; -+ } -+ -+ inflate_raw_file(argv[1], argv[2]); -+ -+ return EXIT_SUCCESS; -+} -+#endif --- -1.9.3 - diff --git a/binwalk-2.0.0-use-system-miniz.patch b/binwalk-2.0.0-use-system-miniz.patch deleted file mode 100644 index 2ff65d8..0000000 --- a/binwalk-2.0.0-use-system-miniz.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 16bb181ca0b6b92b6a1dde40a610d640e9031c57 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Wed, 15 Oct 2014 23:54:05 -0400 -Subject: [PATCH] Use Fedora system miniz library - ---- - src/C/miniz/Makefile | 2 +- - src/C/miniz/tinfl_wrapper.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/C/miniz/Makefile b/src/C/miniz/Makefile -index 9930e7f..0196818 100644 ---- a/src/C/miniz/Makefile -+++ b/src/C/miniz/Makefile -@@ -3,7 +3,7 @@ LIBNAME=libtinfl.$(SOEXT) - all: $(LIBNAME) - - $(LIBNAME): tinfl_wrapper.o -- $(CC) $(CFLAGS) -shared -Wl,$(SONAME),$(LIBNAME) tinfl_wrapper.o -o $(LIBNAME) $(LDFLAGS) -+ $(CC) $(CFLAGS) -shared -Wl,$(SONAME),$(LIBNAME) tinfl_wrapper.o -o $(LIBNAME) $(LDFLAGS) -lminiz - chmod +x $(LIBNAME) - - tinfl_wrapper.o: -diff --git a/src/C/miniz/tinfl_wrapper.c b/src/C/miniz/tinfl_wrapper.c -index f942853..8192c39 100644 ---- a/src/C/miniz/tinfl_wrapper.c -+++ b/src/C/miniz/tinfl_wrapper.c -@@ -1,6 +1,6 @@ - #include - #include --#include "tinfl.c" -+#include "miniz.h" - - // Checks to see if the first block of data in in_buf is valid zlib compressed data. - // Returns 1 if valid, 0 if invalid. --- -1.9.3 - diff --git a/binwalk.spec b/binwalk.spec index 3eadf1e..482def3 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,17 +1,19 @@ Name: binwalk -Version: 2.0.0 -Release: 7%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: binwalk-2.0.0-unbundle-miniz.patch -Patch1: binwalk-2.0.0-use-system-miniz.patch -Patch2: binwalk-2.0.0-fix-binvis-python3.patch +BuildArch: noarch BuildRequires: python3-devel -BuildRequires: miniz-devel -Requires: file-libs +# Optional, for graphs and visualizations Suggests: python3-pyqtgraph +# Optional, for --disasm functionality +Suggests: capstone +# Optional, for automatic extraction/decompression of files and data +Suggests: mtd-utils gzip bzip2 tar arj p7zip cabextract squashfs-tools +Suggests: sleuthkit %description Binwalk is a tool for searching a given binary image for embedded files and @@ -23,23 +25,23 @@ it is compatible with magic signatures created for the Unix file utility. %autosetup -p1 %build -%configure --disable-bundles --with-python=%{__python3} -make %{?_smp_mflags} -chmod -c +x src/build/lib/binwalk/libs/*.so +%py3_build %install -# Override --install-lib because package believes it is pure python but it -# actually contains arch-specific code. -%{__python3} setup.py install --install-lib=%{python3_sitearch} --prefix=%{_prefix} --root=%{buildroot} +%py3_install %files %doc API.md INSTALL.md README.md %license LICENSE %{_bindir}/%{name} -%{python3_sitearch}/%{name}/ -%{python3_sitearch}/%{name}-%{version}*.egg-info +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Sun Jan 03 2016 Scott Talbert - 2.1.1-1 +- New upstream release 2.1.1 +- Remove patches (all upstream/obsolete), switch to noarch, add suggests + * Tue Nov 10 2015 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index 82449ce..b5d25e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -609668aa39a81d34b463edbf3956dd73 binwalk-2.0.0.tar.gz +e5015a8d0eff287eda8c4afeeca89ed6 binwalk-2.1.1.tar.gz From 0565afbe521f49c828ed30332259884edcb2269c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:02:43 +0000 Subject: [PATCH 03/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 482def3..a696788 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jan 03 2016 Scott Talbert - 2.1.1-1 - New upstream release 2.1.1 - Remove patches (all upstream/obsolete), switch to noarch, add suggests From ba1e4cac4cab27d1b4cc245dbea525cd5ce95b3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:39:00 +0000 Subject: [PATCH 04/48] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index a696788..d7005c8 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.1.1-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Wed Feb 03 2016 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1a5c2507531c0bb6da908a5d7c94b2a887d0450f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 05/48] Rebuild for Python 3.6 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index d7005c8..e919ded 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Dec 19 2016 Miro Hrončok - 2.1.1-4 +- Rebuild for Python 3.6 + * Tue Jul 19 2016 Fedora Release Engineering - 2.1.1-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 19ed47e722d92c6e6cdd2b4b2d266eaadb6e0440 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:53:09 +0000 Subject: [PATCH 06/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index e919ded..1b21dd1 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 2.1.1-4 - Rebuild for Python 3.6 From 1728666b79744c35e4a67957933f65871d975539 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:57:49 +0000 Subject: [PATCH 07/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 1b21dd1..76bb88e 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Firmware analysis tool License: MIT URL: http://www.binwalk.org/ @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f5a514f67ac0b59d45f83b083314307e35cde816 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Fri, 28 Jul 2017 21:02:45 -0400 Subject: [PATCH 08/48] Update URL for binwalk - binwalk.org seems to have changed hands --- binwalk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 76bb88e..e1cfc27 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -3,7 +3,7 @@ Version: 2.1.1 Release: 6%{?dist} Summary: Firmware analysis tool License: MIT -URL: http://www.binwalk.org/ +URL: https://github.com/devttys0/binwalk Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel From 5c1209fd199b4bf74fe65f0f6ccc0910a4fd5ca0 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 19 Nov 2017 21:49:21 -0500 Subject: [PATCH 09/48] Add p7zip-plugins as a dependency and change from Suggests to Recommends (#1511958) --- binwalk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/binwalk.spec b/binwalk.spec index e1cfc27..f683466 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -12,7 +12,7 @@ Suggests: python3-pyqtgraph # Optional, for --disasm functionality Suggests: capstone # Optional, for automatic extraction/decompression of files and data -Suggests: mtd-utils gzip bzip2 tar arj p7zip cabextract squashfs-tools +Recommends: mtd-utils gzip bzip2 tar arj p7zip p7zip-plugins cabextract squashfs-tools Suggests: sleuthkit %description @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Nov 13 2017 Scott Talbert - 2.1.1-7 +- Add p7zip-plugins as a dependency and change from Suggests to Recommends (#1511958) + * Wed Jul 26 2017 Fedora Release Engineering - 2.1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 44914bb7fef5655967b3f41b142eeeb5dd23186b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 03:51:50 +0000 Subject: [PATCH 10/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index f683466..bcc757b 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Nov 13 2017 Scott Talbert - 2.1.1-7 - Add p7zip-plugins as a dependency and change from Suggests to Recommends (#1511958) From 2ea88ca4d0cbfb7fe7b7be4de110f4c89b13d6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:40:23 +0200 Subject: [PATCH 11/48] Rebuilt for Python 3.7 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index bcc757b..349729d 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.1.1-9 +- Rebuilt for Python 3.7 + * Wed Feb 07 2018 Fedora Release Engineering - 2.1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c5896d6e337a16c23a5376bbe148db1ce152a67b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:06:28 +0000 Subject: [PATCH 12/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 349729d..1f404bf 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 2.1.1-9 - Rebuilt for Python 3.7 From 611543540c4cae331e08f3b62589a8019104dc70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:38:24 +0000 Subject: [PATCH 13/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 1f404bf..f1c7731 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 877209d66ec6905e57250ccfd6613d04baddd9ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:17:37 +0000 Subject: [PATCH 14/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index f1c7731..3e45860 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b6a52d9bc90ab996c409c43897059c267ed872d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:10:41 +0200 Subject: [PATCH 15/48] Rebuilt for Python 3.8 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 3e45860..55c9013 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.1.1-13 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Fedora Release Engineering - 2.1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f49a3b884a331681880136f5ee9b1346d5643a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:51:04 +0200 Subject: [PATCH 16/48] Rebuilt for Python 3.8.0rc1 (#1748018) --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 55c9013..d52dfe4 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -38,6 +38,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.1.1-14 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 2.1.1-13 - Rebuilt for Python 3.8 From c88f31066609d9fd2de3b5581a348075c5fc4074 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 14 Oct 2019 21:03:39 -0400 Subject: [PATCH 17/48] Update to new upstream release 2.2.0 (#1761636) --- .gitignore | 1 + binwalk.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f0fa31a..04501fa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /binwalk-1.2.tar.gz /binwalk-2.0.0.tar.gz /binwalk-2.1.1.tar.gz +/binwalk-2.2.0.tar.gz diff --git a/binwalk.spec b/binwalk.spec index d52dfe4..674ee0a 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,18 +1,20 @@ Name: binwalk -Version: 2.1.1 -Release: 14%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel +# For tests +BuildRequires: python3-nose python3-coverage # Optional, for graphs and visualizations Suggests: python3-pyqtgraph # Optional, for --disasm functionality Suggests: capstone # Optional, for automatic extraction/decompression of files and data -Recommends: mtd-utils gzip bzip2 tar arj p7zip p7zip-plugins cabextract squashfs-tools +Recommends: mtd-utils gzip bzip2 tar arj p7zip p7zip-plugins cabextract squashfs-tools lzop srecord Suggests: sleuthkit %description @@ -30,6 +32,9 @@ it is compatible with magic signatures created for the Unix file utility. %install %py3_install +%check +PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test + %files %doc API.md INSTALL.md README.md %license LICENSE @@ -38,6 +43,9 @@ it is compatible with magic signatures created for the Unix file utility. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Oct 15 2019 Scott Talbert - 2.2.0-1 +- Update to new upstream release 2.2.0 (#1761636) + * Thu Oct 03 2019 Miro Hrončok - 2.1.1-14 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index b5d25e1..79bf25f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5015a8d0eff287eda8c4afeeca89ed6 binwalk-2.1.1.tar.gz +SHA512 (binwalk-2.2.0.tar.gz) = 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9 From b7c3e0ebc714378d01de83964c2a149df9609cec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:59:20 +0000 Subject: [PATCH 18/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 674ee0a..9b65c39 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -43,6 +43,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 15 2019 Scott Talbert - 2.2.0-1 - Update to new upstream release 2.2.0 (#1761636) From 6d38f73bf3ad4c7548b9ffcc03148c6c492e11d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:41:31 +0200 Subject: [PATCH 19/48] Rebuilt for Python 3.9 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 9b65c39..78d91f1 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -43,6 +43,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue May 26 2020 Miro Hrončok - 2.2.0-3 +- Rebuilt for Python 3.9 + * Tue Jan 28 2020 Fedora Release Engineering - 2.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From dbc074d43a85111b32f8363d801259a3e5ec5231 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:08:38 +0000 Subject: [PATCH 20/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 78d91f1..7af00a1 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -43,6 +43,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 2.2.0-3 - Rebuilt for Python 3.9 From 965740dee95e26ae4d45fdae202ab1c38fd29afa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:09:15 +0000 Subject: [PATCH 21/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 7af00a1..4933322 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -43,6 +43,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7b82ec8979a8c85775f0b3e35bb81f9f2f17018a Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 25 Mar 2021 20:31:45 -0400 Subject: [PATCH 22/48] Update to new upstream release 2.3.1 (#1941447) --- .gitignore | 1 + binwalk.spec | 8 ++++++-- fix_version.patch | 12 ++++++++++++ sources | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 fix_version.patch diff --git a/.gitignore b/.gitignore index 04501fa..e4a7f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /binwalk-2.0.0.tar.gz /binwalk-2.1.1.tar.gz /binwalk-2.2.0.tar.gz +/binwalk-2.3.1.tar.gz diff --git a/binwalk.spec b/binwalk.spec index 4933322..de1bb77 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,10 +1,11 @@ Name: binwalk -Version: 2.2.0 -Release: 5%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: fix_version.patch BuildArch: noarch BuildRequires: python3-devel # For tests @@ -43,6 +44,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Mar 26 2021 Scott Talbert - 2.3.1-1 +- Update to new upstream release 2.3.1 (#1941447) + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/fix_version.patch b/fix_version.patch new file mode 100644 index 0000000..1941c3c --- /dev/null +++ b/fix_version.patch @@ -0,0 +1,12 @@ +diff -up binwalk-2.3.1/setup.py.fix_version binwalk-2.3.1/setup.py +--- binwalk-2.3.1/setup.py.fix_version 2021-03-24 21:50:40.000000000 -0400 ++++ binwalk-2.3.1/setup.py 2021-03-25 20:28:43.990382935 -0400 +@@ -12,7 +12,7 @@ except ImportError: + from distutils.dir_util import remove_tree + + MODULE_NAME = "binwalk" +-MODULE_VERSION = "2.2.1" ++MODULE_VERSION = "2.3.1" + SCRIPT_NAME = MODULE_NAME + MODULE_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) + diff --git a/sources b/sources index 79bf25f..403ef0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binwalk-2.2.0.tar.gz) = 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9 +SHA512 (binwalk-2.3.1.tar.gz) = 3c9057c6f56d4bb1d604d3a361b0e682622a93d6d36c67a9f831ae7b17139c4684f52e96ce204d1d1256b79c4a3b806e7a78e2069b6c62eec188fa1586839670 From 72f58146066d51a89fb6353999233c4ee17aa8c6 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:31 +0200 Subject: [PATCH 23/48] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- binwalk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/binwalk.spec b/binwalk.spec index de1bb77..4a6c77c 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -8,6 +8,7 @@ Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}- Patch0: fix_version.patch BuildArch: noarch BuildRequires: python3-devel +BuildRequires: python3-setuptools # For tests BuildRequires: python3-nose python3-coverage # Optional, for graphs and visualizations From 5a385e2acf0feec76b97c5c777916bfea7700e7b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:00:20 +0200 Subject: [PATCH 24/48] Rebuilt for Python 3.10 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 4a6c77c..9504c55 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -45,6 +45,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Jun 04 2021 Python Maint - 2.3.1-2 +- Rebuilt for Python 3.10 + * Fri Mar 26 2021 Scott Talbert - 2.3.1-1 - Update to new upstream release 2.3.1 (#1941447) From e870a0db6fb58420e198db53014fcb21eaf6056b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:40:56 +0000 Subject: [PATCH 25/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f385393ec8d19837d167e567a85139a9fadff363 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:37:39 +0000 Subject: [PATCH 26/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 9504c55..b6ba3cb 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/devttys0/binwalk @@ -45,6 +45,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.3.1-2 - Rebuilt for Python 3.10 From 57fc8377f391209437cecbad61abfe5b58606d6f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 18 Aug 2021 20:03:41 -0400 Subject: [PATCH 27/48] Update to new upstream release 2.3.2 (#1994176) --- .gitignore | 1 + binwalk.spec | 12 +++++++----- fix_version.patch | 12 ------------ sources | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 fix_version.patch diff --git a/.gitignore b/.gitignore index e4a7f4c..d420004 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /binwalk-2.1.1.tar.gz /binwalk-2.2.0.tar.gz /binwalk-2.3.1.tar.gz +/binwalk-2.3.2.tar.gz diff --git a/binwalk.spec b/binwalk.spec index b6ba3cb..7274649 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,11 +1,10 @@ Name: binwalk -Version: 2.3.1 -Release: 3%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT -URL: https://github.com/devttys0/binwalk -Source0: https://github.com/devttys0/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: fix_version.patch +URL: https://github.com/ReFirmLabs/binwalk +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -45,6 +44,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Aug 18 2021 Scott Talbert - 2.3.2-1 +- Update to new upstream release 2.3.2 (#1994176) + * Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/fix_version.patch b/fix_version.patch deleted file mode 100644 index 1941c3c..0000000 --- a/fix_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up binwalk-2.3.1/setup.py.fix_version binwalk-2.3.1/setup.py ---- binwalk-2.3.1/setup.py.fix_version 2021-03-24 21:50:40.000000000 -0400 -+++ binwalk-2.3.1/setup.py 2021-03-25 20:28:43.990382935 -0400 -@@ -12,7 +12,7 @@ except ImportError: - from distutils.dir_util import remove_tree - - MODULE_NAME = "binwalk" --MODULE_VERSION = "2.2.1" -+MODULE_VERSION = "2.3.1" - SCRIPT_NAME = MODULE_NAME - MODULE_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) - diff --git a/sources b/sources index 403ef0e..629b9f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binwalk-2.3.1.tar.gz) = 3c9057c6f56d4bb1d604d3a361b0e682622a93d6d36c67a9f831ae7b17139c4684f52e96ce204d1d1256b79c4a3b806e7a78e2069b6c62eec188fa1586839670 +SHA512 (binwalk-2.3.2.tar.gz) = 7107e322bdbd2464c950b611d85fa20db59aefab5dbb134a341be72f683504683e7e43ab3cc78310d132f86d6289222cf991fb08923da9c33f13adc523456d3d From 5bc6fa208c4efa2b695ab1d50f017b8690472b26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:21:17 +0000 Subject: [PATCH 28/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 7274649..58f4b53 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -44,6 +44,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 18 2021 Scott Talbert - 2.3.2-1 - Update to new upstream release 2.3.2 (#1994176) From c6813074b54022501573e85292ca3ada8ce83f28 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:52:20 +0200 Subject: [PATCH 29/48] Rebuilt for Python 3.11 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 58f4b53..28a6193 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -44,6 +44,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Jun 13 2022 Python Maint - 2.3.2-3 +- Rebuilt for Python 3.11 + * Wed Jan 19 2022 Fedora Release Engineering - 2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 55b4f253ea21a8184cc1696273ef00dd4301dc35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:00:09 +0000 Subject: [PATCH 30/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 28a6193..1f7a4cc 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -44,6 +44,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 2.3.2-3 - Rebuilt for Python 3.11 From c89d15bb64ffae330948b62d71fecddbab3ae20e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 27 Dec 2022 17:06:55 -0500 Subject: [PATCH 31/48] Update to new upstream release 2.3.3 (#2003337 #2156566) --- .gitignore | 1 + ...36869d998edb6384728c03a348cd9ab1f9ca.patch | 34 +++++++++++++++++++ binwalk-2.3.3-tests.patch | 12 +++++++ binwalk.spec | 9 +++-- sources | 2 +- 5 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 6e7736869d998edb6384728c03a348cd9ab1f9ca.patch create mode 100644 binwalk-2.3.3-tests.patch diff --git a/.gitignore b/.gitignore index d420004..5cdc227 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /binwalk-2.2.0.tar.gz /binwalk-2.3.1.tar.gz /binwalk-2.3.2.tar.gz +/binwalk-2.3.3.tar.gz diff --git a/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch b/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch new file mode 100644 index 0000000..d57a904 --- /dev/null +++ b/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch @@ -0,0 +1,34 @@ +From 6e7736869d998edb6384728c03a348cd9ab1f9ca Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Sun, 12 Sep 2021 13:34:38 -0400 +Subject: [PATCH] Fix SyntaxWarnings + +Fixes: +/usr/lib/python3.10/site-packages/binwalk/modules/extractor.py:969: SyntaxWarning: "is" with a literal. Did you mean "=="? +/usr/lib/python3.10/site-packages/binwalk/modules/extractor.py:984: SyntaxWarning: "is" with a literal. Did you mean "=="? +--- + src/binwalk/modules/extractor.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/binwalk/modules/extractor.py b/src/binwalk/modules/extractor.py +index 4e4660af..3cc38ab1 100644 +--- 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,7 +981,7 @@ 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: diff --git a/binwalk-2.3.3-tests.patch b/binwalk-2.3.3-tests.patch new file mode 100644 index 0000000..dd4f876 --- /dev/null +++ b/binwalk-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'], + + ] diff --git a/binwalk.spec b/binwalk.spec index 1f7a4cc..bdf3899 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,10 +1,12 @@ Name: binwalk -Version: 2.3.2 -Release: 4%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: binwalk-2.3.3-tests.patch +Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -44,6 +46,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Dec 27 2022 Scott Talbert - 2.3.3-1 +- Update to new upstream release 2.3.3 (#2003337 #2156566) + * Wed Jul 20 2022 Fedora Release Engineering - 2.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 629b9f2..cdd7f6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binwalk-2.3.2.tar.gz) = 7107e322bdbd2464c950b611d85fa20db59aefab5dbb134a341be72f683504683e7e43ab3cc78310d132f86d6289222cf991fb08923da9c33f13adc523456d3d +SHA512 (binwalk-2.3.3.tar.gz) = d7e8d576cfc92b1488ceda7d4577aeaaefb2a251a5aca0b4a497da0dff7c6e6e862e0a77346593c77fb4e54b7de3d3a0c1c8c9421ecec8f06aabbc4b336920c5 From a8fb522b41fa27f4948032152e29deb248231fd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:53:44 +0000 Subject: [PATCH 32/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index bdf3899..092b7b6 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -46,6 +46,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 Scott Talbert - 2.3.3-1 - Update to new upstream release 2.3.3 (#2003337 #2156566) From f457a273a5cf53ec1ef53b2354d5bd1d6e8fca4b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Fri, 27 Jan 2023 15:03:15 -0500 Subject: [PATCH 33/48] Fix path traversal in PFS extractor script (#2165006) --- ...e34ed680ffd951bfeca737feb4a0b98dde5c.patch | 24 +++++++++++++++++++ binwalk.spec | 6 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch diff --git a/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch b/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch new file mode 100644 index 0000000..33ae03b --- /dev/null +++ b/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch @@ -0,0 +1,24 @@ +From 696fe34ed680ffd951bfeca737feb4a0b98dde5c Mon Sep 17 00:00:00 2001 +From: Quentin Kaiser +Date: Wed, 26 Oct 2022 21:25:01 +0200 +Subject: [PATCH] fix path traversal in PFS extractor script. + +os.path.join does not fully resolve a path so the condition that follows +will never be true. Fixed by resolving the path using os.path.abspath. +--- + src/binwalk/plugins/unpfs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/binwalk/plugins/unpfs.py b/src/binwalk/plugins/unpfs.py +index 9513c8b5..b93e0dab 100644 +--- a/src/binwalk/plugins/unpfs.py ++++ b/src/binwalk/plugins/unpfs.py +@@ -104,7 +104,7 @@ def extractor(self, fname): + data = binwalk.core.common.BlockFile(fname, 'rb') + data.seek(fs.get_end_of_meta_data()) + for entry in fs.entries(): +- outfile_path = os.path.join(out_dir, entry.fname) ++ outfile_path = os.path.abspath(os.path.join(out_dir, entry.fname)) + if not outfile_path.startswith(out_dir): + binwalk.core.common.warning("Unpfs extractor detected directory traversal attempt for file: '%s'. Refusing to extract." % outfile_path) + else: diff --git a/binwalk.spec b/binwalk.spec index 092b7b6..fc6f376 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,12 +1,13 @@ Name: binwalk Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: binwalk-2.3.3-tests.patch Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch +Patch2: %{url}/pull/617/commits/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -46,6 +47,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Jan 27 2023 Scott Talbert - 2.3.3-3 +- Fix path traversal in PFS extractor script (#2165006) + * Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 60f7a958ba59c47936d9b18435ea2dfbf8bcc075 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 2 Feb 2023 20:31:13 -0500 Subject: [PATCH 34/48] Update to new upstream release 2.3.4 (#2166724) --- .gitignore | 1 + ...e34ed680ffd951bfeca737feb4a0b98dde5c.patch | 24 ------------------- binwalk.spec | 9 ++++--- sources | 2 +- version-oops.patch | 12 ++++++++++ 5 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch create mode 100644 version-oops.patch diff --git a/.gitignore b/.gitignore index 5cdc227..b3c8f2b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /binwalk-2.3.1.tar.gz /binwalk-2.3.2.tar.gz /binwalk-2.3.3.tar.gz +/binwalk-2.3.4.tar.gz diff --git a/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch b/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch deleted file mode 100644 index 33ae03b..0000000 --- a/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 696fe34ed680ffd951bfeca737feb4a0b98dde5c Mon Sep 17 00:00:00 2001 -From: Quentin Kaiser -Date: Wed, 26 Oct 2022 21:25:01 +0200 -Subject: [PATCH] fix path traversal in PFS extractor script. - -os.path.join does not fully resolve a path so the condition that follows -will never be true. Fixed by resolving the path using os.path.abspath. ---- - src/binwalk/plugins/unpfs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/binwalk/plugins/unpfs.py b/src/binwalk/plugins/unpfs.py -index 9513c8b5..b93e0dab 100644 ---- a/src/binwalk/plugins/unpfs.py -+++ b/src/binwalk/plugins/unpfs.py -@@ -104,7 +104,7 @@ def extractor(self, fname): - data = binwalk.core.common.BlockFile(fname, 'rb') - data.seek(fs.get_end_of_meta_data()) - for entry in fs.entries(): -- outfile_path = os.path.join(out_dir, entry.fname) -+ outfile_path = os.path.abspath(os.path.join(out_dir, entry.fname)) - if not outfile_path.startswith(out_dir): - binwalk.core.common.warning("Unpfs extractor detected directory traversal attempt for file: '%s'. Refusing to extract." % outfile_path) - else: diff --git a/binwalk.spec b/binwalk.spec index fc6f376..88f7500 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,13 +1,13 @@ Name: binwalk -Version: 2.3.3 -Release: 3%{?dist} +Version: 2.3.4 +Release: 1%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: binwalk-2.3.3-tests.patch Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch -Patch2: %{url}/pull/617/commits/696fe34ed680ffd951bfeca737feb4a0b98dde5c.patch +Patch2: version-oops.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -47,6 +47,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Feb 03 2023 Scott Talbert - 2.3.4-1 +- Update to new upstream release 2.3.4 (#2166724) + * Fri Jan 27 2023 Scott Talbert - 2.3.3-3 - Fix path traversal in PFS extractor script (#2165006) diff --git a/sources b/sources index cdd7f6d..2a33f3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binwalk-2.3.3.tar.gz) = d7e8d576cfc92b1488ceda7d4577aeaaefb2a251a5aca0b4a497da0dff7c6e6e862e0a77346593c77fb4e54b7de3d3a0c1c8c9421ecec8f06aabbc4b336920c5 +SHA512 (binwalk-2.3.4.tar.gz) = 5a5e16035dfc05b94ae4ee3969a337336c550606b71e20fcb1f150c4b38ef2084b6a823ce2a8050f4b41616b7d7c31cfb04bf43e7f2c977ab1a634aba9d67fec diff --git a/version-oops.patch b/version-oops.patch new file mode 100644 index 0000000..033f4fa --- /dev/null +++ b/version-oops.patch @@ -0,0 +1,12 @@ +diff -up binwalk-2.3.4/setup.py.oops binwalk-2.3.4/setup.py +--- binwalk-2.3.4/setup.py.oops 2023-02-01 11:15:53.000000000 -0500 ++++ binwalk-2.3.4/setup.py 2023-02-02 20:28:44.655410043 -0500 +@@ -12,7 +12,7 @@ except ImportError: + from distutils.dir_util import remove_tree + + MODULE_NAME = "binwalk" +-MODULE_VERSION = "2.3.3" ++MODULE_VERSION = "2.3.4" + SCRIPT_NAME = MODULE_NAME + MODULE_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) + From c45b31c90845f3362e76d760056de09530edecdb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 22:13:49 +0200 Subject: [PATCH 35/48] Rebuilt for Python 3.12 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 88f7500..6570058 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -47,6 +47,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jun 13 2023 Python Maint - 2.3.4-2 +- Rebuilt for Python 3.12 + * Fri Feb 03 2023 Scott Talbert - 2.3.4-1 - Update to new upstream release 2.3.4 (#2166724) From fd25eb00b4cdac610571aaacd246f406a526df40 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 28 Jun 2023 22:37:07 -0400 Subject: [PATCH 36/48] BR python3-zombie-imp to fix FTBFS with Python 3.12 --- binwalk.spec | 9 ++++++++- requires-zombie-imp.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 requires-zombie-imp.patch diff --git a/binwalk.spec b/binwalk.spec index 6570058..a5b39d5 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -8,9 +8,13 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: binwalk-2.3.3-tests.patch Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch Patch2: version-oops.patch +# https://github.com/ReFirmLabs/binwalk/issues/507 +Patch3: requires-zombie-imp.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools +# https://github.com/ReFirmLabs/binwalk/issues/507 +BuildRequires: (python3-zombie-imp if python3-devel >= 3.12) # For tests BuildRequires: python3-nose python3-coverage # Optional, for graphs and visualizations @@ -47,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jun 28 2023 Scott Talbert - 2.3.4-3 +- BR python3-zombie-imp to fix FTBFS with Python 3.12 + * Tue Jun 13 2023 Python Maint - 2.3.4-2 - Rebuilt for Python 3.12 diff --git a/requires-zombie-imp.patch b/requires-zombie-imp.patch new file mode 100644 index 0000000..1fe30a4 --- /dev/null +++ b/requires-zombie-imp.patch @@ -0,0 +1,11 @@ +diff -up binwalk-2.3.4/setup.py.imp binwalk-2.3.4/setup.py +--- binwalk-2.3.4/setup.py.imp 2023-02-02 20:28:44.655410043 -0500 ++++ binwalk-2.3.4/setup.py 2023-06-28 22:26:04.279845937 -0400 +@@ -336,6 +336,7 @@ setup( + author="Craig Heffner", + url="https://github.com/ReFirmLabs/%s" % MODULE_NAME, + requires=[], ++ install_requires=["zombie-imp;python_version>='3.12'"], + python_requires=">=3", + package_dir={"": "src"}, + packages=[MODULE_NAME], From 19231438fadfab2b7d5fb3f3c1e67a69fddfeeda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:38:05 +0000 Subject: [PATCH 37/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index a5b39d5..990d81d 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 28 2023 Scott Talbert - 2.3.4-3 - BR python3-zombie-imp to fix FTBFS with Python 3.12 From b96d23b742b0ef857475ae0876696dfebd072875 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:24:40 +0000 Subject: [PATCH 38/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 990d81d..aebe6c4 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2960ee31cb3e0a3244560a4afff6bac3031d7e59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:24:38 +0000 Subject: [PATCH 39/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index aebe6c4..f017fbc 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 2.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cd201d7fe5f9e6e7dc0064619a13d7278355ad54 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 15:41:10 +0200 Subject: [PATCH 40/48] Rebuilt for Python 3.13 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index f017fbc..5d5ea23 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Jun 07 2024 Python Maint - 2.3.4-7 +- Rebuilt for Python 3.13 + * Tue Jan 23 2024 Fedora Release Engineering - 2.3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5a58c04cae7ce7a24345186b21c8599c40e86f6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:18:38 +0000 Subject: [PATCH 41/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 5d5ea23..dc3491e 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 2.3.4-7 - Rebuilt for Python 3.13 From 54d8aba644a7d1601c80a20b305a0ec73d10f23a Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 30 Jul 2024 21:28:39 -0400 Subject: [PATCH 42/48] Confirm License tag is already SPDX --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index dc3491e..c6014d5 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -51,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 31 2024 Scott Talbert - 2.3.4-9 +- Confirm License tag is already SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.3.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7abfeca4ffea24df5584d435aca4a89035b1337f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 15 Dec 2024 00:59:31 +0100 Subject: [PATCH 43/48] Replace deprecated nose with pytest - https://fedoraproject.org/wiki/Changes/DeprecateNose --- _nose_shim.py | 10 ++++++++++ binwalk.spec | 16 +++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 _nose_shim.py diff --git a/_nose_shim.py b/_nose_shim.py new file mode 100644 index 0000000..074dd44 --- /dev/null +++ b/_nose_shim.py @@ -0,0 +1,10 @@ +def eq_(a, b): + assert a == b + +def ok_(s): + assert s + +def assert_not_equal(a, b): + assert a != b + +assert_equal = eq_ diff --git a/binwalk.spec b/binwalk.spec index c6014d5..22e6a82 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,10 +1,11 @@ Name: binwalk Version: 2.3.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: _nose_shim.py Patch0: binwalk-2.3.3-tests.patch Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca.patch Patch2: version-oops.patch @@ -16,7 +17,7 @@ BuildRequires: python3-setuptools # https://github.com/ReFirmLabs/binwalk/issues/507 BuildRequires: (python3-zombie-imp if python3-devel >= 3.12) # For tests -BuildRequires: python3-nose python3-coverage +BuildRequires: python3-pytest # Optional, for graphs and visualizations Suggests: python3-pyqtgraph # Optional, for --disasm functionality @@ -33,6 +34,10 @@ it is compatible with magic signatures created for the Unix file utility. %prep %autosetup -p1 +# replace nose with minimal compatibility shim +# upsteram has moved away from Python in version 3+ +cp -a %{SOURCE1} testing/tests/_nose_shim.py +sed -i 's/from nose.tools import/from _nose_shim import/' testing/tests/*.py %build %py3_build @@ -41,7 +46,8 @@ it is compatible with magic signatures created for the Unix file utility. %py3_install %check -PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test +cd testing/tests +%pytest %files %doc API.md INSTALL.md README.md @@ -51,6 +57,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Sat Dec 14 2024 Miro Hrončok - 2.3.4-10 +- Replace deprecated nose with pytest +- https://fedoraproject.org/wiki/Changes/DeprecateNose + * Wed Jul 31 2024 Scott Talbert - 2.3.4-9 - Confirm License tag is already SPDX From 63cdfb5094559275ea524966676206d9f74ec219 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:31:16 +0000 Subject: [PATCH 44/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 22e6a82..95911d6 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -57,6 +57,9 @@ cd testing/tests %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Dec 14 2024 Miro Hrončok - 2.3.4-10 - Replace deprecated nose with pytest - https://fedoraproject.org/wiki/Changes/DeprecateNose From 65223c11862f561cd3a5909fac49a22fc986fa94 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 08:54:40 +0200 Subject: [PATCH 45/48] Rebuilt for Python 3.14 --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 95911d6..83314ba 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -57,6 +57,9 @@ cd testing/tests %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jun 03 2025 Python Maint - 2.3.4-12 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 2.3.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 01419ac9f3696437f82a7937a07de6072172478e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:42:30 +0000 Subject: [PATCH 46/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 83314ba..5d31952 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -57,6 +57,9 @@ cd testing/tests %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.3.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 2.3.4-12 - Rebuilt for Python 3.14 From 127155c4cd66606ec60b35c147da4d6c7f9e2feb Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 3 Sep 2025 20:43:21 +0200 Subject: [PATCH 47/48] Add support for Python 3.14 (BZ#2336914) --- ...Migrate-from-ast.Num-to-ast.Constant.patch | 28 +++++++++++++++++++ binwalk.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-Migrate-from-ast.Num-to-ast.Constant.patch diff --git a/0001-Migrate-from-ast.Num-to-ast.Constant.patch b/0001-Migrate-from-ast.Num-to-ast.Constant.patch new file mode 100644 index 0000000..e1cfada --- /dev/null +++ b/0001-Migrate-from-ast.Num-to-ast.Constant.patch @@ -0,0 +1,28 @@ +From 27518c9b5817c1c54f782083db9957260666575d Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Wed, 3 Sep 2025 20:41:03 +0200 +Subject: [PATCH] Migrate from ast.Num to ast.Constant + +ast.Num has been removed from Python 3.14. +--- + src/binwalk/core/common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/binwalk/core/common.py b/src/binwalk/core/common.py +index bff7481..5f34f61 100644 +--- a/src/binwalk/core/common.py ++++ b/src/binwalk/core/common.py +@@ -238,8 +238,8 @@ class MathExpression(object): + return self._eval(ast.parse(expr).body[0].value) + + def _eval(self, node): +- if isinstance(node, ast.Num): # +- return node.n ++ if isinstance(node, ast.Constant): # ++ return node.value + elif isinstance(node, ast.operator): # + return self.OPERATORS[type(node.op)] + elif isinstance(node, ast.UnaryOp): +-- +2.51.0 + diff --git a/binwalk.spec b/binwalk.spec index 5d31952..24372b0 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -11,6 +11,7 @@ Patch1: %{url}/pull/559/commits/6e7736869d998edb6384728c03a348cd9ab1f9ca Patch2: version-oops.patch # https://github.com/ReFirmLabs/binwalk/issues/507 Patch3: requires-zombie-imp.patch +Patch4: 0001-Migrate-from-ast.Num-to-ast.Constant.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -57,6 +58,9 @@ cd testing/tests %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Wed Sep 03 2025 LuK1337 - 2.3.4-14 +- Add support for Python 3.14 + * Wed Jul 23 2025 Fedora Release Engineering - 2.3.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 29df462d4a13d3d558293269704796cb96c5d52a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:08:48 +0200 Subject: [PATCH 48/48] Rebuilt for Python 3.14.0rc3 bytecode --- binwalk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binwalk.spec b/binwalk.spec index 24372b0..6fc3a22 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -1,6 +1,6 @@ Name: binwalk Version: 2.3.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Firmware analysis tool License: MIT URL: https://github.com/ReFirmLabs/binwalk @@ -58,6 +58,9 @@ cd testing/tests %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Sep 19 2025 Python Maint - 2.3.4-15 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Sep 03 2025 LuK1337 - 2.3.4-14 - Add support for Python 3.14