Version bump.

(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)

3 files changed, 116 insertions, 1 deletions

diff --git a/app-misc/binwalk/ChangeLog b/app-misc/binwalk/ChangeLog
index 300a5221a4c2..575503c76f91 100644
--- a/app-misc/binwalk/ChangeLog
+++ b/app-misc/binwalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/binwalk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.9 2011/08/21 05:52:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.10 2011/09/10 09:59:20 radhermit Exp $
+
+*binwalk-0.3.9 (10 Sep 2011)
+
+  10 Sep 2011; Tim Harder <radhermit@gentoo.org> +binwalk-0.3.9.ebuild,
+  +files/binwalk-0.3.9-system-magic.patch:
+  Version bump.
 
 *binwalk-0.3.8 (21 Aug 2011)
 
diff --git a/app-misc/binwalk/binwalk-0.3.9.ebuild b/app-misc/binwalk/binwalk-0.3.9.ebuild
new file mode 100644
index 000000000000..0abbd0659342
--- /dev/null
+++ b/app-misc/binwalk/binwalk-0.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-0.3.9.ebuild,v 1.1 2011/09/10 09:59:20 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="http://code.google.com/p/binwalk/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/file"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../docs/README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-magic.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-updates
+}
diff --git a/app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch b/app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch
new file mode 100644
index 000000000000..00de366fad86
--- /dev/null
+++ b/app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch
@@ -0,0 +1,76 @@
+--- binwalk-0.3.9.orig/src/configure.ac
++++ binwalk-0.3.9/src/configure.ac
+@@ -7,20 +7,13 @@
+ AC_PROG_CC
+ AC_LANG(C)
+ 
+-FILE="file-5.07"
+-CFLAGS="-Wall -I./$FILE/src $CFLAGS"
+-LDFLAGS="-lz $LDFLAGS"
++CFLAGS="-Wall $CFLAGS"
++LDFLAGS="-lmagic $LDFLAGS"
+ 
+ AC_ARG_ENABLE([static],    [  --enable-static         perform static build ], [STATIC=y], [STATIC=n])
+ AC_ARG_ENABLE([updates],   [  --disable-updates       disable update features that rely on libcurl ], [CURL=n], [CURL=y])
+ 
+-if test $CURL = y
+-then
+-	AC_CHECK_LIB([curl],[curl_easy_init],[],[echo "error: missing libcurl library" && exit],[])
+-	AC_CHECK_HEADERS([curl/curl.h],[],[echo "error: missing curl header files" && exit])
+-
+-	LDFLAGS="-lcurl $LDFLAGS"
+-fi
++AC_CHECK_LIB([magic],[magic_open],[],[echo "error: missing libmagic library" && exit],[])
+ 
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h stdlib.h string.h unistd.h],[],[echo "error: missing necessary header file" && exit])
+ 
+@@ -37,9 +30,6 @@
+ 	LDFLAGS="-static $CLIBS $LDFLAGS"
+ fi
+ 
+-dnl extract and run file utility configure script
+-tar -zxvf $FILE.tar.gz && cd $FILE && ./configure && cd -
+-
+ if test $CURL = n
+ then
+ 	CFLAGS="-DNOCURL $CFLAGS"
+@@ -47,6 +37,5 @@
+ 
+ cp confdefs.h config.h
+ 
+-AC_SUBST(FILE, $FILE)
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+--- binwalk-0.3.9.orig/src/Makefile.in
++++ binwalk-0.3.9/src/Makefile.in
+@@ -1,7 +1,6 @@
+ CC=@CC@
+ CFLAGS=@CFLAGS@
+ LDFLAGS=@LDFLAGS@
+-FILE=@FILE@
+ MAGIC=magic
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+@@ -11,13 +10,9 @@
+ 
+ all: magi binwalk
+ 
+-binwalk: file common.o md5.o mparse.o filter.o update.o
++binwalk: common.o md5.o mparse.o filter.o update.o
+ 	$(CC) $(CFLAGS) -DMAGIC='"$(MAGICPATH).binwalk"' -DMAGIC_CAST='"$(MAGICPATH).bincast"' -DMAGIC_ARCH='"$(MAGICPATH).binarch"' binwalk.c -o binwalk *.o $(LDFLAGS)
+ 
+-file:
+-	(cd $(FILE)/src && make)
+-	(cp $(FILE)/src/*.o . && rm -f file.o)
+-	
+ common.o:
+ 	$(CC) $(CFLAGS) -c common.c
+ 
+@@ -49,7 +44,6 @@
+ 	rm -f binwalk *.o
+ 
+ cleanall: clean
+-	rm -rf $(FILE)
+ 	rm -rf config.* *.cache
+ 	rm -f Makefile
+