Update tripwire 2.4.2.2 --> 2.4.3.1

Reported by:	Brian Cox <bcox@tripwire.com>

22 files changed, 92 insertions, 198 deletions

diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 4ddc6f9c2e50..09a239620712 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -2,19 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	tripwire
-PORTVERSION=	2.4.2.2
-PORTREVISION=	3
+PORTVERSION=	2.4.3.1
 CATEGORIES=	security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	File system security and verification program
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Tripwire
+GH_PROJECT=	tripwire-open-source
+
 NO_LICENSES_INSTALL=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
 MAKE_JOBS_UNSAFE=	yes
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index 0d6d827c0026..71d68f4e2b8f 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tripwire-2.4.2.2-src.tar.bz2) = e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad
-SIZE (tripwire-2.4.2.2-src.tar.bz2) = 716616
+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
diff --git a/security/tripwire/files/patch-man__man4__twconfig.4 b/security/tripwire/files/patch-man__man4__twconfig.4
index 409f5190bf6e..061f3d7fab4a 100644
--- a/security/tripwire/files/patch-man__man4__twconfig.4
+++ b/security/tripwire/files/patch-man__man4__twconfig.4
@@ -1,5 +1,5 @@
---- man/man4/twconfig.4.orig	Sat Mar  3 16:28:39 2001
-+++ man/man4/twconfig.4	Sat Feb 23 13:49:52 2002
+--- man/man4/twconfig.4.orig	2016-04-23 19:12:41.000000000 -0700
++++ man/man4/twconfig.4	2016-04-30 00:02:20.117209000 -0700
 @@ -35,7 +35,7 @@
  ..
  .nh
@@ -9,7 +9,31 @@
  .SH NAME
  twconfig \- \fITripwire\fP configuration file reference
  .SH DESCRIPTION
-@@ -293,7 +293,7 @@
+@@ -48,7 +48,7 @@
+ signed with the site key, and the site passphrase is
+ required to edit the file.
+ .PP
+-During installation, a signed \fITripwire\fP configuration file \fItw.cfg\fP will be created in the \fI/etc/tripwire\fP directory, and a plain text copy of this configuration file \fItwcfg.txt\fP will be created in the same directory.
++During installation, a signed \fITripwire\fP configuration file \fItw.cfg\fP will be created in the \fI/usr/local/etc/tripwire\fP directory, and a plain text copy of this configuration file \fItwcfg.txt\fP will be created in the same directory.
+ .PP
+ The configuration file is modified using the
+ .B twadmin\ \(hy\(hycreate\(hycfgfile
+@@ -102,11 +102,11 @@
+ .if n .nr Ti \n(.i
+ .Nf
+ .if n .in 0
+-POLFILE         Default = /etc/tripwire/tw.pol
++POLFILE         Default = /usr/local/etc/tripwire/tw.pol
+ DBFILE          Default = /var/lib/tripwire/$(HOSTNAME).twd
+ REPORTFILE      Default = /var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr
+-SITEKEYFILE     Default = /etc/tripwire/site.key
+-LOCALKEYFILE    Default = /etc/tripwire/$(HOSTNAME)-local.key
++SITEKEYFILE     Default = /usr/local/etc/tripwire/site.key
++LOCALKEYFILE    Default = /usr/local/etc/tripwire/$(HOSTNAME)-local.key
+ .Fi
+ .if n .in +\n(Tiu 
+ .SS Other Variables
+@@ -298,7 +298,7 @@
  .BR twadmin (8),
  .BR twprint (8),
  .BR siggen (8),
diff --git a/security/tripwire/files/patch-man__man4__twpolicy.4 b/security/tripwire/files/patch-man__man4__twpolicy.4
index 0d6ab39a39dd..f72a6ab4a9c0 100644
--- a/security/tripwire/files/patch-man__man4__twpolicy.4
+++ b/security/tripwire/files/patch-man__man4__twpolicy.4
@@ -1,5 +1,5 @@
---- man/man4/twpolicy.4.orig	Sat Mar  3 16:28:30 2001
-+++ man/man4/twpolicy.4	Sat Feb 23 13:50:10 2002
+--- man/man4/twpolicy.4.orig	2016-04-23 19:12:41.000000000 -0700
++++ man/man4/twpolicy.4	2016-04-30 00:04:18.371172000 -0700
 @@ -36,7 +36,7 @@
  .\"
  .nh
@@ -9,6 +9,15 @@
  .SH NAME
  twpolicy \- \fITripwire\fP policy file reference
  .SH DESCRIPTION
+@@ -51,7 +51,7 @@
+ \fITripwire\fP checks the integrity of any system.
+ .PP
+ During installation, an encoded and signed policy file (\fItw.pol\fP)
+-will be created in the \fI/etc/tripwire\fP directory,
++will be created in the \fI/usr/local/etc/tripwire\fP directory,
+ and a plain text copy of this policy file (\fItwpol.txt\fP) will be
+ generated in the same directory.  An additional text file
+ (\fIpolicyguide.txt\fP) illustrates all of the features of the policy
 @@ -544,5 +544,5 @@
  .BR twadmin (8),
  .BR twprint (8),
diff --git a/security/tripwire/files/patch-man__man5__Makefile.in b/security/tripwire/files/patch-man__man5__Makefile.in
index 1ca27b160c59..7f965f340edd 100644
--- a/security/tripwire/files/patch-man__man5__Makefile.in
+++ b/security/tripwire/files/patch-man__man5__Makefile.in
@@ -1,11 +1,13 @@
---- man/man5/Makefile.in.orig	Tue Nov 22 23:02:51 2005
-+++ man/man5/Makefile.in	Fri Jan  6 13:49:39 2006
-@@ -147,7 +147,7 @@
+--- man/man5/Makefile.in.orig	2016-04-23 19:12:41.000000000 -0700
++++ man/man5/Makefile.in	2016-04-29 23:17:14.071690000 -0700
+@@ -159,8 +159,8 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign no-dependencies
 -man_MANS = twfiles.5
+-dist_man_MANS = twfiles.5
 +man_MANS = twfiles.5 twconfig.5 twpolicy.5
++dist_man_MANS = twfiles.5 twconfig.5 twpolicy.5
  all: all-am
  
  .SUFFIXES:
diff --git a/security/tripwire/files/patch-man__man5__twfiles.5 b/security/tripwire/files/patch-man__man5__twfiles.5
new file mode 100644
index 000000000000..a9e9950fe9d9
--- /dev/null
+++ b/security/tripwire/files/patch-man__man5__twfiles.5
@@ -0,0 +1,27 @@
+--- man/man5/twfiles.5.orig	2016-04-23 19:12:41.000000000 -0700
++++ man/man5/twfiles.5	2016-04-30 00:06:08.408519000 -0700
+@@ -31,13 +31,13 @@
+ .\"
+ .SH DESCRIPTION
+ .\"
+-.Ms "Configuration File" "\fPdefault:\fP \fI/etc/tripwire/tw.cfg\fP"
++.Ms "Configuration File" "\fPdefault:\fP \fI/usr/local/etc/tripwire/tw.cfg\fP"
+ The configuration file stores system-specific information, such as the
+ location of \fITripwire\fR data files. The configuration settings are
+ generated during the installation process, but can be changed by the system administrator at any time.  See the
+ \fBtwconfig\fR(4) man page for a more complete discussion.
+ .\"
+-.Ms "Policy File" "\fPdefault:\fP \fI/etc/tripwire/tw.pol\fP"
++.Ms "Policy File" "\fPdefault:\fP \fI/usr/local/etc/tripwire/tw.pol\fP"
+ The policy file consists of a series of rules specifying the system
+ objects that \fITripwire\fR should monitor, and the data for each
+ object that should be collected and stored in the database file.
+@@ -69,7 +69,7 @@
+ \fBtripwire\fR(8) and \fBtwprint\fR(8) man pages for information on
+ creating and printing report files.
+ .\"
+-.Ms "Key Files" "\fPdefaults:\fP \fI/etc/tripwire/site.key\fP \fPand\fP \fI/etc/tripwire/$(HOSTNAME)\(hylocal.key\fP"
++.Ms "Key Files" "\fPdefaults:\fP \fI/usr/local/etc/tripwire/site.key\fP \fPand\fP \fI/usr/local/etc/tripwire/$(HOSTNAME)\(hylocal.key\fP"
+ It is critical that \fITripwire\fR files be protected from unauthorized
+ .ie n access\(hy\(hyan
+ .el access\(eman
diff --git a/security/tripwire/files/patch-src-core-archive.cpp b/security/tripwire/files/patch-src-core-archive.cpp
index 15c850c4ef79..5d39ff28c391 100644
--- a/security/tripwire/files/patch-src-core-archive.cpp
+++ b/security/tripwire/files/patch-src-core-archive.cpp
@@ -1,13 +1,13 @@
---- src/core/archive.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/archive.cpp	2014-06-15 01:45:01.000000000 +0200
-@@ -886,8 +886,8 @@ void cLockedTemporaryFileArchive::OpenRe
-         catch( eFSServices& e)
-           {
-             TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
--            eArchiveOpen e(strTempFile, errStr);
--            throw e;
-+            eArchiveOpen e2(strTempFile, errStr);
-+            throw e2;
-           }
-       }
-     ///////////////////////////////////////////////////////////////////////////////
+--- src/core/archive.cpp.orig	2016-04-23 19:12:41.000000000 -0700
++++ src/core/archive.cpp	2016-04-29 23:21:27.059769000 -0700
+@@ -919,8 +919,8 @@
+   }//try
+   catch (eFile& fileError) {
+     TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
+-    eArchiveOpen e(strTempFile, errStr);
+-    throw e;
++    eArchiveOpen e2(strTempFile, errStr);
++    throw e2;
+   }
+ 
+   ///////////////////////////////////////////////////////////////////////////////
diff --git a/security/tripwire/files/patch-src-core-archive.h b/security/tripwire/files/patch-src-core-archive.h
deleted file mode 100644
index 5eec35fd3156..000000000000
--- a/security/tripwire/files/patch-src-core-archive.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/archive.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/archive.h	2014-06-15 01:51:40.000000000 +0200
-@@ -85,6 +85,8 @@ TSS_EXCEPTION( eArchiveStringTooLong, eA
- class cArchive
- {
- public:
-+    virtual ~cArchive() {}
-+
- 	// convenience methods
-     //
-     // Specific Read functions throw(eArchive) if EOF is reached because
diff --git a/security/tripwire/files/patch-src-core-displayencoder.cpp b/security/tripwire/files/patch-src-core-displayencoder.cpp
deleted file mode 100644
index b15c97ba99df..000000000000
--- a/security/tripwire/files/patch-src-core-displayencoder.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/core/displayencoder.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/displayencoder.cpp	2014-06-15 01:46:55.000000000 +0200
-@@ -825,11 +825,10 @@ bool cEncoder::OnlyOneCatagoryPerChar() 
-         {
-             bool fFailedATest = false;
- 
--            ach[0] = ch;
-+            TSTRING ach(1, ch);
-             for( sack_type::const_iterator atE = m_encodings.begin(); atE != m_encodings.end(); atE++ )
-             {
--		TSTRING::const_iterator first(&ach[0]), last(&ach[1]);
--                if( (*atE)->NeedsEncoding( first, last ) )
-+                if( (*atE)->NeedsEncoding( ach.begin(), ach.end() ) )
-                 {
-                     if( fFailedATest )
-                         return false; // each char can only fail one test
diff --git a/security/tripwire/files/patch-src-core-fsservices.h b/security/tripwire/files/patch-src-core-fsservices.h
deleted file mode 100644
index f3cea82095c4..000000000000
--- a/security/tripwire/files/patch-src-core-fsservices.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/core/fsservices.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/fsservices.h	2014-06-15 01:54:49.000000000 +0200
-@@ -177,6 +177,7 @@ TSS_FILE_EXCEPTION( eFSServicesGeneric, 
- class iFSServices 
- {
-  public:
-+  virtual ~iFSServices() {}
-     
-   ///////////////////////////////////////////////////////////////
-   // ENUMS
-@@ -219,7 +220,7 @@ class iFSServices 
-   // returns true if the file system is case sensitive
-   virtual TCHAR       GetPathSeperator() const = 0;
-   // returns "/" for unix and "\\" for win32
--  virtual TCHAR*      GetStandardBackupExtension() const = 0;
-+  virtual const TCHAR* GetStandardBackupExtension() const = 0;
-   // returns normal string to append to backup files for this os.
-     
-   ////////////////////////////////////////
diff --git a/security/tripwire/files/patch-src-core-tw_signal.cpp b/security/tripwire/files/patch-src-core-tw_signal.cpp
deleted file mode 100644
index d5ef2dde2cf9..000000000000
--- a/security/tripwire/files/patch-src-core-tw_signal.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/tw_signal.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/tw_signal.cpp	2014-06-15 01:48:28.000000000 +0200
-@@ -79,7 +79,7 @@ void util_SignalHandler( int sig )
- #if IS_UNIX
- void tw_psignal(int sig, const TCHAR *str)
- {
--    TCHAR *siglist[NSIG] = {
-+    const TCHAR *siglist[NSIG] = {
-         _T("Unknown Signal"),
-         _T("Hangup"),
-         _T("Interrupt"),
diff --git a/security/tripwire/files/patch-src-core-twlocale.h b/security/tripwire/files/patch-src-core-twlocale.h
deleted file mode 100644
index 361fe105005f..000000000000
--- a/security/tripwire/files/patch-src-core-twlocale.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/twlocale.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/twlocale.h	2014-06-15 01:48:46.000000000 +0200
-@@ -110,7 +110,7 @@ namespace tss
- #if USE_STD_CPP_LOCALE_WORKAROUND
-             return std::use_facet( l, pf );
- #else
--            return std::use_facet< FacetT >( l ); pf;  // This is C++ standard
-+            return std::use_facet< FacetT >( l ); (void)pf;  // This is C++ standard
- #endif
-     }
- }
diff --git a/security/tripwire/files/patch-src-core-unixfsservices.cpp b/security/tripwire/files/patch-src-core-unixfsservices.cpp
deleted file mode 100644
index 3e44044735f2..000000000000
--- a/security/tripwire/files/patch-src-core-unixfsservices.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/unixfsservices.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/unixfsservices.cpp	2014-06-15 01:44:45.000000000 +0200
-@@ -792,7 +792,7 @@ bool cUnixFSServices::FullPath( TSTRING&
- // Returns normal string to append to backup files for this os.
- // (e.g. "~" for unix and ".bak" for winos)
- ///////////////////////////////////////////////////////////////////////////////
--TCHAR* cUnixFSServices::GetStandardBackupExtension() const
-+const TCHAR* cUnixFSServices::GetStandardBackupExtension() const
- {
-     return _T(".bak");
- }
diff --git a/security/tripwire/files/patch-src-core-unixfsservices.h b/security/tripwire/files/patch-src-core-unixfsservices.h
deleted file mode 100644
index ab2fec5bdb18..000000000000
--- a/security/tripwire/files/patch-src-core-unixfsservices.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/unixfsservices.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/core/unixfsservices.h	2014-06-15 01:44:45.000000000 +0200
-@@ -99,7 +99,7 @@ class cUnixFSServices : public iFSServic
-   ////////////////////////////////////////
-   virtual bool    IsCaseSensitive() const;
-   // returns true if the file system is case sensitive
--  virtual TCHAR*      GetStandardBackupExtension() const;
-+  virtual const TCHAR* GetStandardBackupExtension() const;
-   // returns normal string to append to backup files for this os.
-   // (e.g. "~" for unix and ".bak" for winos)
-   virtual TCHAR       GetPathSeperator() const;
diff --git a/security/tripwire/files/patch-src-cryptlib-algebra.h b/security/tripwire/files/patch-src-cryptlib-algebra.h
deleted file mode 100644
index af4a03e9d92e..000000000000
--- a/security/tripwire/files/patch-src-cryptlib-algebra.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cryptlib/algebra.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/cryptlib/algebra.h	2014-06-15 01:42:42.000000000 +0200
-@@ -273,7 +273,7 @@ template <class T> T AbstractEuclideanDo
- 	Element g[3]={b, a};
- 	unsigned int i0=0, i1=1, i2=2;
- 
--	while (!Equal(g[i1], this->Zero()))
-+	while (!this->Equal(g[i1], this->Zero()))
- 	{
- 		g[i2] = Mod(g[i0], g[i1]);
- 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
diff --git a/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp b/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp
deleted file mode 100644
index 035cb6bdd9da..000000000000
--- a/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cryptlib/cryptlib.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/cryptlib/cryptlib.cpp	2014-06-15 01:42:35.000000000 +0200
-@@ -43,8 +43,8 @@ void StreamCipher::ProcessString(byte *o
- 
- void StreamCipher::ProcessString(byte *inoutString, unsigned int length)
- {
--	while(length--)
--		*inoutString++ = ProcessByte(*inoutString);
-+	for(;length--; inoutString++)
-+		*inoutString = ProcessByte(*inoutString);
- }
- 
- bool MessageAuthenticationCode::Verify(const byte *macIn)
diff --git a/security/tripwire/files/patch-src-fco-fcospec.cpp b/security/tripwire/files/patch-src-fco-fcospec.cpp
deleted file mode 100644
index 1b992f9e9872..000000000000
--- a/security/tripwire/files/patch-src-fco-fcospec.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fco/fcospec.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/fco/fcospec.cpp	2014-06-15 01:50:46.000000000 +0200
-@@ -51,6 +51,7 @@
- class cDefaultSpecMask : public iFCOSpecMask
- {
- public:
-+	cDefaultSpecMask() {}
- 	virtual const TSTRING& GetName() const;
- 	virtual bool Accept(const iFCO* pFCO) const;
- private:
diff --git a/security/tripwire/files/patch-src-fco-parsergenreutil.h b/security/tripwire/files/patch-src-fco-parsergenreutil.h
deleted file mode 100644
index 76f5c5f6c8e9..000000000000
--- a/security/tripwire/files/patch-src-fco-parsergenreutil.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fco/parsergenreutil.h.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/fco/parsergenreutil.h	2014-06-15 01:55:46.000000000 +0200
-@@ -53,6 +53,7 @@ class cFCOName;
- class iParserGenreUtil
- {
- public:
-+    virtual ~iParserGenreUtil() {}
-     virtual bool MapStringToProperty( const TSTRING& str, int& propIndex ) const = 0;
-         // maps the given string  to an index into a property vector for the genre
-     virtual void AddSubTypeProps( cFCOPropVector& v ) const = 0;
diff --git a/security/tripwire/files/patch-src-tripwire-mailmessage.cpp b/security/tripwire/files/patch-src-tripwire-mailmessage.cpp
deleted file mode 100644
index fd642442696e..000000000000
--- a/security/tripwire/files/patch-src-tripwire-mailmessage.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tripwire/mailmessage.cpp.orig	2011-11-21 17:06:56.000000000 +0100
-+++ src/tripwire/mailmessage.cpp	2014-06-15 01:56:20.000000000 +0200
-@@ -258,7 +258,7 @@ bool cMailMessageUtil::ReadDate( TSTRING
- }
- 
- 
--static char* util_Get_IANA_CharSet()
-+static const char* util_Get_IANA_CharSet()
- {
-     const char* pCP = setlocale( LC_CTYPE, NULL );
- 
diff --git a/security/tripwire/files/patch-src-tw-fcoreport.h b/security/tripwire/files/patch-src-tw-fcoreport.h
deleted file mode 100644
index 3cf3fef3c28a..000000000000
--- a/security/tripwire/files/patch-src-tw-fcoreport.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tw/fcoreport.h.orig	2005-09-15 20:12:37.000000000 -0700
-+++ src/tw/fcoreport.h	2007-10-09 23:53:39.000000000 -0700
-@@ -74,6 +74,7 @@
- class cFCOName;
- class cFCOReport_i;
- class cFCOReportGenreIter_i;
-+class cFCOReportSpecIter;
- class cFCOReportSpecIter_i;
- class cFCOReportChangeIter_i;
- class iFCOSpec;
diff --git a/security/tripwire/files/patch-src__core__msystem.h b/security/tripwire/files/patch-src__core__msystem.h
deleted file mode 100644
index 1bb9e29934e2..000000000000
--- a/security/tripwire/files/patch-src__core__msystem.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/core/msystem.h.orig	Fri Oct 27 18:15:20 2000
-+++ src/core/msystem.h	Fri Feb 22 13:53:33 2002
-@@ -114,7 +114,11 @@
- #	define GID_RESET	-2		/* reset EGID to RGID */
- #endif
- #ifndef DEF_PATH
--#	define DEF_PATH	"PATH=/bin:/usr/bin:/usr/ucb"  /* default search path */
-+#ifdef __FreeBSD_cc_version
-+#	define DEF_PATH	"PATH=/sbin:/usr/sbin:/bin:/usr/bin"  /* default search path */
-+#else
-+#	define DEF_PATH "PATH=/bin:/usr/bin:/usr/ucb"	/* default search path */
-+#endif
- #endif
- #ifndef DEF_SHELL
- #	define DEF_SHELL	"SHELL=/bin/sh"	/* default shell */
diff --git a/security/tripwire/pkg-plist b/security/tripwire/pkg-plist
index 72ce4610fb65..caadcd3d6234 100644
--- a/security/tripwire/pkg-plist
+++ b/security/tripwire/pkg-plist
@@ -9,6 +9,7 @@ man/man8/twprint.8.gz
 sbin/tripwire
 sbin/twadmin
 sbin/twprint
+sbin/twtest
 sbin/siggen
 share/doc/tripwire/COPYING
 share/doc/tripwire/TRADEMARK