<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d099f824e14daaa03f75ac6628287327f70a0647">https://github.com/macports/macports-ports/commit/d099f824e14daaa03f75ac6628287327f70a0647</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d099f824e14 tripwire: Update to 2.4.3.7
</span>d099f824e14 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d099f824e14daaa03f75ac6628287327f70a0647
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun May 9 16:36:39 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> tripwire: Update to 2.4.3.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62840
</span>---
security/tripwire/Portfile | 56 ++++++-----------
security/tripwire/files/Makefile.in.patch | 13 ++++
...tch-install.cfg => installer-install.cfg.patch} | 5 +-
...patch-install.sh => installer-install.sh.patch} | 72 +++++++++++-----------
security/tripwire/files/patch-Makefile.am | 8 ---
security/tripwire/files/patch-aclocal.m4 | 39 ------------
security/tripwire/files/patch-configure.ac.diff | 27 --------
security/tripwire/files/patch-platform.h | 11 ----
security/tripwire/files/patch-src_core_archive.cpp | 13 ----
.../tripwire/files/patch-src_cryptlib_algebra.h | 11 ----
security/tripwire/files/patch-src_fco_fcospec.cpp | 10 ---
security/tripwire/files/src-core-platform.h.patch | 12 ++++
12 files changed, 83 insertions(+), 194 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/Portfile b/security/tripwire/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0686416b0a..a07f9f00a7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tripwire/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Tripwire tripwire-open-source 2.4.3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 33942a8559f34bfa804f41444470fe3f4fc54071 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18d40b85f04b8822717d9a3e987887600840a3753f0e9a9f6ab77692d5658450 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1002257
</span>
name tripwire
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span> categories security
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,47 +26,23 @@ long_description Tripwire software is a tool that checks to see what \
</span> other purposes such as integrity assurance, change \
management, policy compliance and more.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://sourceforge.net/projects/tripwire/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:tripwire/tripwire-src/tripwire-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${distname}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 00a307f7efae7c441a7f62e38850ead053158f6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
depends_lib path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-platform.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-aclocal.m4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-install.cfg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-install.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_cryptlib_algebra.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_core_archive.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_fco_fcospec.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} aclocal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installer-install.cfg.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installer-install.sh.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-core-platform.h.patch
</span>
configure.args --sysconfdir="${prefix}/etc/${name}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/steakknife/tripwire/issues/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Installation locations
set bindir "${prefix}/sbin"
set sysconfdir "${prefix}/etc/${name}"
set vardbdir "${prefix}/var/db/${name}"
set docdir "${prefix}/share/doc/${name}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_exists anacron] && [variant_isset anacron]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset anacron]} {
</span> set crondir "${prefix}/etc/cron.daily"
} else {
set crondir "${docdir}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,16 +80,15 @@ post-destroot {
</span> ${destroot}${docdir}/quickstart.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant anacron {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_run bin:anacron:anacron
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant anacron description {Install script for use with anacron} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:anacron:anacron
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
notes "
Please read the quick start guide located at:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-${prefix}/share/doc/${name}/quickstart.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${docdir}/quickstart.txt
</span>
for post installation configuration instructions and general usage information.
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)-src${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/Makefile.in.patch b/security/tripwire/files/Makefile.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c52d7644e03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tripwire/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When running install.sh, don't prompt, do clobber, and set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sitepassphrase and localpassphrase to none.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2018-03-31 01:05:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2021-05-09 10:45:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -801,7 +801,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_STRIP_FLAG="$(INSTALL_STRIP_FLAG)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_srcdir)/installer/install.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_srcdir)/installer/install.sh -n -f -s none -l none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall-hook:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-install.cfg b/security/tripwire/files/installer-install.cfg.patch
</span>similarity index 71%
rename from security/tripwire/files/patch-install.cfg
rename to security/tripwire/files/installer-install.cfg.patch
<span style='display:block; white-space:pre;color:#808080;'>index 854424399b9..021bb15643d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-install.cfg
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tripwire/files/installer-install.cfg.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install/install.cfg.original Sun Sep 2 06:59:26 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install/install.cfg Sun Sep 2 07:00:25 2007
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix installation directories to conform to porthier(7).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- installer/install.cfg.orig 2018-03-31 01:05:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ installer/install.cfg 2021-05-09 10:27:22.000000000 -0500
</span> @@ -30,13 +30,13 @@
TWPOLICY="${sysconfdir}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-install.sh b/security/tripwire/files/installer-install.sh.patch
</span>similarity index 85%
rename from security/tripwire/files/patch-install.sh
rename to security/tripwire/files/installer-install.sh.patch
<span style='display:block; white-space:pre;color:#808080;'>index 16fd71bed20..0b90e24d25c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-install.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tripwire/files/installer-install.sh.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install/install.sh Sat Sep 1 19:54:34 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install/install.sh Sun Sep 2 07:10:58 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,10 +19,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't add /usr/local/bin to PATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't print "Say 'sh install.sh', not 'sh < install.sh'" message if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+script is invoked in noninteractive mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Support DESTDIR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- installer/install.sh.orig 2018-03-31 01:05:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ installer/install.sh 2021-05-09 10:34:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,12 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## from Larry Wall's metaconfig.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##-------------------------------------------------------
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH='.:/bin:/usr/bin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PATH=".:/bin:/usr/bin:/usr/local/bin:$PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PATH=".:/bin:/usr/bin:$PATH"
</span> export PATH || (echo 'You must use sh to run this script'; kill $$)
-if [ ! -t 0 ] ; then
- echo "Say 'sh install.sh', not 'sh < install.sh'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,47 +18,43 @@
</span>
##-------------------------------------------------------
## The usage message.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,9 +258,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,8 +232,8 @@
</span> ##-------------------------------------------------------
paths="TWBIN TWMAN TWPOLICY TWREPORT TWDB TWSITEKEYDIR TWLOCALKEYDIR"
-path2="TWBIN TWPOLICY TWREPORT TWDB TWSITEKEYDIR TWLOCALKEYDIR"
-path3="TWMAN TWDOCS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> +path2="TWPOLICY TWDB TWREPORT TWSITEKEYDIR TWLOCALKEYDIR"
+path3="TWBIN TWMAN TWDOCS"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ##=======================================================
## User License Agreement
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ##=======================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,6 +274,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,6 +249,11 @@
</span> ##-------------------------------------------------------
if [ "$PROMPT" = "true" ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> + if [ ! -t 0 ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "Say 'sh install.sh', not 'sh < install.sh'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "Say 'sh install.sh', not 'sh < install.sh'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit 1
</span> + fi
+
echo
echo "LICENSE AGREEMENT for Tripwire(R) 2.4 Open Source"
echo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,6 +475,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -482,6 +483,12 @@
</span> eval "echo \"\$${i}\""
fi
done
+if [ -n "$DESTDIR" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "Using destination root directory:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo " $DESTDIR"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTDIR=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "Using destination root directory:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo " $DESTDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo
</span> +fi
##-------------------------------------------------------
## Display value of clobber.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -514,7 +523,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,7 +529,7 @@
</span> ##-------------------------------------------------------
for i in $path2; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +63,7 @@
</span> if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -530,7 +539,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -538,7 +545,7 @@
</span> done
for i in $path3; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +72,7 @@
</span> if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -591,11 +600,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -602,11 +609,11 @@
</span> for i in $loosefiles; do
eval "eval \"\$$i\""
f=${TAR_DIR}$d/$ff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,16 +86,15 @@
</span> if [ $? -eq 0 ]; then
echo "$ff: copied"
chmod "$rr" "$ff" > /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -628,7 +637,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## If user has to enter a passphrase, give some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -653,6 +660,7 @@
</span> ## advice about what is appropriate.
##-------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +if [ -z "$DESTDIR" ]; then
if [ -z "$TW_SITE_PASS" ] || [ -z "$TW_LOCAL_PASS" ]; then
cat << END_OF_TEXT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -676,7 +685,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -700,7 +708,7 @@
</span> if [ $? -ne 0 ] ; then
echo "Error: site key generation failed"
exit 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +103,7 @@
</span> fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -704,9 +713,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,9 +736,10 @@
</span> if [ $? -ne 0 ] ; then
echo "Error: local key generation failed"
exit 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +115,7 @@
</span>
##=======================================================
## Generate tripwire configuration file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -716,7 +726,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -740,7 +749,7 @@
</span> echo "----------------------------------------------"
echo "Generating Tripwire configuration file..."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +124,7 @@
</span> ROOT =$TWBIN
POLFILE =$POLICY_FILE
DBFILE =$TWDB/\$(HOSTNAME).twd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -734,27 +744,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,27 +767,28 @@
</span> END_OF_TEXT
if [ "$TWMAILMETHOD" = "SMTP" ] ; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,12 +153,12 @@
</span> ##=======================================================
## Create signed tripwire configuration file.
##=======================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +if [ -z "$DESTDIR" ]; then
echo
echo "----------------------------------------------"
echo "Creating signed configuration file..."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -796,7 +806,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,7 +830,7 @@
</span> fi
# Set the rights properly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +167,7 @@
</span>
##-------------------------------------------------------
## We keep the cleartext version around.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -810,6 +820,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -834,6 +844,7 @@
</span> that you delete this file manually after you have examined it.
END_OF_TEXT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +175,7 @@
</span>
##=======================================================
## Modify default policy file with file locations
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -820,6 +831,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -844,6 +855,7 @@
</span> echo "Customizing default policy file..."
sed '/@@section GLOBAL/,/@@section FS/ {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,7 +183,7 @@
</span> s?^\(TWROOT=\).*$?TWDOCS='\""$TWDOCS"\"';?
s?^\(TWBIN=\).*$?\1'\""$TWBIN"\"';?
s?^\(TWPOL=\).*$?\1'\""$TWPOLICY"\"';?
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -828,22 +840,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -852,22 +864,23 @@
</span> s?^\(TWLKEY=\).*$?\1'\""$TWLOCALKEYDIR"\"';?
s?^\(TWREPORT=\).*$?\1'\""$TWREPORT"\"';?
s?^\(HOSTNAME=\).*$?\1'"$HOST_NAME"';?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,12 +210,12 @@
</span> ##=======================================================
## Create signed tripwire policy file.
##=======================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +if [ -z "$DESTDIR" ]; then
echo
echo "----------------------------------------------"
echo "Creating signed policy file..."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -902,6 +914,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -926,6 +939,7 @@
</span> a new signed copy of the Tripwire policy.
END_OF_TEXT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-Makefile.am b/security/tripwire/files/patch-Makefile.am
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62e7036e1cc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-Makefile.am
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am Tue Apr 27 17:09:17 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am Tue Apr 27 17:38:39 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,4 +4,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-data-hook:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ./install/install.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ./install/install.sh -n -f -s none -l none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-aclocal.m4 b/security/tripwire/files/patch-aclocal.m4
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d89c10f27f7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4.original Sun Sep 2 10:52:05 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 Sun Sep 2 10:52:33 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,14 +33,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Automake X.Y traces this macro to ensure aclocal.m4 has been
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # generated from the m4 files accompanying Automake X.Y.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.10"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # AM_SET_CURRENT_AUTOMAKE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Call AM_AUTOMAKE_VERSION so it can be traced.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AM_AUTOMAKE_VERSION([1.8.5])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AM_AUTOMAKE_VERSION([1.10])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # AM_AUX_DIR_EXPAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -469,11 +469,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_REQUIRE([AC_PROG_INSTALL])dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # test to see if srcdir already configured
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "`cd $srcdir && pwd`" != "`pwd`" &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test -f $srcdir/config.status; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# is not polluted with repeated "-I."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# test to see if srcdir already configured
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -f $srcdir/config.status; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # test whether we have cygpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$CYGPATH_W"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cygpath --version) >/dev/null 2>/dev/null; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-configure.ac.diff b/security/tripwire/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ac902a2611c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2011-11-21 10:06:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2013-09-02 18:43:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_SRCDIR([src/tw/tw.cpp])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CANONICAL_TARGET([])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_INIT_AUTOMAKE(tripwire, 2.4.2.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CONFIG_HEADER(config.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CONFIG_HEADERS([config.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl #################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Cleanup Cruft Leftover From Patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ###################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Checks for programs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ###################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PROG_MKDIR_P
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_RANLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,6 +407,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Export the variables we use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl #####################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(CORE_CRYPT_O)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([am__isrc], [' -I$(srcdir)'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_FILES([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-platform.h b/security/tripwire/files/patch-platform.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4c2f38e2b8d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-platform.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/platform.h.original Mon Sep 3 09:50:34 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/platform.h Mon Sep 3 09:51:33 2007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __PLATFORM_H
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-src_core_archive.cpp b/security/tripwire/files/patch-src_core_archive.cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 19f56c0fb7a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-src_core_archive.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/archive.cpp.orig 2005-09-16 13:12:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/archive.cpp 2013-03-08 07:28:07.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -886,8 +886,8 @@ void cLockedTemporaryFileArchive::OpenRe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch( eFSServices& e)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eArchiveOpen e(strTempFile, errStr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eArchiveOpen e2(strTempFile, errStr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw e2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ///////////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-src_cryptlib_algebra.h b/security/tripwire/files/patch-src_cryptlib_algebra.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbb4a6761f7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-src_cryptlib_algebra.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cryptlib/algebra.h.orig 2005-09-16 13:12:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cryptlib/algebra.h 2013-03-08 07:21:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -273,7 +273,7 @@ template <class T> T AbstractEuclideanDo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Element g[3]={b, a};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int i0=0, i1=1, i2=2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (!Equal(g[i1], this->Zero()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (!this->Equal(g[i1], this->Zero()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g[i2] = Mod(g[i0], g[i1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/patch-src_fco_fcospec.cpp b/security/tripwire/files/patch-src_fco_fcospec.cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a80820a978..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tripwire/files/patch-src_fco_fcospec.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fco/fcospec.cpp.orig 2005-09-16 13:12:38.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fco/fcospec.cpp 2013-03-08 07:54:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class cDefaultSpecMask : public iFCOSpecMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cDefaultSpecMask(){};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual const TSTRING& GetName() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual bool Accept(const iFCO* pFCO) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tripwire/files/src-core-platform.h.patch b/security/tripwire/files/src-core-platform.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e1884900806
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tripwire/files/src-core-platform.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+config.h is a local header not a system header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/platform.h.orig 2018-03-31 01:05:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/platform.h 2021-05-09 10:23:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __PLATFORM_H
</span></pre><pre style='margin:0'>
</pre>