Removed ssdeep and pyqtgraph bundles

INSTALL.md

@@ -17,7 +17,7 @@ $ make
 $ sudo make install
 ```
 
-Binwalk's core features will work out of the box without any additional dependencies. However, to take advantage of binwalk's graphing and extraction capabilities, multiple supporting utilities/packages need to be installed.
+Binwalk's core features will work out of the box without any additional dependencies. However, to take advantage of binwalk's more advanced capabilities, multiple supporting utilities/packages need to be installed.
 
 To ease "dependency hell", a shell script named `deps.sh` is included which attempts to install all required dependencies for Debian and RedHat based systems:
 
@@ -56,6 +56,7 @@ Binwalk relies on multiple external utilties in order to automatically extract/d
     p7zip-full
     openjdk-6-jdk
     firmware-mod-kit [https://code.google.com/p/firmware-mod-kit]
+    capstone [http://www.capstone-engine.org/]
 
 Bundled Software
 ================

configure.ac

@@ -29,14 +29,6 @@ AC_ARG_ENABLE([libmagic],
               [AS_HELP_STRING([--disable-libmagic], [do not build/install the bundled libmagic library])],,
               [BUILD_MAGIC=yes])
 
-AC_ARG_ENABLE([libfuzzy],
-              [AS_HELP_STRING([--disable-libfuzzy], [do not build/install the bundled libfuzzy library])],,
-              [BUILD_FUZZY=yes])
-
-AC_ARG_ENABLE([pyqtgraph],
-              [AS_HELP_STRING([--disable-pyqtgraph], [do not build/install the bundled pyqtgraph module])],,
-              [BUILD_PYQTGRAPH=yes])
-
 CFLAGS="-Wall -fPIC $CFLAGS"
 INSTALL_OPTIONS="-m644"
 
@@ -57,8 +49,6 @@ fi
 if test "$BUILD_BUNDLES" == "no"
 then
     BUILD_MAGIC=no
-    BUILD_FUZZY=no
-    BUILD_PYQTGRAPH=no
 fi
 
 if test "$BUILD_MAGIC" != "no"
@@ -68,23 +58,9 @@ then
     (cd ./src/bundles/file-*/ && ./configure) || exit 1
 fi
 
-if test "$BUILD_FUZZY" != "no"
-then
-    rm -rf $(ls ./src/bundles/ssdeep-*.tar.gz | sed -e 's/\.tar\.gz//')
-    (cd ./src/bundles && tar -zxvf ssdeep-*.tar.gz > /dev/null)
-    (cd ./src/bundles/ssdeep-*/ && ./configure) || exit 1
-fi
-
-if test "$BUILD_PYQTGRAPH" != "no"
-then
-    (cd ./src/bundles && tar -zxvf pyqtgraph-*.tar.gz > /dev/null)
-fi
-
 AC_SUBST(BUILD_C_LIBS, $BUILD_C_LIBS)
 AC_SUBST(BUILD_BUNDLES, $BUILD_BUNDLES)
 AC_SUBST(BUILD_MAGIC, $BUILD_MAGIC)
-AC_SUBST(BUILD_FUZZY, $BUILD_FUZZY)
-AC_SUBST(BUILD_PYQTGRAPH, $BUILD_PYQTGRAPH)
 AC_SUBST(PYTHON, $PYTHON)
 AC_SUBST(IDA_DIR, $IDA_DIR)
 AC_SUBST(SONAME, $SONAME)

src/bundles/Makefile

 LIB_DIR="../$(PYLIBDIR)"
 FILE_VERSION=`ls file-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2`
-#SSDEEP_VERSION=`ls ssdeep-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2`
-#PYQTGRAPH_VERSION=`ls pyqtgraph-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2,3`
 
 .PHONY: all clean_libs clean distclean
 
 all:
-#	if [ "$(BUILD_FUZZY)" = "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi
-#	if [ "$(BUILD_FUZZY)" = "yes" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.$(SOEXT) $(LIB_DIR); fi
 	if [ "$(BUILD_MAGIC)" = "yes" ]; then make -C file-$(FILE_VERSION)/src magic.h; fi # This must be done first for OSX, else MAGIC_VERSION is undefined
 	if [ "$(BUILD_MAGIC)" = "yes" ]; then make -C file-$(FILE_VERSION)/src libmagic.la; fi
 	if [ "$(BUILD_MAGIC)" = "yes" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.$(SOEXT) $(LIB_DIR); fi
-#	if [ "$(BUILD_PYQTGRAPH)" = "yes" ] && [ ! -e $(LIB_DIR)/pyqtgraph ]; then cp -R pyqtgraph-$(PYQTGRAPH_VERSION)/pyqtgraph $(LIB_DIR)/; fi
 
 clean_libs:
 	rm -f $(LIB_DIR)/libmagic.$(SOEXT)
-#	rm -f $(LIB_DIR)/libfuzzy.$(SOEXT)
-#	rm -rf $(LIB_DIR)/pyqtgraph
 
 clean: clean_libs
-#	if [ "$(BUILD_FUZZY)" = "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) clean; fi
 	if [ "$(BUILD_MAGIC)" = "yes" ]; then make -C file-$(FILE_VERSION) clean; fi
 
 distclean: clean_libs
-#	rm -rf ./ssdeep-$(SSDEEP_VERSION)
 	rm -rf ./file-$(FILE_VERSION)
-#	rm -rf ./pyqtgraph-$(PYQTGRAPH_VERSION)