Index: head/security/tripwire/Makefile =================================================================== --- head/security/tripwire/Makefile (revision 414332) +++ head/security/tripwire/Makefile (revision 414333) @@ -1,185 +1,186 @@ # Created by: Cy Schubert # $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 MAKE_ARGS= SYSPRE=${ARCH}-unknown-freebsd \ DESTDIR=${STAGEDIR} M4= /usr/bin/m4 # Tripwire database files are stored in TWDB. TWDB?= /var/db/tripwire # If TW_CLOBBER is set to true, the install script clobbers # previously installed config files. # # If TW_PROMPT is set to true, the install script is interactive. OPTIONS_SINGLE= TWCFG OPTIONS_SINGLE_TWCFG= TWCFG_ETC TWCFG_TWDB OPTIONS_DEFINE= TW_CLOBBER TW_PROMPT SW_ONLY DB_BUILD OPTIONS_DEFAULT= TWCFG_ETC TW_PROMPT DB_BUILD TWCFG_ETC_DESC= Put config files in ${ETCDIR} TWCFG_TWDB_DESC= Put config files in ${TWDB}/etc TW_CLOBBER_DESC= Clobber existing database files at install TW_PROMPT_DESC= Interactive install (ignored when PACKAGE_BUILDING) SW_ONLY_DESC= Install software only, do not post-configure (ignored when PACKAGE_BUILDING) DB_BUILD_DESC= Build database during post-install (ignored when PACKAGE_BUILDING) PACKAGE_BUILDING= yes .ifndef PACKAGE_BUILDING BROKEN= for testing only .endif .include # Tripwire config files are stored in TWCFG .if ${PORT_OPTIONS:MTWCFG_ETC} TWCFG?= ${ETCDIR} .endif .if ${PORT_OPTIONS:MTWCFG_TWDB} TWCFG?= ${TWDB}/etc .endif .if ${PORT_OPTIONS:MTW_CLOBBER} TW_CLOBBER= true .else TW_CLOBBER= false .endif .if ${PORT_OPTIONS:MTW_PROMPT} TW_PROMPT= true .else TW_PROMPT= false # TW_SITE_PASS?= FreeBSD .ifndef TW_SITE_PASS BROKEN= No site passphrase specified or turn PROMPT on .endif # TW_LOCAL_PASS?= FreeBSD .ifndef TW_LOCAL_PASS BROKEN= No local passphrase specified or turn PROMPT on .endif .endif # Tripwire policy files are stored in TWPOLICY. TWPOLICY?= ${TWCFG} # The Tripwire site key files are stored in TWSITEKEYDIR. TWSITEKEYDIR?= ${TWPOLICY} # The Tripwire local key files are stored in TWLOCALKEYDIR. TWLOCALKEYDIR?= ${TWPOLICY} # Tripwire report files are stored in TWREPORT. TWREPORT?= ${TWDB}/report # This sets the default text editor for Tripwire. TWEDITOR?= /usr/bin/vi # This sets the location of the twpol.txt file that is to be installed TWPOL_TXT?= ${FILESDIR}/twpol.m4 CONFIGURE_ARGS= --prefix=${PREFIX} --program-transform-name='' --sysconfdir=${TWCFG} PLIST_SUB+= TWCFG=${TWCFG} TWDB=${TWDB} PKGPOSTINSTALL= ${WRKDIR}/pkg-postinstall PKGPOSTDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-deinstall SUB_LIST= TWCFG=${TWCFG} TWDB=${TWDB} pre-configure: @ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} > ${WRKSRC}/policy/twpol-FreeBSD.txt @ ${MV} ${WRKSRC}/src/core/stdcore.h ${WRKSRC}/src/core/stdcore.h.orig @ ${SED} 's%^# define CONFIG_FILE_ROOT "${TWCFG}"%# define CONFIG_FILE_ROOT "${TWCFG}"%' ${WRKSRC}/src/core/stdcore.h.orig > ${WRKSRC}/src/core/stdcore.h @ ${MV} ${WRKSRC}/man/man4/twconfig.4 ${WRKSRC}/man/man5/twconfig.5 @ ${MV} ${WRKSRC}/man/man4/twpolicy.4 ${WRKSRC}/man/man5/twpolicy.5 @ ${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 .ifdef TW_SITE_PASS @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/install/install.cfg .endif .ifdef TW_LOCAL_PASS @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/install/install.cfg .endif @ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/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 .if ${PORT_OPTIONS:MSW_ONLY} @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${MAKE_CMD} install-data-hook .endif .endif make-pkg-install: @ ${ECHO_CMD} '#!/bin/sh -' > ${PKGPOSTINSTALL} @ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} "# Generated by make-${PKGPOSTINSTALL} on `date`" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'case $$2 in' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'POST-INSTALL) ;;' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} '*) exit 0;;' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'esac' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} PREFIX="$(PREFIX)" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} sysconfdir="$(sysconfdir)" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} prefix=${PREFIX} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} sysconfdir=${TWCFG} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} path_to_vi="/usr/bin/vi" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} path_to_sendmail="/usr/sbin/sendmail" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} BASE_DIR=${PREFIX}/ >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} BIN_DIR=${PREFIX}/sbin >> ${PKGPOSTINSTALL} .ifdef TW_SITE_PASS @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${PKGPOSTINSTALL} .endif .ifdef TW_LOCAL_PASS @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGPOSTINSTALL} .endif @ ${CAT} ${WRKSRC}/install/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} create-database: .ifndef PACKAGE_BUILDING .if ${PORT_OPTIONS:MDB_BUILD} .if ${PORT_OPTIONS:MSW_ONLY} @ ${ECHO} SW_ONLY has been specified, database will not be built. .else @ ${MKDIR} ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \ ${TWDB} ${TWREPORT} @ ${ECHO} Creating tripwire database @ cd ${TWCFG} && ${PREFIX}/sbin/tripwire --init @ ${ECHO_CMD} @ ${ECHO} The tripwire database, configuration file and @ ${ECHO} policy file are signed using the local and site keys, @ ${ECHO} therefore the authors suggest creating a floppy is not necessary. .endif .endif .endif post-install: install-config-files create-database make-pkg-install .include Index: head/security/tripwire/distinfo =================================================================== --- head/security/tripwire/distinfo (revision 414332) +++ head/security/tripwire/distinfo (revision 414333) @@ -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 Index: head/security/tripwire/files/patch-src-core-displayencoder.cpp =================================================================== --- head/security/tripwire/files/patch-src-core-displayencoder.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-core-displayencoder.cpp (nonexistent) @@ -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 Property changes on: head/security/tripwire/files/patch-src-core-displayencoder.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-unixfsservices.h =================================================================== --- head/security/tripwire/files/patch-src-core-unixfsservices.h (revision 414332) +++ head/security/tripwire/files/patch-src-core-unixfsservices.h (nonexistent) @@ -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; Property changes on: head/security/tripwire/files/patch-src-core-unixfsservices.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-tripwire-mailmessage.cpp =================================================================== --- head/security/tripwire/files/patch-src-tripwire-mailmessage.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-tripwire-mailmessage.cpp (nonexistent) @@ -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 ); - Property changes on: head/security/tripwire/files/patch-src-tripwire-mailmessage.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-fco-parsergenreutil.h =================================================================== --- head/security/tripwire/files/patch-src-fco-parsergenreutil.h (revision 414332) +++ head/security/tripwire/files/patch-src-fco-parsergenreutil.h (nonexistent) @@ -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; Property changes on: head/security/tripwire/files/patch-src-fco-parsergenreutil.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-fco-fcospec.cpp =================================================================== --- head/security/tripwire/files/patch-src-fco-fcospec.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-fco-fcospec.cpp (nonexistent) @@ -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: Property changes on: head/security/tripwire/files/patch-src-fco-fcospec.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-twlocale.h =================================================================== --- head/security/tripwire/files/patch-src-core-twlocale.h (revision 414332) +++ head/security/tripwire/files/patch-src-core-twlocale.h (nonexistent) @@ -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 - } - } Property changes on: head/security/tripwire/files/patch-src-core-twlocale.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-unixfsservices.cpp =================================================================== --- head/security/tripwire/files/patch-src-core-unixfsservices.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-core-unixfsservices.cpp (nonexistent) @@ -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"); - } Property changes on: head/security/tripwire/files/patch-src-core-unixfsservices.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src__core__msystem.h =================================================================== --- head/security/tripwire/files/patch-src__core__msystem.h (revision 414332) +++ head/security/tripwire/files/patch-src__core__msystem.h (nonexistent) @@ -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 */ Property changes on: head/security/tripwire/files/patch-src__core__msystem.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-tw_signal.cpp =================================================================== --- head/security/tripwire/files/patch-src-core-tw_signal.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-core-tw_signal.cpp (nonexistent) @@ -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"), Property changes on: head/security/tripwire/files/patch-src-core-tw_signal.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-cryptlib-algebra.h =================================================================== --- head/security/tripwire/files/patch-src-cryptlib-algebra.h (revision 414332) +++ head/security/tripwire/files/patch-src-cryptlib-algebra.h (nonexistent) @@ -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 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; Property changes on: head/security/tripwire/files/patch-src-cryptlib-algebra.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-tw-fcoreport.h =================================================================== --- head/security/tripwire/files/patch-src-tw-fcoreport.h (revision 414332) +++ head/security/tripwire/files/patch-src-tw-fcoreport.h (nonexistent) @@ -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; Property changes on: head/security/tripwire/files/patch-src-tw-fcoreport.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-archive.h =================================================================== --- head/security/tripwire/files/patch-src-core-archive.h (revision 414332) +++ head/security/tripwire/files/patch-src-core-archive.h (nonexistent) @@ -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 Property changes on: head/security/tripwire/files/patch-src-core-archive.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp =================================================================== --- head/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp (nonexistent) @@ -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) Property changes on: head/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-fsservices.h =================================================================== --- head/security/tripwire/files/patch-src-core-fsservices.h (revision 414332) +++ head/security/tripwire/files/patch-src-core-fsservices.h (nonexistent) @@ -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. - - //////////////////////////////////////// Property changes on: head/security/tripwire/files/patch-src-core-fsservices.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-man__man4__twconfig.4 =================================================================== --- head/security/tripwire/files/patch-man__man4__twconfig.4 (revision 414332) +++ head/security/tripwire/files/patch-man__man4__twconfig.4 (revision 414333) @@ -1,20 +1,44 @@ ---- 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 .ad l -.TH TWCONFIG 4 "1 July 2000" +.TH TWCONFIG 5 "1 July 2000" .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), -.BR twpolicy (4), +.BR twpolicy (5), .BR twfiles (5), .BR sendmail (1), .BR vi (1), Index: head/security/tripwire/files/patch-man__man4__twpolicy.4 =================================================================== --- head/security/tripwire/files/patch-man__man4__twpolicy.4 (revision 414332) +++ head/security/tripwire/files/patch-man__man4__twpolicy.4 (revision 414333) @@ -1,18 +1,27 @@ ---- 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 .ad l -.TH TWPOLICY 4 "1 July 2000" +.TH TWPOLICY 5 "1 July 2000" .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), .BR siggen (8), -.BR twconfig (4), +.BR twconfig (5), .BR twfiles (5) Index: head/security/tripwire/files/patch-man__man5__Makefile.in =================================================================== --- head/security/tripwire/files/patch-man__man5__Makefile.in (revision 414332) +++ head/security/tripwire/files/patch-man__man5__Makefile.in (revision 414333) @@ -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: Index: head/security/tripwire/files/patch-man__man5__twfiles.5 =================================================================== --- head/security/tripwire/files/patch-man__man5__twfiles.5 (nonexistent) +++ head/security/tripwire/files/patch-man__man5__twfiles.5 (revision 414333) @@ -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 Property changes on: head/security/tripwire/files/patch-man__man5__twfiles.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-src-core-archive.cpp =================================================================== --- head/security/tripwire/files/patch-src-core-archive.cpp (revision 414332) +++ head/security/tripwire/files/patch-src-core-archive.cpp (revision 414333) @@ -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; + } + + /////////////////////////////////////////////////////////////////////////////// Index: head/security/tripwire/pkg-plist =================================================================== --- head/security/tripwire/pkg-plist (revision 414332) +++ head/security/tripwire/pkg-plist (revision 414333) @@ -1,19 +1,20 @@ man/man5/twfiles.5.gz man/man5/twconfig.5.gz man/man5/twpolicy.5.gz man/man8/siggen.8.gz man/man8/tripwire.8.gz man/man8/twadmin.8.gz man/man8/twintro.8.gz man/man8/twprint.8.gz sbin/tripwire sbin/twadmin sbin/twprint +sbin/twtest sbin/siggen share/doc/tripwire/COPYING share/doc/tripwire/TRADEMARK share/doc/tripwire/policyguide.txt %%ETCDIR%%/twpol-FreeBSD.txt @dir(,,0750) %%ETCDIR%% @dir %%TWDB%%/report @dir %%TWDB%%