update to binwalk-2.1.1

This commit is contained in:
jasper 2017-08-23 11:29:37 +00:00
parent ea8c575bb1
commit e2e5f04730
7 changed files with 123 additions and 166 deletions

View File

@ -1,35 +1,30 @@
# $OpenBSD: Makefile,v 1.6 2017/07/05 10:22:06 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2017/08/23 11:29:37 jasper Exp $
COMMENT= tool for reverse-engineering and analysing firmware blobs
COMMENT = tool for reverse-engineering and analysing firmware blobs
MODPY_EGG_VERSION = 1.2.2_1
REVISION= 3
DISTNAME= binwalk-1.2.2-1
PKGNAME= binwalk-1.2.2.1
MODPY_EGG_VERSION = 2.1.1
GH_ACCOUNT = devttys0
GH_PROJECT = binwalk
GH_TAGNAME = v${MODPY_EGG_VERSION}
CATEGORIES= sysutils
CATEGORIES = sysutils
HOMEPAGE= http://binwalk.org/
HOMEPAGE = https://github.com/devttys0/binwalk
# MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES= http://binwalk.googlecode.com/files/
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODULES= lang/python
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/py-libmagic \
graphics/py-matplotlib
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/py-libmagic${MODPY_FLAVOR}
NO_TEST= Yes
WRKSRC= ${WRKDIST}/src
pre-configure:
rm ${WRKSRC}/magic/*.orig # don't include pre-patched files in the generated amalgamation
NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/binwalk
${INSTALL_DATA} ${WRKDIST}/docs/* ${PREFIX}/share/doc/binwalk/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/binwalk
${INSTALL_DATA} ${WRKDIST}/src/scripts/examples/* \
${PREFIX}/share/examples/binwalk/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (binwalk-1.2.2-1.tar.gz) = MpcbwPAuJt6/3ryFFLN9gJxaMeQ+efo8udiNz1Jt+1c=
SIZE (binwalk-1.2.2-1.tar.gz) = 100036
SHA256 (binwalk-2.1.1.tar.gz) = G3ClsDSJ0p9g/vGACKIWSXQjSHT6q0ik9H7FPUYdKEo=
SIZE (binwalk-2.1.1.tar.gz) = 263977

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_magic_executables,v 1.1 2014/08/20 00:29:15 sthen Exp $
--- src/magic/executables.orig Wed Aug 20 01:23:12 2014
+++ src/magic/executables Wed Aug 20 01:23:27 2014
@@ -367,7 +367,7 @@
0 string bFLT BFLT executable
>4 belong <1 invalid
>4 belong >4 invalid
->4 belong x version %ld,
+>4 belong x version %d,
>4 belong 4
>8 belong x code offset: 0x%.8X,
>12 belong x data segment starts at: 0x%.8X,

View File

@ -1,50 +0,0 @@
$OpenBSD: patch-src_magic_filesystems,v 1.1 2014/08/20 00:29:15 sthen Exp $
--- src/magic/filesystems.orig Fri Oct 25 09:02:44 2013
+++ src/magic/filesystems Wed Aug 20 01:28:36 2014
@@ -61,34 +61,34 @@
0 lelong 0x28cd3d45 CramFS filesystem, little endian
>4 lelong <0 invalid
>4 lelong >1073741824 invalid
->4 lelong x size %lu
+>4 lelong x size %u
>8 lelong &1 version #2
>8 lelong &2 sorted_dirs
>8 lelong &4 hole_support
>32 lelong x CRC 0x%x,
->36 lelong x edition %lu,
+>36 lelong x edition %u,
>40 lelong <0 invalid
->40 lelong x %lu blocks,
+>40 lelong x %u blocks,
>44 lelong <0 invalid
->44 lelong x %lu files
->4 lelong x {jump-to-offset:%lu}
->4 lelong x {file-size:%lu}
+>44 lelong x %u files
+>4 lelong x {jump-to-offset:%u}
+>4 lelong x {file-size:%u}
0 belong 0x28cd3d45 CramFS filesystem, big endian
>4 belong <0 invalid
>4 lelong >536870912000 invalid
->4 belong x size %lu
+>4 belong x size %u
>8 belong &1 version #2
>8 belong &2 sorted_dirs
>8 belong &4 hole_support
>32 belong x CRC 0x%x,
->36 belong x edition %lu,
+>36 belong x edition %u,
>40 belong <0 invalid
->40 belong x %lu blocks,
+>40 belong x %u blocks,
>44 belong <0 invalid
->44 belong x %lu files
->4 belong x {jump-to-offset:%lu}
->4 belong x {file-size:%lu}
+>44 belong x %u files
+>4 belong x {jump-to-offset:%u}
+>4 belong x {file-size:%u}

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_magic_images,v 1.1 2014/08/20 00:29:15 sthen Exp $
--- src/magic/images.orig Wed Aug 20 01:24:13 2014
+++ src/magic/images Wed Aug 20 01:24:24 2014
@@ -11,8 +11,8 @@
# 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ...
#
0 string \x89PNG\x0d\x0a\x1a\x0a PNG image
->16 belong x \b, %ld x
->20 belong x %ld,
+>16 belong x \b, %d x
+>20 belong x %d,
>24 byte x %d-bit
>25 byte 0 grayscale,
>25 byte 2 \b/color RGB,
@@ -27,8 +27,8 @@
0 string GIF8 GIF image data
>4 string 7a \b, version "8%s",
>4 string 9a \b, version "8%s",
->6 leshort >0 %hd x
->8 leshort >0 %hd
+>6 leshort >0 %d x
+>8 leshort >0 %d
#>10 byte &0x80 color mapped,
#>10 byte&0x07 =0x00 2 colors
#>10 byte&0x07 =0x01 4 colors

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_setup_py,v 1.1.1.1 2013/10/27 09:58:41 sthen Exp $
--- src/setup.py.orig Wed Oct 23 22:11:30 2013
+++ src/setup.py Sat Oct 26 23:52:50 2013
@@ -36,10 +36,6 @@ if "--no-prereq-checks" not in sys.argv:
print "Pre-requisite check warning:", str(e)
print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module."
print "*" * WIDTH, "\n"
-
- if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'):
- print 'Quitting...\n'
- sys.exit(1)
else:
# This is super hacky.
sys.argv.pop(sys.argv.index("--no-prereq-checks"))

View File

@ -1,54 +1,117 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/10/27 09:58:41 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2017/08/23 11:29:37 jasper Exp $
bin/binwalk
lib/python${MODPY_VERSION}/site-packages/binwalk/
lib/python${MODPY_VERSION}/site-packages/binwalk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/binwalk/__init__.py
lib/python${MODPY_VERSION}/site-packages/binwalk/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/common.py
lib/python${MODPY_VERSION}/site-packages/binwalk/common.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/compression.py
lib/python${MODPY_VERSION}/site-packages/binwalk/compression.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/binwalk/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/config/
lib/python${MODPY_VERSION}/site-packages/binwalk/config.py
lib/python${MODPY_VERSION}/site-packages/binwalk/config.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/config/extract.conf
lib/python${MODPY_VERSION}/site-packages/binwalk/entropy.py
lib/python${MODPY_VERSION}/site-packages/binwalk/entropy.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/extractor.py
lib/python${MODPY_VERSION}/site-packages/binwalk/extractor.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/filter.py
lib/python${MODPY_VERSION}/site-packages/binwalk/filter.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/hexdiff.py
lib/python${MODPY_VERSION}/site-packages/binwalk/hexdiff.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/
lib/python${MODPY_VERSION}/site-packages/binwalk/core/C.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/__init__.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}C.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}idb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}magic.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}module.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/${MODPY_PYCACHE}statuserver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/core/common.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/compat.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/display.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/idb.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/magic.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/module.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/plugin.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/settings.py
lib/python${MODPY_VERSION}/site-packages/binwalk/core/statuserver.py
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/archives
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/binarch
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/bincast
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/binwalk
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/zlib
lib/python${MODPY_VERSION}/site-packages/binwalk/maths.py
lib/python${MODPY_VERSION}/site-packages/binwalk/maths.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/parser.py
lib/python${MODPY_VERSION}/site-packages/binwalk/parser.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/bootloaders
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/code
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/compressed
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/console
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/crypto
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/ecos
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/encoding
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/executables
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/filesystems
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/firmware
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/hashing
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/images
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/linux
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/lzma
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/misc
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/network
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/sql
lib/python${MODPY_VERSION}/site-packages/binwalk/magic/vxworks
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/__init__.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}binvis.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}disasm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}extractor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}general.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}hashmatch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}heuristics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}hexdiff.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/binvis.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/compression.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/disasm.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/entropy.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/extractor.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/general.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/hashmatch.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/heuristics.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/hexdiff.py
lib/python${MODPY_VERSION}/site-packages/binwalk/modules/signature.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/armopcodes.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/armopcodes.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}arcadyan.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}compressd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}cpio.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}gzipextract.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}gzipvalid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}jffs2valid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}lzmaextract.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}lzmamod.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}lzmavalid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}tar.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}ubivalid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}unjffs2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}ziphelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}zlibextract.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/${MODPY_PYCACHE}zlibvalid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/arcadyan.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/compressd.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/cpio.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/cpio.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/strcompat.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/strcompat.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/zlib.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/zlib.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/prettyprint.py
lib/python${MODPY_VERSION}/site-packages/binwalk/prettyprint.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/smartsignature.py
lib/python${MODPY_VERSION}/site-packages/binwalk/smartsignature.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/smartstrings.py
lib/python${MODPY_VERSION}/site-packages/binwalk/smartstrings.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/update.py
lib/python${MODPY_VERSION}/site-packages/binwalk/update.pyc
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/gzipextract.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/gzipvalid.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/jffs2valid.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/lzmaextract.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/lzmamod.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/lzmavalid.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/tar.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/ubivalid.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/unjffs2.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/ziphelper.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/zlibextract.py
lib/python${MODPY_VERSION}/site-packages/binwalk/plugins/zlibvalid.py
share/doc/binwalk/
share/doc/binwalk/API
share/doc/binwalk/LICENSE
share/doc/binwalk/README
share/examples/binwalk/
share/examples/binwalk/binwalk_simple.py
share/examples/binwalk/extract_data.py
share/examples/binwalk/signature_scan.py