diff --git a/binwalk-0.4.5-dumbing-down-old-magic.patch b/binwalk-0.4.5-dumbing-down-old-magic.patch deleted file mode 100644 index aef32e9..0000000 --- a/binwalk-0.4.5-dumbing-down-old-magic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/binwalk.c -=================================================================== ---- src/binwalk.c.orig 2012-09-06 20:55:07.000000000 +0200 -+++ src/binwalk.c 2012-10-30 14:07:19.347285239 +0100 -@@ -77,8 +77,6 @@ int main(int argc, char *argv[]) - memset((void *) &globals,0,sizeof(globals)); - - /* Initialize default configuration settings */ -- /* Thanks to dannyb for these flags - much improved scan times! */ -- config.flags = MAGIC_NO_CHECK_TEXT | MAGIC_NO_CHECK_ENCODING; - config.align = DEFAULT_BYTE_ALIGN; - config.smart = 1; - diff --git a/binwalk-0.4.5.tar.gz b/binwalk-0.4.5.tar.gz deleted file mode 100644 index a64c30c..0000000 --- a/binwalk-0.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0797173ef20f581e7573976c70e4b2575656d56b482a9392a8795714436da2f0 -size 112526 diff --git a/binwalk-1.2.1.tar.gz b/binwalk-1.2.1.tar.gz new file mode 100644 index 0000000..4e43051 --- /dev/null +++ b/binwalk-1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d286900b01af22499ac86f9fab7f8fb430e00e2c4cdafc142573837e16eb0c1 +size 89964 diff --git a/binwalk.changes b/binwalk.changes index 3a31dd8..def387d 100644 --- a/binwalk.changes +++ b/binwalk.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Sep 23 13:13:57 UTC 2013 - vcizek@suse.com + +- update to 1.2.1 + * complete re-write in Python and includes new features and + a scriptable Python module + * several new features, including recursive scanning and extraction, + strings and entropy analysis, and plugin support + * major speed improvements and regex filter support, + as well as bug fixes and signature updates + * adds the --extract option and extends --dd, allowing auto extraction + and auto decompression of extracted files + * Improved signatures and scan speed + ------------------------------------------------------------------- Tue Oct 30 12:42:57 UTC 2012 - boris@steki.net diff --git a/binwalk.spec b/binwalk.spec index 0326542..f5e5bc4 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -18,21 +18,21 @@ # norootforbuild Name: binwalk -Version: 0.4.5 +Version: 1.2.1 Release: 0 License: MIT Summary: Firmware Analysis Tool Url: http://code.google.com/p/binwalk/ Group: Development/Tools/Debuggers Source0: http://binwalk.googlecode.com/files/%{name}-%{version}.tar.gz -%if 0%{sles_version} <= 11 -Patch0: binwalk-0.4.5-dumbing-down-old-magic.patch -%endif -BuildRequires: libcurl-devel -BuildRequires: zlib-devel -BuildRequires: help2man -BuildRequires: file-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +BuildRequires: python-magic +BuildRequires: python-matplotlib +BuildRequires: python-matplotlib-tk +Requires: python +Requires: python-magic +Requires: python-matplotlib +Requires: python-matplotlib-tk %description Binwalk is a tool for searching a given binary image for embedded files and executable code. @@ -43,41 +43,25 @@ found in firmware images such as compressed/archived files, firmware headers, Li %prep %setup -q -%if 0%{sles_version} <= 11 -%patch0 -%endif %build -cd src -%configure -make %{?_smp_mflags} - -# used for older versions of help2man - read SLE... -%if 0%{?sles_version} -cp binwalk binwalk.bin; echo '#!/bin/sh' > binwalk.sh;echo './binwalk.bin $* 2>&1' >> binwalk.sh; chmod 755 binwalk.sh; help2man -N --help-option="-h" --version-option="-h" ./binwalk.sh |sed -e 's/binwalk.bin/binwalk/g' |gzip -9 - > binwalk.1.gz -%else -help2man --no-discard-stderr --help-option="-h" --version-option="-h" ./binwalk |gzip -9 - > binwalk.1.gz -%endif +pushd src +%{__python} setup.py build +popd %install -cd src -make install DESTDIR=%{buildroot} -install -p -D -m 0644 binwalk.1.gz %{buildroot}/%{_mandir}/man1/binwalk.1.gz -# I really do not know why it likes this... -#rm %%{buildroot}/%%{_sysconfdir}/binwalk/magic.o -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +pushd src +%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +popd %files %defattr(-,root,root) -%doc docs/README -%dir %{_sysconfdir}/binwalk/ -%config %{_sysconfdir}/binwalk/magic.binarch -%config %{_sysconfdir}/binwalk/magic.bincast -%config %{_sysconfdir}/binwalk/magic.binwalk -%{_bindir}/binwalk -%{_mandir}/man1/binwalk.1.gz +%doc docs/* +%{_bindir}/%{name} +%{python_sitelib}/%{name}/ +%{python_sitelib}/binwalk-1.2-py2.7.egg-info + %changelog