Version bump.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 128 insertions, 10 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/Manifest b/app-misc/binwalk/Manifest
index f4b2f7043251..c83bd5548a5f 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -3,22 +3,25 @@ Hash: SHA512
 
 AUX binwalk-0.3.7-system-magic.patch 2015 RMD160 acd622e2f579b2a09fa0e19a454aaf96611027f3 SHA1 6f51bbfa3b8a0b279b9f794e58bb079c13a60e36 SHA256 c38b07143f7c54828034e419fccba0f64c3234f995d9711eff6c50312fd4e6b2
 AUX binwalk-0.3.8-system-magic.patch 2091 RMD160 8d64bcae91082c98db01d920aca2bdd556aad7e4 SHA1 779cf886ff873bd0ab4871faa870a034047ae16a SHA256 257777d2a033d3b77568d89e3fd84850acffc19691220bed9031badf1156d41c
+AUX binwalk-0.3.9-system-magic.patch 2035 RMD160 21969dfe62f48be2b7da213c453b62ffdca92993 SHA1 3004b3e448e5cfed5f4ea02b42b160cb75d95581 SHA256 ddb87812b53082f4b12c9a70be834a32ac7d9ec00ded593de6a5487aee4a9d64
 DIST binwalk-0.3.6.tar.gz 66027 RMD160 b4da3b2da0e5e68659f0822f50c8d760032c7db1 SHA1 8dfa743334baddc1035920f264fe2411111f97c3 SHA256 0968a9724dc13848b123f3157e008e39fef757c00c49d25b7da4929908a7d8db
 DIST binwalk-0.3.7.tar.gz 664457 RMD160 1a95f40624b6b383f03af210f7305b055e25f2be SHA1 d74b795402c5e6b51c9320ac2ab5eee8bf0d09e3 SHA256 cd1dfc2c3a4af82e1a94310b13ebb30fedeb15e171441efdae27b63cc462a2f4
 DIST binwalk-0.3.8.tar.gz 665851 RMD160 eb357bdad9bec74553eb765e41cf04fc7155c73e SHA1 1d1958abb2574196e7057b4542ebbfffdd5f33b9 SHA256 51b9253545c2621638618d9a6da8c2d41886dbbce12e50bcee4a3ea274d5901a
+DIST binwalk-0.3.9.tar.gz 680527 RMD160 48e809ecf49191f8a0857b52c35d2fe52986b4e9 SHA1 cd624d5a106f7da13e780b499ff8dbd1bbf1b98e SHA256 1ce6567d52572931f3fe72e28c6fe3dd53fdfbdc8238d64d2f1d63ae339e83cc
 EBUILD binwalk-0.3.6.ebuild 522 RMD160 4df45838e6e010a9f57b7ae983308346acec4002 SHA1 295a98f9a19bdeabba2491f905859c9238473a2d SHA256 6aae1ca3e1facd174616e5df79b8545259d279b5164f02730501c628cc665b74
 EBUILD binwalk-0.3.7.ebuild 666 RMD160 231416ec7c3e20299ff8d304bd5098bc5d6141a6 SHA1 767d2f7ac064c8e37ed4a3e57aab791ed08fc858 SHA256 baef9dc08aff28784f414f5eebd1632e8cedcb1a16770bcb8f1233d4a522a260
 EBUILD binwalk-0.3.8.ebuild 668 RMD160 5235a6285471545505f5fcf6bc3cb2a824be9e1f SHA1 ed747cee479387b572f0df59989d2a6148329ed8 SHA256 0302daaceb5b11eb5a9175fcc5041e1a2c30d867a77985bc2ef783feb4c2ec6d
-MISC ChangeLog 1777 RMD160 71a0271c860bbfc05bee1a81e09136284489a895 SHA1 80b9abad96a7e2747a53bb3ef9d6279b8ff8bf9a SHA256 c603d46fc853e4f3468401c4ccba2bbb43107f7926deac3ed28b12835f65d117
+EBUILD binwalk-0.3.9.ebuild 713 RMD160 7986a559e1e3ee771a7274a9995cb2995039f16e SHA1 68734f6a2470120a2e09cddef5935ab9a0689d90 SHA256 6c1dc776acb7b19c91fdc3bbf454810866fc2d977ca53bc1e8c80085a6bf2555
+MISC ChangeLog 1940 RMD160 ba54ee1cc58d0f17704031a6b93f9827bb15b05c SHA1 bf47e608e7a5a525c99c1adc0f2a8d1ec9da3e3f SHA256 899652596c8ff5ef0894484ad6e2d0e51adbb3aef71bc5ba8c9e6d014b7d5952
 MISC metadata.xml 827 RMD160 1ba768cca66466c3720aec02be56a260ead11caa SHA1 35969ed0b01a97ad9c1bb9858433ecfeecc815fd SHA256 483ac629370bf9b36aa6453c466102c3b580bc95d99ee3dbc5926025338f3d3c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOUJ0aAAoJEEqz6FtPBkyjuPIH/ju7yYV/eqZcM1u2A79OhlOK
-XKfrJnSfzOB8AcNZLfMVKW9te1BMftS1IzhGfxr80uwc8xSBFUr/ETWWAgagGgwl
-dhITuJTOp4DZqls1LBb3QXhij8F/aHHFREcRhakjI1Q4Ban3C+YV+3qhEeOhV3WR
-eSyLubQ+DurpNAuAt9+xjQ90OlwBOZhDMCrDU74ZQOgcV3pbX0rEBwjNwcCB5stN
-YVTThLcW5dhZB4xEQY5zx6BmEHB8zmL6G3HWCgKWIbANIgFw/RPxhNIVwApCdp9s
-ut/Q3WUWDCzUVRXWAPU0GriHkeO6L7GckycKI0g3fjM3Zh+T9LlEgRiJrR4imzU=
-=aC7s
+iQEcBAEBCgAGBQJOazUKAAoJEEqz6FtPBkyjd0QH/3rm733sMLnRYHmVxNkmcHss
+xY7pQWNqfFl6xhHuPKip1hVgzCbcXOWXbA8mUTJrGdfM7SLusrtVSD1trE/63dZ2
+KhTE2b9sM0jcpQ0U10dmzzFUHubxU/zXqH8A235z9QTEEd3AC5ZyjokWLd0+6Wqq
+28rqlfIItdKJhJ9BQddJUQEYauhfDUp8KRfbqC86q59RAeLPKrhm9UpR23JveIBv
+sbf49FrN3YVcu4W7+Lhyb3uDc1rmGHSldfW7XgR/yDAXPPbI/8IatuPWVNtyDEA3
+72L/1fOJ7cUH6C5NrBdNqDkoIl1A2m1GMpAD4ucqVqs8kS3Wi8yfafHyOdk0ESk=
+=VrFU
 -----END PGP SIGNATURE-----
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
+