From de00a48de05f26eccc9b4085cade2a390b47d5b7d01b512d5ff7c6ab879a66a0 Mon Sep 17 00:00:00 2001
From: Boris Manojlovic <boris@steki.net>
Date: Tue, 30 Oct 2012 13:13:25 +0000
Subject: [PATCH] Accepting request 139770 from
 home:bmanojlovic:branches:devel:tools

Updated to latest upstream version 0.4.5

OBS-URL: https://build.opensuse.org/request/show/139770
OBS-URL: https://build.opensuse.org/package/show/devel:tools/binwalk?expand=0&rev=2
---
 binwalk-0.3.8.tar.bz2                      |  3 ---
 binwalk-0.4.5-dumbing-down-old-magic.patch | 13 +++++++++++++
 binwalk-0.4.5.tar.gz                       |  3 +++
 binwalk.changes                            | 17 +++++++++++++++++
 binwalk.spec                               | 14 ++++++++++----
 5 files changed, 43 insertions(+), 7 deletions(-)
 delete mode 100644 binwalk-0.3.8.tar.bz2
 create mode 100644 binwalk-0.4.5-dumbing-down-old-magic.patch
 create mode 100644 binwalk-0.4.5.tar.gz

diff --git a/binwalk-0.3.8.tar.bz2 b/binwalk-0.3.8.tar.bz2
deleted file mode 100644
index 8e01a53..0000000
--- a/binwalk-0.3.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6e9b0053ccdf28eb69eb299676142e0382cd2fcf5a38dfcc3e328bb24d16894
-size 673490
diff --git a/binwalk-0.4.5-dumbing-down-old-magic.patch b/binwalk-0.4.5-dumbing-down-old-magic.patch
new file mode 100644
index 0000000..aef32e9
--- /dev/null
+++ b/binwalk-0.4.5-dumbing-down-old-magic.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..a64c30c
--- /dev/null
+++ b/binwalk-0.4.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0797173ef20f581e7573976c70e4b2575656d56b482a9392a8795714436da2f0
+size 112526
diff --git a/binwalk.changes b/binwalk.changes
index d022801..3a31dd8 100644
--- a/binwalk.changes
+++ b/binwalk.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Oct 30 12:42:57 UTC 2012 - boris@steki.net
+
+- updated to latest upstream 0.4.5
+  * Fixed magic file white space parsing bug.
+  * Fixed memory leak when more than one target file was specified.
+  * Added --dd option for auto-extraction of files.
+  * Bug fixes, signature updates
+  * Much improved scanning speed (thanks dannyb!).
+  * New options (--grep, --raw-bytes).
+  * Improved filtering.
+  * Various bug fixes and signature updates.
+  * Improved signature matching for SquashFS file systems.
+  * Added support for Linux block devices.
+  * Added support for building against libmagic.
+  * Added ability to optionally disable update features.
+
 -------------------------------------------------------------------
 Tue Aug 23 12:39:24 UTC 2011 - boris@steki.net
 
diff --git a/binwalk.spec b/binwalk.spec
index ac9134e..0326542 100644
--- a/binwalk.spec
+++ b/binwalk.spec
@@ -18,17 +18,20 @@
 # norootforbuild
 
 Name:           binwalk
-Version:        0.3.8
+Version:        0.4.5
 Release:        0
 License:        MIT
 Summary:        Firmware Analysis Tool
 Url:            http://code.google.com/p/binwalk/
 Group:          Development/Tools/Debuggers
-#   Real source http://binwalk.googlecode.com/files/{name}-{version}.tar.gz
-Source:         %{name}-%{version}.tar.bz2
+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
 
 %description
@@ -40,6 +43,9 @@ 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
@@ -58,7 +64,7 @@ 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
+#rm %%{buildroot}/%%{_sysconfdir}/binwalk/magic.o
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}