Date: Fri, 3 Feb 2017 01:33:18 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433189 - in head/security/tripwire: . files Message-ID: <201702030133.v131XIw3099106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Feb 3 01:33:18 2017 New Revision: 433189 URL: https://svnweb.freebsd.org/changeset/ports/433189 Log: Update 2.4.3.1 --> 2.4.3.2 Added: head/security/tripwire/files/patch-installer-install.sh - copied, changed from r433188, head/security/tripwire/files/patch-install-install.sh head/security/tripwire/files/patch-installer__install.cfg - copied, changed from r433188, head/security/tripwire/files/patch-install__install.cfg Deleted: head/security/tripwire/files/patch-install-install.sh head/security/tripwire/files/patch-install__install.cfg Modified: head/security/tripwire/Makefile head/security/tripwire/distinfo head/security/tripwire/files/patch-Makefile.in Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Fri Feb 3 01:31:42 2017 (r433188) +++ head/security/tripwire/Makefile Fri Feb 3 01:33:18 2017 (r433189) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tripwire -PORTVERSION= 2.4.3.1 -PORTREVISION= 1 +PORTVERSION= 2.4.3.2 CATEGORIES= security MAINTAINER= cy@FreeBSD.org @@ -106,19 +105,19 @@ pre-configure: @ ${LN} -s ${WRKSRC}/contrib ${WRKSRC}/install install-config-files: - @ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/install/install.cfg - @ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/install/install.cfg - @ ${ECHO_CMD} TWLOCALKEYDIR=${TWLOCALKEYDIR} >> ${WRKSRC}/install/install.cfg - @ ${ECHO_CMD} TWDB=${TWDB} >> ${WRKSRC}/install/install.cfg - @ ${ECHO_CMD} TWREPORT=${TWREPORT} >> ${WRKSRC}/install/install.cfg - @ ${ECHO_CMD} TWEDITOR=${TWEDITOR} >> ${WRKSRC}/install/install.cfg + @ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/installer/install.cfg + @ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/installer/install.cfg + @ ${ECHO_CMD} TWLOCALKEYDIR=${TWLOCALKEYDIR} >> ${WRKSRC}/installer/install.cfg + @ ${ECHO_CMD} TWDB=${TWDB} >> ${WRKSRC}/installer/install.cfg + @ ${ECHO_CMD} TWREPORT=${TWREPORT} >> ${WRKSRC}/installer/install.cfg + @ ${ECHO_CMD} TWEDITOR=${TWEDITOR} >> ${WRKSRC}/installer/install.cfg .ifdef TW_SITE_PASS - @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/install/install.cfg + @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/installer/install.cfg .endif .ifdef TW_LOCAL_PASS - @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/install/install.cfg + @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/installer/install.cfg .endif - @ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh . + @ cd ${WRKSRC} && ${LN} -sf installer/install.cfg installer/install.sh . .ifdef PACKAGE_BUILDING @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else @@ -156,11 +155,11 @@ make-pkg-install: .ifdef TW_LOCAL_PASS @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGPOSTINSTALL} .endif - @ ${CAT} ${WRKSRC}/install/install.cfg >> ${PKGPOSTINSTALL} + @ ${CAT} ${WRKSRC}/installer/install.cfg >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} ${CAT} "> /tmp/$$$$.tmp <<'EOF'" >> ${PKGPOSTINSTALL} @ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} EOF >> ${PKGPOSTINSTALL} - @ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGPOSTINSTALL} + @ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/installer/install.sh >> ${PKGPOSTINSTALL} create-database: .ifndef PACKAGE_BUILDING Modified: head/security/tripwire/distinfo ============================================================================== --- head/security/tripwire/distinfo Fri Feb 3 01:31:42 2017 (r433188) +++ head/security/tripwire/distinfo Fri Feb 3 01:33:18 2017 (r433189) @@ -1,2 +1,3 @@ -SHA256 (Tripwire-tripwire-open-source-2.4.3.1_GH0.tar.gz) = 9744af4de7ecb1d643442eb22f08c819556494bb6f56f5879e22c3438f2db896 -SIZE (Tripwire-tripwire-open-source-2.4.3.1_GH0.tar.gz) = 932665 +TIMESTAMP = 1486025650 +SHA256 (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 25588c585f1af60958b3dce5bfc28e52c3237b2690dd5f4120e9c2f42d98fd2b +SIZE (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 967679 Modified: head/security/tripwire/files/patch-Makefile.in ============================================================================== --- head/security/tripwire/files/patch-Makefile.in Fri Feb 3 01:31:42 2017 (r433188) +++ head/security/tripwire/files/patch-Makefile.in Fri Feb 3 01:33:18 2017 (r433189) @@ -1,19 +1,19 @@ ---- Makefile.in.orig 2011-11-21 08:06:56.000000000 -0800 -+++ Makefile.in 2014-05-30 22:28:35.966716249 -0700 -@@ -540,7 +540,6 @@ +--- Makefile.in.orig 2017-01-31 21:35:07.000000000 -0800 ++++ Makefile.in 2017-02-02 00:55:45.246665000 -0800 +@@ -727,7 +727,6 @@ install-data-am: @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive - install-exec-am: - -@@ -589,7 +588,7 @@ + install-dvi-am: +@@ -797,7 +796,7 @@ install-data-hook: - prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ + STGDIR="$$STAGEDIR" prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - ./install/install.sh - # Tell versions [3.59,3.63) of GNU make to not export all variables. + ./installer/install.sh + Copied and modified: head/security/tripwire/files/patch-installer-install.sh (from r433188, head/security/tripwire/files/patch-install-install.sh) ============================================================================== --- head/security/tripwire/files/patch-install-install.sh Fri Feb 3 01:31:42 2017 (r433188, copy source) +++ head/security/tripwire/files/patch-installer-install.sh Fri Feb 3 01:33:18 2017 (r433189) @@ -1,5 +1,5 @@ ---- install/install.sh.orig 2011-11-21 08:06:56.000000000 -0800 -+++ install/install.sh 2014-06-21 10:37:36.784492831 -0700 +--- installer/install.sh.orig 2011-11-21 08:06:56.000000000 -0800 ++++ installer/install.sh 2014-06-21 10:37:36.784492831 -0700 @@ -19,10 +19,6 @@ PATH='.:/bin:/usr/bin' Copied and modified: head/security/tripwire/files/patch-installer__install.cfg (from r433188, head/security/tripwire/files/patch-install__install.cfg) ============================================================================== --- head/security/tripwire/files/patch-install__install.cfg Fri Feb 3 01:31:42 2017 (r433188, copy source) +++ head/security/tripwire/files/patch-installer__install.cfg Fri Feb 3 01:33:18 2017 (r433189) @@ -1,5 +1,5 @@ ---- install/install.cfg.orig 2007-03-30 21:09:39.000000000 -0700 -+++ install/install.cfg 2009-02-20 12:26:13.505110456 -0800 +--- installer/install.cfg.orig 2007-03-30 21:09:39.000000000 -0700 ++++ installer/install.cfg 2009-02-20 12:26:13.505110456 -0800 @@ -24,31 +24,31 @@ CLOBBER=false
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702030133.v131XIw3099106>