Update 2.4.3.6 --> 2.4.3.7

This commit is contained in:
Cy Schubert 2018-04-01 13:38:59 +00:00
parent 735677c2d1
commit 9273559cd8
6 changed files with 22 additions and 35 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tripwire
PORTVERSION= 2.4.3.6
PORTVERSION= 2.4.3.7
CATEGORIES= security
MAINTAINER= cy@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1510952538
SHA256 (Tripwire-tripwire-open-source-2.4.3.6_GH0.tar.gz) = f55fe6805f2c159bd67fa3761ba52df95b2a7d0bdd06196847564bac00dd5606
SIZE (Tripwire-tripwire-open-source-2.4.3.6_GH0.tar.gz) = 1001145
TIMESTAMP = 1522588176
SHA256 (Tripwire-tripwire-open-source-2.4.3.7_GH0.tar.gz) = 18d40b85f04b8822717d9a3e987887600840a3753f0e9a9f6ab77692d5658450
SIZE (Tripwire-tripwire-open-source-2.4.3.7_GH0.tar.gz) = 1002257

View file

@ -1,5 +1,5 @@
--- Makefile.in.orig 2017-10-01 19:49:45.000000000 -0700
+++ Makefile.in 2017-11-17 13:10:21.882484000 -0800
--- Makefile.in.orig 2018-03-30 23:05:50.000000000 -0700
+++ Makefile.in 2018-04-01 06:12:25.219417000 -0700
@@ -727,7 +727,6 @@
install-data-am:
@ -8,12 +8,12 @@
install-dvi: install-dvi-recursive
install-dvi-am:
@@ -799,7 +798,7 @@
@@ -798,7 +797,7 @@
install-data-hook:
export INSTALL_STRIP_FLAG
- prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
+ STGDIR="$$STAGEDIR" prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
$(top_srcdir)/installer/install.sh
- INSTALL_STRIP_FLAG="$(INSTALL_STRIP_FLAG)" \
+ STGDIR="$$STAGEDIR" INSTALL_STRIP_FLAG="$(INSTALL_STRIP_FLAG)" \
prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
$(top_srcdir)/installer/install.sh

View file

@ -1,11 +1,11 @@
--- 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
--- man/man4/twconfig.4.orig 2018-03-30 23:05:50.000000000 -0700
+++ man/man4/twconfig.4 2018-04-01 06:21:21.327692000 -0700
@@ -35,7 +35,7 @@
..
.nh
.ad l
-.TH TWCONFIG 4 "1 July 2000"
+.TH TWCONFIG 5 "1 July 2000"
-.TH TWCONFIG 4 "04 Jan 2018" "Open Source Tripwire 2.4"
+.TH TWCONFIG 5 "04 Jan 2018" "Open Source Tripwire 2.4"
.SH NAME
twconfig \- \fITripwire\fP configuration file reference
.SH DESCRIPTION
@ -33,7 +33,7 @@
.Fi
.if n .in +\n(Tiu
.SS Other Variables
@@ -298,7 +298,7 @@
@@ -318,7 +318,7 @@
.BR twadmin (8),
.BR twprint (8),
.BR siggen (8),

View file

@ -1,11 +1,11 @@
--- 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
--- man/man4/twpolicy.4.orig 2018-03-30 23:05:50.000000000 -0700
+++ man/man4/twpolicy.4 2018-04-01 06:23:06.577543000 -0700
@@ -36,7 +36,7 @@
.\"
.nh
.ad l
-.TH TWPOLICY 4 "1 July 2000"
+.TH TWPOLICY 5 "1 July 2000"
-.TH TWPOLICY 4 "04 Jan 2018" "Open Source Tripwire 2.4"
+.TH TWPOLICY 5 "04 Jan 2018" "Open Source Tripwire 2.4"
.SH NAME
twpolicy \- \fITripwire\fP policy file reference
.SH DESCRIPTION

View file

@ -1,13 +0,0 @@
--- 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;
}
///////////////////////////////////////////////////////////////////////////////