[gentoo-commits] gentoo-x86 commit in app-misc/binwalk/files: binwalk-0.3.9-system-magic.patch

[gentoo-commits] gentoo-x86 commit in app-misc/binwalk/files: binwalk-0.3.9-system-magic.patch

[Tim Harder (radhermit)]

radhermit    11/09/10 09:59:20

  Added:                binwalk-0.3.9-system-magic.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha55/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-0.3.9-system-magic.patch?rev=1.1&content-type=text/plain

Index: binwalk-0.3.9-system-magic.patch
===================================================================
--- 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