New upstream release 2.1.1
- Remove patches (all upstream/obsolete), switch to noarch, add suggests
This commit is contained in:
Scott Talbert
parent
ff7f2d076e
commit
340720f144
7 changed files with 19 additions and 426 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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):
|
||||
|
|
@ -1,336 +0,0 @@
|
|||
From 9b16315e00bbb3d26f21713cba8500d1db4910ef Mon Sep 17 00:00:00 2001
|
||||
From: Scott Talbert <swt@techie.net>
|
||||
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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
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 <http://unlicense.org/>
|
||||
*/
|
||||
-
|
||||
-#ifdef MAIN
|
||||
-int main(int argc, char *argv[])
|
||||
-{
|
||||
- if(argc != 3)
|
||||
- {
|
||||
- fprintf(stderr, "Usage: %s <input file> <output file>\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 <stdio.h>
|
||||
+#include <string.h>
|
||||
+#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 <input file> <output file>\n", argv[0]);
|
||||
+ return EXIT_FAILURE;
|
||||
+ }
|
||||
+
|
||||
+ inflate_raw_file(argv[1], argv[2]);
|
||||
+
|
||||
+ return EXIT_SUCCESS;
|
||||
+}
|
||||
+#endif
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 16bb181ca0b6b92b6a1dde40a610d640e9031c57 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Talbert <swt@techie.net>
|
||||
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 <stdio.h>
|
||||
#include <string.h>
|
||||
-#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
|
||||
|
||||
32
binwalk.spec
32
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 <swt@techie.net> - 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 <rel-eng@lists.fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
609668aa39a81d34b463edbf3956dd73 binwalk-2.0.0.tar.gz
|
||||
e5015a8d0eff287eda8c4afeeca89ed6 binwalk-2.1.1.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue