colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from Tripwire/dev/2.4.3.4 

OST 2.4.3.4
This commit is contained in:
Brian Cox 2017-03-04 23:31:49 -08:00 committed by GitHub
parent 2617c9acec e88df2f226
commit 38f089f701
7 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-03-05 Brian Cox <bcox@tripwire.com>
* Bump version to 2.4.3.4
* Fix issue with printing level 2 reports, introduced by fixing a Clang static analyzer quibble in 2.4.3.3. Sigh.
* 'make install-strip' actually strips binaries now.
2017-02-21 Brian Cox <bcox@tripwire.com> 2017-02-21 Brian Cox <bcox@tripwire.com>
* Bump version to 2.4.3.3 * Bump version to 2.4.3.3
* Run Clang static analyzer & fix some of its quibbles * Run Clang static analyzer & fix some of its quibbles

1
Makefile.am
View File

@ -3,6 +3,7 @@ SUBDIRS = man src
EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging ReadMe-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy installer EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging ReadMe-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy installer
install-data-hook: install-data-hook:
export INSTALL_STRIP_FLAG
prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
./installer/install.sh ./installer/install.sh

1
Makefile.in
View File

@ -798,6 +798,7 @@ uninstall-am:
install-data-hook: install-data-hook:
export INSTALL_STRIP_FLAG
prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
./installer/install.sh ./installer/install.sh

22
configure vendored
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 2.4.3.3 . # From configure.ac Revision: 2.4.3.4 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tripwire 2.4.3.3. # Generated by GNU Autoconf 2.69 for tripwire 2.4.3.4.
# #
# Report bugs to <https://github.com/Tripwire/tripwire-open-source/issues>. # Report bugs to <https://github.com/Tripwire/tripwire-open-source/issues>.
# #
@ -584,8 +584,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='tripwire' PACKAGE_NAME='tripwire'
PACKAGE_TARNAME='tripwire' PACKAGE_TARNAME='tripwire'
PACKAGE_VERSION='2.4.3.3' PACKAGE_VERSION='2.4.3.4'
PACKAGE_STRING='tripwire 2.4.3.3' PACKAGE_STRING='tripwire 2.4.3.4'
PACKAGE_BUGREPORT='https://github.com/Tripwire/tripwire-open-source/issues' PACKAGE_BUGREPORT='https://github.com/Tripwire/tripwire-open-source/issues'
PACKAGE_URL='https://github.com/Tripwire/tripwire-open-source' PACKAGE_URL='https://github.com/Tripwire/tripwire-open-source'
@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures tripwire 2.4.3.3 to adapt to many kinds of systems. \`configure' configures tripwire 2.4.3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1393,7 +1393,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of tripwire 2.4.3.3:";; short | recursive ) echo "Configuration of tripwire 2.4.3.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1504,7 +1504,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
tripwire configure 2.4.3.3 tripwire configure 2.4.3.4
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2391,7 +2391,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by tripwire $as_me 2.4.3.3, which was It was created by tripwire $as_me 2.4.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3365,7 +3365,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='tripwire' PACKAGE='tripwire'
VERSION='2.4.3.3' VERSION='2.4.3.4'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -7633,7 +7633,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by tripwire $as_me 2.4.3.3, which was This file was extended by tripwire $as_me 2.4.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -7700,7 +7700,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
tripwire config.status 2.4.3.3 tripwire config.status 2.4.3.4
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

4
configure.ac
View File

@ -2,14 +2,14 @@ dnl Process this file with autoconf to produce a configure script.
dnl dnl
dnl dnl
AC_INIT([tripwire], [2.4.3.3], [https://github.com/Tripwire/tripwire-open-source/issues], [tripwire], [https://github.com/Tripwire/tripwire-open-source]) AC_INIT([tripwire], [2.4.3.4], [https://github.com/Tripwire/tripwire-open-source/issues], [tripwire], [https://github.com/Tripwire/tripwire-open-source])
AC_CONFIG_SRCDIR([src/tw/tw.cpp]) AC_CONFIG_SRCDIR([src/tw/tw.cpp])
AC_CANONICAL_TARGET([]) AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_COPYRIGHT([The developer of the original code and/or files is Tripwire, Inc. Portions created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights reserved.]) AC_COPYRIGHT([The developer of the original code and/or files is Tripwire, Inc. Portions created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights reserved.])
AC_REVISION([$Revision: 2.4.3.3 $]) AC_REVISION([$Revision: 2.4.3.4 $])
dnl ################################# dnl #################################
dnl Cleanup Cruft Leftover From Patch dnl Cleanup Cruft Leftover From Patch

5
installer/install.sh
View File

@ -605,6 +605,11 @@ for i in $loosefiles; do
fi fi
done done
if [ -n "$INSTALL_STRIP_FLAG" ] ; then
echo "INSTALL_STRIP_FLAG is set, stripping binaries"
strip "$TWBIN/siggen" "$TWBIN/tripwire" "$TWBIN/twadmin" "$TWBIN/twprint"
fi
#Make extra sure we don't install the unit test binary to sbin #Make extra sure we don't install the unit test binary to sbin
if [ -e "$TWBIN/twtest" ] ; then if [ -e "$TWBIN/twtest" ] ; then
rm -f "$TWBIN/twtest" rm -f "$TWBIN/twtest"

15
src/tw/textreportviewer.cpp
View File

@ -1519,9 +1519,6 @@ void cTextReportViewer::DisplayChangedProps( const iFCO* const pfcoOld, const iF
void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList ) void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList )
{ {
if (!pFCONameList)
return;
if( ! ri.GetAddedSet()->IsEmpty() ) if( ! ri.GetAddedSet()->IsEmpty() )
{ {
(*mpOut) << TSS_GetString( cTW, tw::STR_ADDED ) << _T(":") << endl; (*mpOut) << TSS_GetString( cTW, tw::STR_ADDED ) << _T(":") << endl;
@ -1533,7 +1530,7 @@ void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOLis
PrintBallotLine( *pSetIterAdded->FCO() ); PrintBallotLine( *pSetIterAdded->FCO() );
// if we're updating, save a list of FCO names // if we're updating, save a list of FCO names
if( mfUpdate ) if( mfUpdate && pFCONameList)
pFCONameList->insert( pSetIterAdded->FCO()->GetName() ); pFCONameList->insert( pSetIterAdded->FCO()->GetName() );
} }
(*mpOut) << endl; (*mpOut) << endl;
@ -1542,9 +1539,6 @@ void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOLis
void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList) void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList)
{ {
if (!pFCONameList)
return;
if( ! ri.GetRemovedSet()->IsEmpty() ) if( ! ri.GetRemovedSet()->IsEmpty() )
{ {
(*mpOut) << TSS_GetString( cTW, tw::STR_REMOVED ) << _T(":") << endl; (*mpOut) << TSS_GetString( cTW, tw::STR_REMOVED ) << _T(":") << endl;
@ -1556,7 +1550,7 @@ void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOL
PrintBallotLine( *pSetIterRemoved->FCO() ); PrintBallotLine( *pSetIterRemoved->FCO() );
// if we're updating, save a list of FCO names // if we're updating, save a list of FCO names
if( mfUpdate ) if( mfUpdate && pFCONameList)
pFCONameList->insert( pSetIterRemoved->FCO()->GetName() ); pFCONameList->insert( pSetIterRemoved->FCO()->GetName() );
} }
(*mpOut) << endl; (*mpOut) << endl;
@ -1565,9 +1559,6 @@ void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOL
void cTextReportViewer::OutputChangedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList ) void cTextReportViewer::OutputChangedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList )
{ {
if (!pFCONameList)
return;
if( ri.GetNumChanged() > 0 ) if( ri.GetNumChanged() > 0 )
{ {
(*mpOut) << TSS_GetString( cTW, tw::STR_CHANGED ) << _T(":") << endl; (*mpOut) << TSS_GetString( cTW, tw::STR_CHANGED ) << _T(":") << endl;
@ -1579,7 +1570,7 @@ void cTextReportViewer::OutputChangedSummary( const cFCOReportSpecIter& ri, FCOL
PrintBallotLine( *changedIter.GetNew() ); PrintBallotLine( *changedIter.GetNew() );
// if we're updating, save a list of FCO names // if we're updating, save a list of FCO names
if( mfUpdate ) if( mfUpdate && pFCONameList)
pFCONameList->insert( changedIter.GetNew()->GetName() ); pFCONameList->insert( changedIter.GetNew()->GetName() );
} }