Updated install scripts.

deps.sh

 #!/bin/bash
 # Easy installer script for Debian/RedHat systems.
+# TODO: PyOpenGL not installed for Python3.
 
 SUDO=$(which sudo)
 SUMOUNT="$1 $2"
@@ -7,10 +8,24 @@ SUMOUNT="$1 $2"
 function fmk
 {
 	# Get and build the firmware mod kit
-	$SUDO rm -rf /opt/firmware-mod-kit/
-	$SUDO mkdir -p /opt/firmware-mod-kit
-	$SUDO chmod a+rwx /opt/firmware-mod-kit
-	git clone https://code.google.com/p/firmware-mod-kit /opt/firmware-mod-kit/
+	if [ -e /opt/firmware-mod-kit ]
+	then
+		if [ ! -e /opt/firmware-mod-kit/.git ]
+		then
+			$SUDO rm -rf /opt/firmware-mod-kit/
+		fi
+	fi
+
+	if [ ! -e /opt/firmware-mod-kit ]
+	then
+		$SUDO mkdir -p /opt/firmware-mod-kit
+		$SUDO chmod a+rwx /opt/firmware-mod-kit
+	fi
+
+	if [ ! -e /opt/firmware-mod-kit/.git ]
+	then
+		git clone https://code.google.com/p/firmware-mod-kit /opt/firmware-mod-kit/
+	fi
 
 	cd /opt/firmware-mod-kit/src
 	./configure && $SUDO make
@@ -35,28 +50,6 @@ function fmk
 	cd -
 }
 
-#function libmagic
-#{
-#	SITE="ftp://ftp.astron.com/pub/file/"
-#	VERSION="5.11"
-#	OUTFILE="file-$VERSION.tar.gz"
-#	URL="$SITE$OUTFILE"
-#
-#	echo "Downloading '$URL'..."
-#	wget "$URL"
-#
-#	if [ -e "$OUTFILE" ]
-#	then
-#		echo "Installing libmagic / python-magic..."
-#		tar -zxvf "$OUTFILE"
-#		cd "file-$VERSION" && ./configure && make && $SUDO make install && cd python && $SUDO python ./setup.py install && cd ../..
-#		$SUDO rm -rf "file-$VERSION" "$OUTFILE"
-#	else
-#		echo "ERROR: Failed to download '$URL'!"
-#		echo "libmagic not installed."
-#	fi
-#}
-
 function pyqtgraph
 {
 	SITE="http://www.pyqtgraph.org/downloads/"
@@ -64,6 +57,8 @@ function pyqtgraph
 	OUTFILE="pyqtgraph-$VERSION.tar.gz"
 	URL="$SITE$OUTFILE"
 
+	pyopengl
+	
 	echo "Downloading '$URL'..."
 	wget "$URL"
 
@@ -72,6 +67,10 @@ function pyqtgraph
 		echo "Installing pyqtgraph..."
 		tar -zxvf "$OUTFILE"
 		cd "pyqtgraph-$VERSION" && $SUDO python ./setup.py install && cd ..
+		if [ "$(which python3)" != "" ]
+		then
+			cd "pyqtgraph-$VERSION" && $SUDO python3 ./setup.py install && cd ..
+		fi
 		$SUDO rm -rf "pyqtgraph-$VERSION" "$OUTFILE"
 	else
 		echo "ERROR: Failed to download '$URL'!"
@@ -90,35 +89,27 @@ function debian
 	fi
 
 	# Install binwalk/fmk pre-requisites and extraction tools
-	$SUDO apt-get -y install git build-essential mtd-utils zlib1g-dev liblzma-dev ncompress gzip bzip2 tar arj p7zip p7zip-full openjdk-6-jdk
-	$SUDO apt-get -y install python-opengl python-qt4 python-qt4-gl python-numpy python-scipy
+	$SUDO apt-get -y install git build-essential mtd-utils zlib1g-dev liblzma-dev ncompress gzip bzip2 tar arj p7zip p7zip-full openjdk-6-jdk libfuzzy2
+	$SUDO apt-get -y install libqt4-opengl python-opengl python-qt4 python-qt4-gl python-numpy python-scipy
 	if [ "$(which python3)" != "" ]
 	then
 		$SUDO apt-get -y install python3-pyqt4 python3-numpy python3-scipy
-		$SUDO apt-get -y install python3-pip
-		PIP="$(which pip-3* | head -1)"
-		if [ "$PIP" != "" ]
-		then
-			$SUDO $PIP install PyOpenGl
-		fi
 	fi
+
+	pyqtgraph
 }
 
 function redhat
 {
 	$SUDO yum groupinstall -y "Development Tools"
-	$SUDO yum install -y git mtd-utils unrar zlib1g-dev liblzma-dev xz-devel compress gzip bzip2 tar arj p7zip p7zip-full openjdk-6-jdk
-	$SUDO yum install -y python-opengl python-qt4 python-qt4-gl python-numpy python-scipy
+	$SUDO yum install -y git mtd-utils unrar zlib1g-dev liblzma-dev xz-devel compress gzip bzip2 tar arj p7zip p7zip-full openjdk-6-jdk libfuzzy2
+	$SUDO yum install -y libqt4-opengl python-opengl python-qt4 python-qt4-gl python-numpy python-scipy
 	if [ "$(which python3)" != "" ]
 	then
 		$SUDO yum -y install python3-pyqt4 python3-numpy python3-scipy
-		$SUDO yum -y install python3-pip
-		PIP="$(which pip-3* | head -1)"
-		if [ "$PIP" != "" ]
-		then
-			$SUDO $PIP install PyOpenGl
-		fi
 	fi
+	
+	pyqtgraph
 }
 
 if [ "$1" == "" ] || [ "$1" == "--sumount" ]
@@ -176,18 +167,6 @@ case $DISTRO in
 		exit 1
 esac
 
-#if [ "$(python -c 'import magic; print (magic.MAGIC_NO_CHECK_TEXT)' 2>/dev/null)" == "" ]
-#then
-#	echo "python-magic not installed, or wrong version; building from source..."
-#	libmagic
-#fi
-
 # Get and build the firmware mod kit
 fmk
 
-if [ "$(python -c 'import pyqtgraph; print (pyqtgraph.__file__)' 2>/dev/null)" == "" ]
-then
-	echo "pyqtgraph not installed; building from source..."
-	pyqtgraph
-fi
-

setup.py

@@ -124,8 +124,8 @@ if "install" in sys.argv:
 		import pyqtgraph
 		from pyqtgraph.Qt import QtCore, QtGui, QtOpenGL
 	except ImportError as e:
-		msg = ["Pre-requisite check warning: " + str(e),
-			   "To take advantage of this %s's graphing capabilities, please install this module." % MODULE_NAME,
+		msg = ["Pre-requisite warning: " + str(e),
+			   "To take advantage of %s's graphing capabilities, please install this module." % MODULE_NAME,
 		]
 	
 		warning(msg, prompt=True)

src/binwalk/magic/binwalk

@@ -2131,6 +2131,14 @@
 0       string	Cobalt\ Networks\ Inc.\nFirmware\ v	Paged Sun/COBALT boot rom,
 >38     string	x        				version: "%.4s"
 
+# Simple eCos string signatures
+0		string	ecos					eCos RTOS string reference:
+>0		string	x						"%s"
+0		string	eCos					eCos RTOS string reference:
+>0		string	x						"%s"
+0		string	ECOS					eCos RTOS string reference:
+>0		string	x						"%s"
+
 # Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com)
 # The second word of TIFF files is the TIFF version number, 42, which has
 # never changed.  The TIFF specification recommends testing for it.
@@ -2387,11 +2395,26 @@
 >>14	string		x			"%s
 >>45	string		x			\b%s"
 
+# eCos kernel exception handlers
+#
+# mfc0    $k0, Cause       # Cause of last exception
+# nop
+# andi    $k0, 0x7F
+# li      $k1, 0xXXXXXXXX
+# add     $k1, $k0
+# lw      $k1, 0($k1)
+# jr      $k1
+# nop
 0	string	\x00\x68\x1A\x40\x00\x00\x00\x00\x7F\x00\x5A\x33	eCos kernel exception handler, architecture: MIPSEL,
 >14	leshort	!0x3C1B												invalid
 >18	leshort	!0x277B												invalid
 >12	leshort	x													exception vector table base address: 0x%.4X
 >16	leshort	x													\b%.4X
+0	string	\x40\x1A\x68\x00\x00\x00\x00\x00\x33\x5A\x00\x7F	eCos kernel exception handler, architecture: MIPS,
+>12	beshort	!0x3C1B												invalid
+>16	beshort	!0x277B												invalid
+>14	beshort	x													exception vector table base address: 0x%.4X
+>18	beshort	x													\b%.4X
 
 # ------------------------------------------------------------------
 # Signature for LZMA compressed data with valid properties byte 0x40

src/magic/firmware

@@ -455,3 +455,11 @@
 0       string	Cobalt\ Networks\ Inc.\nFirmware\ v	Paged Sun/COBALT boot rom,
 >38     string	x        				version: "%.4s"
 
+# Simple eCos string signatures
+0		string	ecos					eCos RTOS string reference:
+>0		string	x						"%s"
+0		string	eCos					eCos RTOS string reference:
+>0		string	x						"%s"
+0		string	ECOS					eCos RTOS string reference:
+>0		string	x						"%s"
+

src/magic/kernels

@@ -16,8 +16,23 @@
 >>14	string		x			"%s
 >>45	string		x			\b%s"
 
+# eCos kernel exception handlers
+#
+# mfc0    $k0, Cause       # Cause of last exception
+# nop
+# andi    $k0, 0x7F
+# li      $k1, 0xXXXXXXXX
+# add     $k1, $k0
+# lw      $k1, 0($k1)
+# jr      $k1
+# nop
 0	string	\x00\x68\x1A\x40\x00\x00\x00\x00\x7F\x00\x5A\x33	eCos kernel exception handler, architecture: MIPSEL,
 >14	leshort	!0x3C1B												invalid
 >18	leshort	!0x277B												invalid
 >12	leshort	x													exception vector table base address: 0x%.4X
 >16	leshort	x													\b%.4X
+0	string	\x40\x1A\x68\x00\x00\x00\x00\x00\x33\x5A\x00\x7F	eCos kernel exception handler, architecture: MIPS,
+>12	beshort	!0x3C1B												invalid
+>16	beshort	!0x277B												invalid
+>14	beshort	x													exception vector table base address: 0x%.4X
+>18	beshort	x													\b%.4X