Date: Tue, 9 Apr 2013 19:55:30 GMT From: klm <klm@uidzero.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177738: Update port: security/ftimes 3.8.0 --> 3.10.0 Message-ID: <201304091955.r39JtUUZ089452@red.freebsd.org> Resent-Message-ID: <201304092000.r39K00EJ034855@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177738
>Category: ports
>Synopsis: Update port: security/ftimes 3.8.0 --> 3.10.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 09 20:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: klm
>Release:
>Organization:
>Environment:
>Description:
Please note that this update includes a dependency for devel/libklel, which was recently submitted as a new port (pr=177737).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 315771)
+++ Makefile (working copy)
@@ -3,29 +3,40 @@
#
PORTNAME= ftimes
-PORTVERSION= 3.8.0
-PORTREVISION= 1
+PORTVERSION= 3.10.0
CATEGORIES= security sysutils
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= klm@uidzero.org
-COMMENT= System baselining and evidence collection tool
+COMMENT= A system baselining and evidence collection tool
GNU_CONFIGURE= yes
USE_PERL5= yes
MAN1= ftimes.1
-OPTIONS= DIG_TOOLS "install dig tools" on \
+OPTIONS= DBM_TOOLS "install DBM tools" on \
+ DIG_TOOLS "install dig tools" on \
+ FILE_HOOKS "file hooks support" on \
HASHDIG_TOOLS "install hashdig tools" on \
MAP_TOOLS "install map tools" on \
- PCRE "PCRE support" on \
SSL "OpenSSL support" on \
XMAGIC "XMagic support" on
.include <bsd.port.pre.mk>
+LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}
+
+.if defined(WITH_DBM_TOOLS)
+PLIST_SUB+= DBM_TOOLS=""
+CONFIGURE_ARGS+= --with-dbm-tools
+MAN1+= ftimes-dbm-bash.1 ftimes-dbm-dump.1 ftimes-dbm-find.1 ftimes-dbm-make.1 ftimes-dbm-reap.1 ftimes-dbm-weed.1
+.else
+PLIST_SUB+= DBM_TOOLS="@comment "
+.endif
+
.if defined(WITH_DIG_TOOLS) || defined(WITH_MAP_TOOLS)
. if ${PERL_LEVEL} < 500703
RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5
@@ -41,10 +52,17 @@
PLIST_SUB+= DIG_TOOLS="@comment "
.endif
+.if defined(WITH_FILE_HOOKS)
+LIB_DEPENDS+= klel:${PORTSDIR}/devel/libklel
+CONFIGURE_ARGS+= --enable-file-hooks --with-klel=${LOCALBASE} --with-perl=${LOCALBASE}/bin/perl
+.else
+PLIST_SUB+= WITH_FILE_HOOKS="@comment "
+.endif
+
.if defined(WITH_HASHDIG_TOOLS)
PLIST_SUB+= HASHDIG_TOOLS=""
CONFIGURE_ARGS+= --with-hashdig-tools
-MAN1+= hashdig-bash.1 hashdig-bind.1 hashdig-dump.1 hashdig-find.1 hashdig-filter.1 hashdig-harvest-sunsolve.1 hashdig-harvest.1 hashdig-make.1 hashdig-resolve-sunsolve.1 hashdig-stat.1 hashdig-weed.1
+MAN1+= hashdig-bash.1 hashdig-bind.1 hashdig-dump.1 hashdig-filter.1 hashdig-find.1 hashdig-harvest.1 hashdig-harvest-sunsolve.1 hashdig-make.1 hashdig-resolve-sunsolve.1 hashdig-stat.1 hashdig-weed.1
.else
PLIST_SUB+= HASHDIG_TOOLS="@comment "
.endif
@@ -52,18 +70,11 @@
.if defined(WITH_MAP_TOOLS)
PLIST_SUB+= MAP_TOOLS=""
CONFIGURE_ARGS+= --with-map-tools
-MAN1+= ftimes-cmp2dbi.1 ftimes-map2dbi.1 ftimes-map2mac.1 tarmap.1
+MAN1+= ftimes-cat.1 ftimes-cmp2dbi.1 ftimes-cmp2diff.1 ftimes-encoder.1 ftimes-grabber.1 ftimes-map2dbi.1 ftimes-map2mac.1 ftimes-proximo.1 ftimes-sizimus.1 ftimes-sortini.1 ftimes-xformer.1 ftimes-xpa.1 hashcp.1 tarmap.1 zipmap.1
.else
PLIST_SUB+= MAP_TOOLS="@comment "
.endif
-.if defined(WITH_PCRE)
-LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-pcre
-.endif
-
.if defined(WITH_SSL)
# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
@@ -75,11 +86,15 @@
.if defined(WITH_XMAGIC)
PLIST_SUB+= XMAGIC=""
CONFIGURE_ARGS+= --enable-xmagic
+#.if !defined(WITH_FILE_HOOKS)
+#LIB_DEPENDS+= libklel:${PORTSDIR}/devel/libklel
+#CONFIGURE_ARGS+= --with-klel=${LOCALBASE}
+#.endif
.else
PLIST_SUB+= XMAGIC="@comment "
.endif
post-install:
- ${STRIP_CMD} ${PREFIX}/bin/ftimes
+ ${STRIP_CMD} ${PREFIX}/bin/ftimes ${PREFIX}/bin/ftimes-cat ${PREFIX}/bin/hashcp ${PREFIX}/bin/tarmap
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 315771)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (ftimes-3.8.0.tgz) = 8d25ea7a5778438fcee469f8824aa64b3a209769d358260e6c94a927e7064e58
-SIZE (ftimes-3.8.0.tgz) = 452880
+SHA256 (ftimes-3.10.0.tgz) = 3bd4a66c685e365d0dc4f74edaf220808530d75e78fa0246c7727d5597e95af2
+SIZE (ftimes-3.10.0.tgz) = 643517
Index: files/patch-etc::Makefile.in
===================================================================
--- files/patch-etc::Makefile.in (revision 315771)
+++ files/patch-etc::Makefile.in (working copy)
@@ -1,20 +0,0 @@
---- etc/Makefile.in.orig Mon Apr 17 16:36:21 2006
-+++ etc/Makefile.in Mon Apr 17 16:36:40 2006
-@@ -26,15 +26,13 @@
- diglean.cfg.sample\
- get.cfg.sample\
- mapfull.cfg.sample\
-- maplean.cfg.sample\
-- nph-ftimes.cfg.sample
-+ maplean.cfg.sample
- DST_FILES =\
- ${etcdir}/digfull.cfg.sample\
- ${etcdir}/diglean.cfg.sample\
- ${etcdir}/get.cfg.sample\
- ${etcdir}/mapfull.cfg.sample\
-- ${etcdir}/maplean.cfg.sample\
-- ${etcdir}/nph-ftimes.cfg.sample
-+ ${etcdir}/maplean.cfg.sample
-
- all: ${SRC_FILES}
-
Index: files/patch-etc::xmagic::xmagic.base
===================================================================
--- files/patch-etc::xmagic::xmagic.base (revision 0)
+++ files/patch-etc::xmagic::xmagic.base (working copy)
@@ -0,0 +1,90 @@
+--- etc/xmagic/xmagic.base.orig 2013-04-09 13:34:18.000000000 -0400
++++ etc/xmagic/xmagic.base 2013-04-09 13:38:03.000000000 -0400
+@@ -648,66 +648,66 @@
+ 0 string = \x23\x20PaCkAgE\x20DaTaStReAm package/svr4
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- ae script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ae) script/ae: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ae) script/ae: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- ash script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ash) script/ash: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ash) script/ash: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- awk script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/awk) script/awk: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/awk) script/awk: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- bash script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/bash) script/bash: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/bash) script/bash: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- csh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/csh) script/csh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/csh) script/csh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- env script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/env) script/env: path="%s";
+->&0 regexp =~ ^#![\x20\t]*(?:/(?:opt|usr)(?:/local)?)?/bin/env[\x20\t]+(ae|(?:[ackz]|ba|tcl?|wi)?sh|[gn]?awk|lua|perl|php|python|rc|ruby) interpreter="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/env) script/env: path="%s";
++>&0 regexp =~ ^\x23![\x20\t]*(?:/(?:opt|usr)(?:/local)?)?/bin/env[\x20\t]+(ae|(?:[ackz]|ba|tcl?|wi)?sh|[gn]?awk|lua|perl|php|python|rc|ruby) interpreter="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- gawk script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/gawk) script/gawk: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/gawk) script/gawk: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- ksh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ksh) script/ksh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ksh) script/ksh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- lua script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/lua) script/lua: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/lua) script/lua: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- nawk script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/nawk) script/nawk: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/nawk) script/nawk: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- perl script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/perl) script/perl: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/perl) script/perl: path="%s";
+ 0 regexp =~ (?:eval[\x20\t]+["'][(]exit[\x20\t]+[$][?][)][\x20\t]+&&[\x20\t]+)?eval[\x20\t]+["']exec[\x20\t]+((?:(?:/(?:opt|usr)(?:/local)?)?/bin/)?perl)[\x20\t]+ script/perl: path="%s"; eval="yes";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- php script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/php) script/php: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/php) script/php: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- python script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/python) script/python: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/python) script/python: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- rc script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/rc) script/rc: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/rc) script/rc: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- ruby script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ruby) script/ruby: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ruby) script/ruby: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- sh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/sh) script/sh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/sh) script/sh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- tclsh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tclsh) script/tclsh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tclsh) script/tclsh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- tcsh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tcsh) script/tcsh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tcsh) script/tcsh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- wish script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/wish) script/wish: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/wish) script/wish: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- zsh script
+-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/zsh) script/zsh: path="%s";
++0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/zsh) script/zsh: path="%s";
+ #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
+ # XMagic -- btsnoop
+ 0 string = btsnoop\0 sniffer/btsnoop:
Index: pkg-plist
===================================================================
--- pkg-plist (revision 315771)
+++ pkg-plist (working copy)
@@ -1,3 +1,9 @@
+%%DBM_TOOLS%%bin/ftimes-dbm-bash
+%%DBM_TOOLS%%bin/ftimes-dbm-dump
+%%DBM_TOOLS%%bin/ftimes-dbm-find
+%%DBM_TOOLS%%bin/ftimes-dbm-make
+%%DBM_TOOLS%%bin/ftimes-dbm-reap
+%%DBM_TOOLS%%bin/ftimes-dbm-weed
%%DIG_TOOLS%%bin/ftimes-crv2dbi.pl
%%DIG_TOOLS%%bin/ftimes-crv2raw.pl
%%DIG_TOOLS%%bin/ftimes-dig2ctx.pl
@@ -6,21 +12,31 @@
%%HASHDIG_TOOLS%%bin/hashdig-bash.pl
%%HASHDIG_TOOLS%%bin/hashdig-bind.pl
%%HASHDIG_TOOLS%%bin/hashdig-dump.pl
+%%HASHDIG_TOOLS%%bin/hashdig-filter.pl
%%HASHDIG_TOOLS%%bin/hashdig-find.pl
-%%HASHDIG_TOOLS%%bin/hashdig-filter.pl
+%%HASHDIG_TOOLS%%bin/hashdig-harvest.pl
%%HASHDIG_TOOLS%%bin/hashdig-harvest-sunsolve.pl
-%%HASHDIG_TOOLS%%bin/hashdig-harvest.pl
%%HASHDIG_TOOLS%%bin/hashdig-make.pl
%%HASHDIG_TOOLS%%bin/hashdig-resolve-sunsolve.pl
%%HASHDIG_TOOLS%%bin/hashdig-stat.pl
%%HASHDIG_TOOLS%%bin/hashdig-weed.pl
+%%MAP_TOOLS%%bin/ftimes-cat
%%MAP_TOOLS%%bin/ftimes-cmp2dbi.pl
+%%MAP_TOOLS%%bin/ftimes-cmp2diff
+%%MAP_TOOLS%%bin/ftimes-encoder
+%%MAP_TOOLS%%bin/ftimes-grabber
%%MAP_TOOLS%%bin/ftimes-map2dbi.pl
%%MAP_TOOLS%%bin/ftimes-map2mac.pl
+%%MAP_TOOLS%%bin/ftimes-proximo
+%%MAP_TOOLS%%bin/ftimes-sizimus
+%%MAP_TOOLS%%bin/ftimes-sortini
+%%MAP_TOOLS%%bin/ftimes-xformer
+%%MAP_TOOLS%%bin/ftimes-xpa
+%%MAP_TOOLS%%bin/hashcp
%%MAP_TOOLS%%bin/tarmap
+%%MAP_TOOLS%%bin/zipmap
+%%XMAGIC%%etc/xmagic
bin/ftimes
-etc/digfull.cfg.sample
-etc/diglean.cfg.sample
-etc/get.cfg.sample
-etc/mapfull.cfg.sample
-etc/maplean.cfg.sample
+etc/ftimes-dig.cfg.sample
+etc/ftimes-get.cfg.sample
+etc/ftimes-map.cfg.sample
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304091955.r39JtUUZ089452>