aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorjhale <jhale@FreeBSD.org>2012-10-08 04:43:21 +0800
committerjhale <jhale@FreeBSD.org>2012-10-08 04:43:21 +0800
commit9f683fcee317f50a4aefc469cebf82231f816d06 (patch)
tree6546f1bdbb6013191d759ca8df4a525b233a3196 /security
parentc10a13bce8eb0d0537cdcf75d4e7e544439b5429 (diff)
downloadfreebsd-ports-gnome-9f683fcee317f50a4aefc469cebf82231f816d06.tar.gz
freebsd-ports-gnome-9f683fcee317f50a4aefc469cebf82231f816d06.tar.zst
freebsd-ports-gnome-9f683fcee317f50a4aefc469cebf82231f816d06.zip
- Update to 0.4.5 [1]
- Drop specific ABI version numbers from LIB_DEPENDS [2] - Trim Makefile header [2] - Convert to new options framework [2] - Fix build on 7.x [2] PR: ports/172395 Submitted by: Kurt Jaeger <fbsd-ports@opsec.eu> (maintainer) [1] Approved by: makc (mentor), maintainer [2]
Diffstat (limited to 'security')
-rw-r--r--security/binwalk/Makefile15
-rw-r--r--security/binwalk/distinfo4
-rw-r--r--security/binwalk/files/patch-binwalk.c15
3 files changed, 23 insertions, 11 deletions
diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile
index 196b973a85ee..430c6bbcb67b 100644
--- a/security/binwalk/Makefile
+++ b/security/binwalk/Makefile
@@ -1,11 +1,7 @@
-# New ports collection makefile for: binwalk
-# Date created: 6 February 2012
-# Whom: Kurt Jaeger <fbsd-ports@opsec.eu>
-#
# $FreeBSD$
PORTNAME= binwalk
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.5
CATEGORIES= security
MASTER_SITES= GOOGLE_CODE
@@ -14,25 +10,26 @@ COMMENT= Search binary images for embedded files and executable code
LICENSE= MIT
-LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
PLIST_FILES= bin/binwalk \
etc/binwalk/magic.binarch \
etc/binwalk/magic.bincast \
etc/binwalk/magic.binwalk \
- etc/binwalk/magic.o
PLIST_DIRS= etc/binwalk
PORTDOCS= README
GNU_CONFIGURE= yes
-CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+.include <bsd.port.options.mk>
+
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/docs/README ${DOCSDIR}
.endif
diff --git a/security/binwalk/distinfo b/security/binwalk/distinfo
index 045a30716a5b..72dc3b6a6c78 100644
--- a/security/binwalk/distinfo
+++ b/security/binwalk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binwalk-0.4.3.tar.gz) = 2eceb316bfb65d43c3422caf5cdd3752ec5d79b1fed57253f47e8513cd9dcaac
-SIZE (binwalk-0.4.3.tar.gz) = 701052
+SHA256 (binwalk-0.4.5.tar.gz) = 0797173ef20f581e7573976c70e4b2575656d56b482a9392a8795714436da2f0
+SIZE (binwalk-0.4.5.tar.gz) = 112526
diff --git a/security/binwalk/files/patch-binwalk.c b/security/binwalk/files/patch-binwalk.c
new file mode 100644
index 000000000000..93794b5a8563
--- /dev/null
+++ b/security/binwalk/files/patch-binwalk.c
@@ -0,0 +1,15 @@
+--- ./binwalk.c.orig 2012-10-07 07:44:55.000000000 -0400
++++ ./binwalk.c 2012-10-07 07:57:58.000000000 -0400
+@@ -78,7 +78,12 @@
+
+ /* Initialize default configuration settings */
+ /* Thanks to dannyb for these flags - much improved scan times! */
++#include <sys/param.h>
++#if __FreeBSD_version >= 800086
+ config.flags = MAGIC_NO_CHECK_TEXT | MAGIC_NO_CHECK_ENCODING;
++#else
++ config.flags = MAGIC_NO_CHECK_ASCII;
++#endif
+ config.align = DEFAULT_BYTE_ALIGN;
+ config.smart = 1;
+