Merge branch 'master' of https://github.com/devttys0/binwalk

deps.sh

@@ -34,15 +34,15 @@ APTGETCMD="apt-get"
 YUMCMD="yum"
 if [ $distro = "Kali" ]
 then
-    APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract util-linux firmware-mod-kit cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop"
+    APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract util-linux firmware-mod-kit cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop cpio"
 else
-    APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract cramfsprogs cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop srecord"
+    APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract cramfsprogs cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop srecord cpio"
 fi
 PYTHON2_APT_CANDIDATES="python-crypto python-lzo python-lzma python-pip python-tk"
 PYTHON3_APT_CANDIDATES="python3-crypto python3-pip python3-tk"
 PYTHON3_YUM_CANDIDATES=""
 YUM_CANDIDATES="git gcc gcc-c++ make openssl-devel qtwebkit-devel qt-devel gzip bzip2 tar arj p7zip p7zip-plugins cabextract squashfs-tools zlib zlib-devel lzo lzo-devel xz xz-compat-libs xz-libs xz-devel xz-lzma-compat python-backports-lzma lzip pyliblzma perl-Compress-Raw-Lzma lzop srecord"
-PYTHON2_YUM_CANDIDATES="python-pip python-Bottleneck"
+PYTHON2_YUM_CANDIDATES="python-pip python-Bottleneck cpio"
 APT_CANDIDATES="$APT_CANDIDATES $PYTHON2_APT_CANDIDATES"
 YUM_CANDIDATES="$YUM_CANDIDATES $PYTHON2_YUM_CANDIDATES"
 PIP_COMMANDS="pip"

setup.py

@@ -24,8 +24,8 @@ except ImportError:
 # include the git commit hash as part of the version number reported
 # by binwalk.
 try:
-    label = subprocess.check_output(["git", "describe"], stderr=DEVNULL).decode('utf-8')
-    MODULE_VERSION = "%s-%s" % (MODULE_VERSION, label.split('-')[-1].strip())
+    label = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], stderr=DEVNULL).decode('utf-8')
+    MODULE_VERSION = "%s-%s" % (MODULE_VERSION, label.strip())
 except KeyboardInterrupt as e:
     raise e
 except Exception:

src/binwalk/modules/entropy.py

@@ -27,7 +27,7 @@ class Entropy(Module):
     DEFAULT_TRIGGER_HIGH = .95
     DEFAULT_TRIGGER_LOW = .85
 
-    TITLE = "Entropy Analysis"
+    TITLE = ""
     ORDER = 8
 
     # TODO: Add --dpoints option to set the number of data points?
@@ -270,7 +270,7 @@ class Entropy(Module):
         except AttributeError:
             ax = fig.add_subplot(1, 1, 1, autoscale_on=True, axisbg='black')
 
-        ax.set_title(fname)
+        ax.set_title(self.TITLE)
         ax.set_xlabel(self.XLABEL)
         ax.set_ylabel(self.YLABEL)
         ax.plot(x, y, 'y', lw=2)
@@ -278,6 +278,7 @@ class Entropy(Module):
         # Add a fake, invisible plot entry so that offsets at/near the
         # minimum x value (0) are actually visible on the plot.
         ax.plot(-(max(x)*.001), 1.1, lw=0)
+        ax.plot(-(max(x)*.001), 0, lw=0)
 
         if self.show_legend and has_key(self.file_markers, fname):
             for (offset, description) in self.file_markers[fname]: