Date: Sat, 30 Apr 2016 07:16:46 +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: r414333 - in head/security/tripwire: . files Message-ID: <201604300716.u3U7Gk3f015164@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sat Apr 30 07:16:46 2016 New Revision: 414333 URL: https://svnweb.freebsd.org/changeset/ports/414333 Log: Update tripwire 2.4.2.2 --> 2.4.3.1 Reported by: Brian Cox <bcox@tripwire.com> Added: head/security/tripwire/files/patch-man__man5__twfiles.5 (contents, props changed) Deleted: head/security/tripwire/files/patch-src-core-archive.h head/security/tripwire/files/patch-src-core-displayencoder.cpp head/security/tripwire/files/patch-src-core-fsservices.h head/security/tripwire/files/patch-src-core-tw_signal.cpp head/security/tripwire/files/patch-src-core-twlocale.h head/security/tripwire/files/patch-src-core-unixfsservices.cpp head/security/tripwire/files/patch-src-core-unixfsservices.h head/security/tripwire/files/patch-src-cryptlib-algebra.h head/security/tripwire/files/patch-src-cryptlib-cryptlib.cpp head/security/tripwire/files/patch-src-fco-fcospec.cpp head/security/tripwire/files/patch-src-fco-parsergenreutil.h head/security/tripwire/files/patch-src-tripwire-mailmessage.cpp head/security/tripwire/files/patch-src-tw-fcoreport.h head/security/tripwire/files/patch-src__core__msystem.h Modified: head/security/tripwire/Makefile head/security/tripwire/distinfo head/security/tripwire/files/patch-man__man4__twconfig.4 head/security/tripwire/files/patch-man__man4__twpolicy.4 head/security/tripwire/files/patch-man__man5__Makefile.in head/security/tripwire/files/patch-src-core-archive.cpp head/security/tripwire/pkg-plist Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/Makefile Sat Apr 30 07:16:46 2016 (r414333) @@ -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 Modified: head/security/tripwire/distinfo ============================================================================== --- head/security/tripwire/distinfo Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/distinfo Sat Apr 30 07:16:46 2016 (r414333) @@ -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 Modified: head/security/tripwire/files/patch-man__man4__twconfig.4 ============================================================================== --- head/security/tripwire/files/patch-man__man4__twconfig.4 Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/files/patch-man__man4__twconfig.4 Sat Apr 30 07:16:46 2016 (r414333) @@ -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), Modified: head/security/tripwire/files/patch-man__man4__twpolicy.4 ============================================================================== --- head/security/tripwire/files/patch-man__man4__twpolicy.4 Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/files/patch-man__man4__twpolicy.4 Sat Apr 30 07:16:46 2016 (r414333) @@ -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), Modified: head/security/tripwire/files/patch-man__man5__Makefile.in ============================================================================== --- head/security/tripwire/files/patch-man__man5__Makefile.in Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/files/patch-man__man5__Makefile.in Sat Apr 30 07:16:46 2016 (r414333) @@ -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: Added: head/security/tripwire/files/patch-man__man5__twfiles.5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/tripwire/files/patch-man__man5__twfiles.5 Sat Apr 30 07:16:46 2016 (r414333) @@ -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 Modified: head/security/tripwire/files/patch-src-core-archive.cpp ============================================================================== --- head/security/tripwire/files/patch-src-core-archive.cpp Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/files/patch-src-core-archive.cpp Sat Apr 30 07:16:46 2016 (r414333) @@ -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; + } + + /////////////////////////////////////////////////////////////////////////////// Modified: head/security/tripwire/pkg-plist ============================================================================== --- head/security/tripwire/pkg-plist Sat Apr 30 06:44:27 2016 (r414332) +++ head/security/tripwire/pkg-plist Sat Apr 30 07:16:46 2016 (r414333) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604300716.u3U7Gk3f015164>