svn commit: r376121 - in head/security/binwalk: . files

Kurt Jaeger pi at FreeBSD.org
Sat Jan 3 15:13:45 UTC 2015 

Author: pi
Date: Sat Jan  3 15:13:42 2015
New Revision: 376121
URL: https://svnweb.freebsd.org/changeset/ports/376121
QAT: https://qat.redports.org/buildarchive/r376121/

Log:
  security/binwalk: 0.5.0 -> 2.0.1
  
  Complete overhaul:
  - python instead of C
  - new MASTER_SITE
  - support for some external tools is still open

Added:
  head/security/binwalk/files/patch--Makefile.in   (contents, props changed)
  head/security/binwalk/files/patch-src-C-Makefile   (contents, props changed)
  head/security/binwalk/files/patch-src-bundles-Makefile   (contents, props changed)
Deleted:
  head/security/binwalk/files/patch-Makefile.in
  head/security/binwalk/files/patch-binwalk.c
  head/security/binwalk/files/patch-common.c
Modified:
  head/security/binwalk/Makefile
  head/security/binwalk/distinfo
  head/security/binwalk/pkg-descr

Modified: head/security/binwalk/Makefile
==============================================================================
--- head/security/binwalk/Makefile	Sat Jan  3 15:06:17 2015	(r376120)
+++ head/security/binwalk/Makefile	Sat Jan  3 15:13:42 2015	(r376121)
@@ -1,40 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	binwalk
-PORTVERSION=	0.5.0
-PORTREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	GOOGLE_CODE
+PORTVERSION=	2.0.1
+CATEGORIES=	security python
+MASTER_SITES=	http://github.com/devttys0/${PORTNAME}/archive/v${PORTVERSION}.tar.gz?dummy=/
 
 MAINTAINER=	pi at FreeBSD.org
 COMMENT=	Search binary images for embedded files and executable code
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-
-PLIST_FILES=	bin/binwalk \
-		etc/binwalk/extract.conf \
-		etc/binwalk/magic.binarch \
-		etc/binwalk/magic.bincast \
-		etc/binwalk/magic.binwalk
-
-PORTDOCS=	README
-
+USES=		python gmake
+USE_PYTHON=	autoplist distutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/docs/README \
-		${STAGEDIR}${DOCSDIR}
+BUILD_DEPENDS=	liblzma>=0:${PORTSDIR}/archivers/py-liblzma
+RUN_DEPENDS=	/usr/local/bin/7z:${PORTSDIR}/archivers/p7zip \
+		/usr/local/bin/cabextract:${PORTSDIR}/archivers/cabextract
 
 .include <bsd.port.mk>

Modified: head/security/binwalk/distinfo
==============================================================================
--- head/security/binwalk/distinfo	Sat Jan  3 15:06:17 2015	(r376120)
+++ head/security/binwalk/distinfo	Sat Jan  3 15:13:42 2015	(r376121)
@@ -1,2 +1,2 @@
-SHA256 (binwalk-0.5.0.tar.gz) = 37c4dd80929be8c84c5fafc0f63d5520c1b32623d7ee1e562e45b0aac1838f99
-SIZE (binwalk-0.5.0.tar.gz) = 120293
+SHA256 (binwalk-2.0.1.tar.gz) = 90ee8426d71e91b62dfe4a1446c457bc7835b475b28717859e275a0494403959
+SIZE (binwalk-2.0.1.tar.gz) = 2234469

Added: head/security/binwalk/files/patch--Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/binwalk/files/patch--Makefile.in	Sat Jan  3 15:13:42 2015	(r376121)
@@ -0,0 +1,30 @@
+--- Makefile.in.orig	2015-01-03 15:15:01.000000000 +0100
++++ Makefile.in	2015-01-03 15:15:18.000000000 +0100
+@@ -33,21 +33,21 @@
+ 	$(PYTHON) ./setup.py install $(PREFIX)
+ 
+ build:
+-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi
+-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi
++	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then gmake -C $(SRC_C_DIR); fi
++	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then gmake -C $(SRC_BUNDLES_DIR); fi
+ 	$(PYTHON) ./setup.py build
+ 
+ deps:
+ 	./deps.sh
+ 
+ clean:
+-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi
+-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi
++	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then gmake -C $(SRC_C_DIR) clean; fi
++	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then gmake -C $(SRC_BUNDLES_DIR) clean; fi
+ 	$(PYTHON) ./setup.py clean
+ 
+ distclean: clean
+-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi
+-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi
++	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then gmake -C $(SRC_C_DIR) distclean; fi
++	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then gmake -C $(SRC_BUNDLES_DIR) distclean; fi
+ 	rm -rf Makefile config.* *.cache
+ 
+ uninstall:

Added: head/security/binwalk/files/patch-src-C-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/binwalk/files/patch-src-C-Makefile	Sat Jan  3 15:13:42 2015	(r376121)
@@ -0,0 +1,29 @@
+--- src/C/Makefile.orig	2015-01-03 15:16:53.000000000 +0100
++++ src/C/Makefile	2015-01-03 15:17:04.000000000 +0100
+@@ -3,9 +3,9 @@
+ .PHONY: all clean_libs clean distclean
+ 
+ all:
+-	make -C miniz
++	gmake -C miniz
+ 	cp miniz/*.$(SOEXT) $(LIB_DIR)
+-	make -C compress
++	gmake -C compress
+ 	cp compress/*.$(SOEXT) $(LIB_DIR)
+ 
+ clean_libs:
+@@ -13,10 +13,10 @@
+ 	rm -f $(LIB_DIR)/libcompress42.$(SOEXT)
+ 
+ clean: clean_libs
+-	make -C miniz clean
+-	make -C compress clean
++	gmake -C miniz clean
++	gmake -C compress clean
+ 
+ distclean: clean_libs
+-	make -C miniz distclean
+-	make -C compress distclean
++	gmake -C miniz distclean
++	gmake -C compress distclean
+ 

Added: head/security/binwalk/files/patch-src-bundles-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/binwalk/files/patch-src-bundles-Makefile	Sat Jan  3 15:13:42 2015	(r376121)
@@ -0,0 +1,27 @@
+--- src/bundles/Makefile.orig	2015-01-03 15:18:52.000000000 +0100
++++ src/bundles/Makefile	2015-01-03 15:19:10.000000000 +0100
+@@ -6,10 +6,10 @@
+ .PHONY: all clean_libs clean distclean
+ 
+ all:
+-	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi
++	if [ "$(BUILD_FUZZY)" -eq "1" ]; then gmake -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi
+ 	if [ "$(BUILD_FUZZY)" -eq "1" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.$(SOEXT) $(LIB_DIR); fi
+-	if [ "$(BUILD_MAGIC)" -eq "1" ]; 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)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src libmagic.la; fi
++	if [ "$(BUILD_MAGIC)" -eq "1" ]; then gmake -C file-$(FILE_VERSION)/src magic.h; fi # This must be done first for OSX, else MAGIC_VERSION is undefined
++	if [ "$(BUILD_MAGIC)" -eq "1" ]; then gmake -C file-$(FILE_VERSION)/src libmagic.la; fi
+ 	if [ "$(BUILD_MAGIC)" -eq "1" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.$(SOEXT) $(LIB_DIR); fi
+ 	if [ "$(BUILD_PYQTGRAPH)" -eq "1" ]; then cp -R pyqtgraph-$(PYQTGRAPH_VERSION)/pyqtgraph $(LIB_DIR)/; fi
+ 
+@@ -19,8 +19,8 @@
+ 	rm -rf $(LIB_DIR)/pyqtgraph
+ 
+ clean: clean_libs
+-	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) clean; fi
+-	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION) clean; fi
++	if [ "$(BUILD_FUZZY)" -eq "1" ]; then gmake -C ssdeep-$(SSDEEP_VERSION) clean; fi
++	if [ "$(BUILD_MAGIC)" -eq "1" ]; then gmake -C file-$(FILE_VERSION) clean; fi
+ 
+ distclean: clean_libs
+ 	rm -rf ./ssdeep-$(SSDEEP_VERSION)

Modified: head/security/binwalk/pkg-descr
==============================================================================
--- head/security/binwalk/pkg-descr	Sat Jan  3 15:06:17 2015	(r376120)
+++ head/security/binwalk/pkg-descr	Sat Jan  3 15:13:42 2015	(r376121)
@@ -10,4 +10,4 @@ images such as compressed/archived files
 kernels, bootloaders, filesystems, etc.
 More details are available at:
 
-WWW: http://code.google.com/p/binwalk/
+WWW: https://github.com/devttys0/binwalk

More information about the svn-ports-all mailing list