From 092ec9718dae308a318f8cfaf68629ef18a14f53 Mon Sep 17 00:00:00 2001 From: pi Date: Wed, 14 Oct 2015 18:12:58 +0000 Subject: security/binwalk: 2.0.1 -> 2.0.2 (or so) - old version did not work - current github head does work (tested) - new from head sees itself as 2.1.0, but not yet released, so... PR: 203774 Requested by: emaste --- security/binwalk/Makefile | 6 ++--- security/binwalk/distinfo | 4 +-- security/binwalk/files/patch--Makefile.in | 30 ----------------------- security/binwalk/files/patch-src-C-Makefile | 29 ---------------------- security/binwalk/files/patch-src-bundles-Makefile | 27 -------------------- security/binwalk/pkg-descr | 2 +- 6 files changed, 5 insertions(+), 93 deletions(-) delete mode 100644 security/binwalk/files/patch--Makefile.in delete mode 100644 security/binwalk/files/patch-src-C-Makefile delete mode 100644 security/binwalk/files/patch-src-bundles-Makefile (limited to 'security') diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile index ac145fb74d82..a9076bd7f508 100644 --- a/security/binwalk/Makefile +++ b/security/binwalk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= binwalk -PORTVERSION= 2.0.1 +PORTVERSION= 2.0.2 DISTVERSIONPREFIX= v CATEGORIES= security python @@ -13,10 +13,8 @@ LICENSE= MIT USES= python USE_GITHUB= yes GH_ACCOUNT= devttys0 +GH_TAGNAME= 38218b USE_PYTHON= autoplist distutils -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip \ cabextract:${PORTSDIR}/archivers/cabextract diff --git a/security/binwalk/distinfo b/security/binwalk/distinfo index 37fe167e6bac..09fb1e20204e 100644 --- a/security/binwalk/distinfo +++ b/security/binwalk/distinfo @@ -1,2 +1,2 @@ -SHA256 (devttys0-binwalk-v2.0.1_GH0.tar.gz) = 90ee8426d71e91b62dfe4a1446c457bc7835b475b28717859e275a0494403959 -SIZE (devttys0-binwalk-v2.0.1_GH0.tar.gz) = 2234469 +SHA256 (devttys0-binwalk-v2.0.2-38218b_GH0.tar.gz) = 90613857bb05d68daf677c6ff1ce8999e82b895a1043aa7d680fad8c3c5949a6 +SIZE (devttys0-binwalk-v2.0.2-38218b_GH0.tar.gz) = 108263 diff --git a/security/binwalk/files/patch--Makefile.in b/security/binwalk/files/patch--Makefile.in deleted file mode 100644 index 390093c49784..000000000000 --- a/security/binwalk/files/patch--Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- 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: diff --git a/security/binwalk/files/patch-src-C-Makefile b/security/binwalk/files/patch-src-C-Makefile deleted file mode 100644 index 424adf06993c..000000000000 --- a/security/binwalk/files/patch-src-C-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 - diff --git a/security/binwalk/files/patch-src-bundles-Makefile b/security/binwalk/files/patch-src-bundles-Makefile deleted file mode 100644 index 1d7b0e49b445..000000000000 --- a/security/binwalk/files/patch-src-bundles-Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- 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) diff --git a/security/binwalk/pkg-descr b/security/binwalk/pkg-descr index 31614e9c5663..7fce88fdabf5 100644 --- a/security/binwalk/pkg-descr +++ b/security/binwalk/pkg-descr @@ -10,4 +10,4 @@ images such as compressed/archived files, firmware headers, Linux kernels, bootloaders, filesystems, etc. More details are available at: -WWW: https://github.com/devttys0/binwalk +WWW: http://www.binwalk.org -- cgit