Update 2.4.0.1 --> 2.4.1.2

5 files changed, 11 insertions, 113 deletions

diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 0f4c89e39fc0..6b56a661cc66 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tripwire
-PORTVERSION=	2.4.0.1
+PORTVERSION=	2.4.1.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,7 @@ LATEST_LINK=	${PORTNAME}
 MAN5=		twfiles.5 twconfig.5 twpolicy.5
 MAN8=		siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
 NO_PACKAGE=	"requires local database to be built"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/src
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -70,9 +69,9 @@ install-config-files:
 	@ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh .
 .if ( defined(TRIPWIRE_CLOBBER) && ${TRIPWIRE_CLOBBER} == "YES" ) || \
     ( defined(TRIPWIRE_CLOBBER) && ${TRIPWIRE_CLOBBER} == "yes" )
-	@ cd ${WRKSRC} && PREFIX=${PREFIX} ./install.sh -f
+	@ cd ${WRKSRC} && PREFIX=${PREFIX} CLOBBER=true ${GMAKE} install-data-hook
 .else
-	@ cd ${WRKSRC} && PREFIX=${PREFIX} ./install.sh
+	@ cd ${WRKSRC} && PREFIX=${PREFIX} ${GMAKE} install-data-hook
 .endif
 
 create-database:
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index b6dec09bddcb..d2471ef31262 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,3 +1,3 @@
-MD5 (tripwire-2.4.0.1-src.tar.bz2) = b371f79ac23cacc9ad40b1da76b4a0c4
-SHA256 (tripwire-2.4.0.1-src.tar.bz2) = 397269815278b775f1dd657c3bd06982990a2af2a7ab2a8c8175b117c6147212
-SIZE (tripwire-2.4.0.1-src.tar.bz2) = 1208424
+MD5 (tripwire-2.4.1.2-src.tar.bz2) = 8a1147c278b528ed593023912c4b649a
+SHA256 (tripwire-2.4.1.2-src.tar.bz2) = 55462b13a81aa65b83a76cd43d8617a60eb669d2b3d9999d0377a0e68e692907
+SIZE (tripwire-2.4.1.2-src.tar.bz2) = 711311
diff --git a/security/tripwire/files/patch-contrib::install.cfg b/security/tripwire/files/patch-contrib::install.cfg
index 041e36270b7a..e60e9edb0db8 100644
--- a/security/tripwire/files/patch-contrib::install.cfg
+++ b/security/tripwire/files/patch-contrib::install.cfg
@@ -1,5 +1,5 @@
---- contrib/install.cfg.orig	Thu Sep 15 20:12:39 2005
-+++ contrib/install.cfg	Mon Feb 13 07:28:17 2006
+--- install/install.cfg.orig	2007-03-30 21:09:39.000000000 -0700
++++ install/install.cfg	2009-02-20 12:26:13.505110456 -0800
 @@ -24,31 +24,31 @@
  CLOBBER=false
  
@@ -41,12 +41,3 @@
  
  # TWLATEPROMTING controls the point when tripwire asks for a password.
  TWLATEPROMPTING=false
-@@ -85,7 +85,7 @@
- #####################################
- 
- TWMAILMETHOD=SENDMAIL
--TWMAILPROGRAM="${path_to_sendmail} -oi -t"
-+TWMAILPROGRAM="/usr/sbin/sendmail -oi -t"
- 
- #####################################
- # SMTP options
diff --git a/security/tripwire/files/patch-contrib::install.sh b/security/tripwire/files/patch-contrib::install.sh
deleted file mode 100644
index 6b5aa70fdc48..000000000000
--- a/security/tripwire/files/patch-contrib::install.sh
+++ /dev/null
@@ -1,83 +0,0 @@
---- contrib/install.sh.orig	Thu Sep 15 20:12:39 2005
-+++ contrib/install.sh	Tue Feb 21 08:22:10 2006
-@@ -162,12 +162,6 @@
- # Default installation script configuration file.
- INSTALL_CONFIG_FILE="./install/install.cfg"
- 
--# Name of the Readme file.
--README="README"
--
--# Name of the release notes.
--REL_NOTES="Release_Notes"
--
- # Relative path to dir that contains the pkg files.
- PKG_DIR="pkg"
- 
-@@ -573,8 +567,6 @@
- 
- README_LOC=${TWDOCS}/$REL_NOTES
- 
--f1=' ff=$README ; d="" ; dd=$TWDOCS ; rr=0444 '
--f2=' ff=$REL_NOTES ; d="" ; dd=$TWDOCS ; rr=0444 '
- f3=' ff=$TWLICENSEFILE ; d="" ; dd=$TWDOCS ; rr=0444 '
- #f4=' ff=tripwire ; d="/bin" ; dd=$TWBIN ; rr=0550 '
- #f5=' ff=twadmin ; d="/bin" ; dd=$TWBIN ; rr=0550 '
-@@ -593,7 +585,7 @@
- #f18=' ff=twprint.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
- 
- # Binaries and manpages are already installed by the install target
--loosefiles="f1 f2 f3 f8 f9 f10"
-+loosefiles="f3 f8 f9 f10"
- 
- for i in $loosefiles; do
- 	eval "eval \"\$$i\""
-@@ -719,6 +711,7 @@
- ## Generate tripwire configuration file.
- ##=======================================================
- 
-+[ ! -f "$TXT_CFG" -o "$CLOBBER" = "false" ] && {
- echo
- echo "----------------------------------------------"
- echo "Generating Tripwire configuration file..."
-@@ -757,6 +750,7 @@
- fi
- 
- chmod 640 "$TXT_CFG"
-+}
- 
- ##=======================================================
- ## Create signed tripwire configuration file.
-@@ -826,20 +820,21 @@
- echo "----------------------------------------------"
- echo "Customizing default policy file..."
- 
--sed '/@@section GLOBAL/,/@@section FS/  {
--  s?^\(TWROOT=\).*$?TWDOCS='\""$TWDOCS"\"';?
--  s?^\(TWBIN=\).*$?\1'\""$TWBIN"\"';?
--  s?^\(TWPOL=\).*$?\1'\""$TWPOLICY"\"';?
--  s?^\(TWDB=\).*$?\1'\""$TWDB"\"';?
--  s?^\(TWSKEY=\).*$?\1'\""$TWSITEKEYDIR"\"';?
--  s?^\(TWLKEY=\).*$?\1'\""$TWLOCALKEYDIR"\"';?
--  s?^\(TWREPORT=\).*$?\1'\""$TWREPORT"\"';?
--  s?^\(HOSTNAME=\).*$?\1'"$HOST_NAME"';?
--}' "${TWPOLICY}/${POLICYSRC}" > "${TXT_POL}.tmp"
--
- # copy the tmp file back over the default policy
- [ -f "${TXT_POL}" ] && cp "${TXT_POL}" "${TXT_POL}.bak"
--mv "${TXT_POL}.tmp" "${TXT_POL}"
-+[ ! -f "${TXT_POL}" -o "$CLOBBER" = "true" ] && {
-+	sed '/@@section GLOBAL/,/@@section FS/  {
-+	  s?^\(TWROOT=\).*$?TWDOCS='\""$TWDOCS"\"';?
-+	  s?^\(TWBIN=\).*$?\1'\""$TWBIN"\"';?
-+	  s?^\(TWPOL=\).*$?\1'\""$TWPOLICY"\"';?
-+	  s?^\(TWDB=\).*$?\1'\""$TWDB"\"';?
-+	  s?^\(TWSKEY=\).*$?\1'\""$TWSITEKEYDIR"\"';?
-+	  s?^\(TWLKEY=\).*$?\1'\""$TWLOCALKEYDIR"\"';?
-+	  s?^\(TWREPORT=\).*$?\1'\""$TWREPORT"\"';?
-+	  s?^\(HOSTNAME=\).*$?\1'"$HOST_NAME"';?
-+	}' "${TWPOLICY}/${POLICYSRC}" > "${TXT_POL}"
-+}
-+
- rm -f "${TWPOLICY}/${POLICYSRC}"
- 
- # reset rights on the policy files to 640
diff --git a/security/tripwire/files/patch-install::install.cfg b/security/tripwire/files/patch-install::install.cfg
index 041e36270b7a..e60e9edb0db8 100644
--- a/security/tripwire/files/patch-install::install.cfg
+++ b/security/tripwire/files/patch-install::install.cfg
@@ -1,5 +1,5 @@
---- contrib/install.cfg.orig	Thu Sep 15 20:12:39 2005
-+++ contrib/install.cfg	Mon Feb 13 07:28:17 2006
+--- install/install.cfg.orig	2007-03-30 21:09:39.000000000 -0700
++++ install/install.cfg	2009-02-20 12:26:13.505110456 -0800
 @@ -24,31 +24,31 @@
  CLOBBER=false
  
@@ -41,12 +41,3 @@
  
  # TWLATEPROMTING controls the point when tripwire asks for a password.
  TWLATEPROMPTING=false
-@@ -85,7 +85,7 @@
- #####################################
- 
- TWMAILMETHOD=SENDMAIL
--TWMAILPROGRAM="${path_to_sendmail} -oi -t"
-+TWMAILPROGRAM="/usr/sbin/sendmail -oi -t"
- 
- #####################################
- # SMTP options