From 1ad9ead388686f2fba0b3b3e05d8a0ddb541a388 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Sun, 26 Feb 2017 22:06:20 -0800 Subject: [PATCH 1/3] Update version to 2.4.3.4; fix level 2 reporting that got broken in 2.4.3.3 --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- src/tw/textreportviewer.cpp | 15 +++------------ 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 1dca42e..a174aa1 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /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. -# 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 . # @@ -584,8 +584,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tripwire' PACKAGE_TARNAME='tripwire' -PACKAGE_VERSION='2.4.3.3' -PACKAGE_STRING='tripwire 2.4.3.3' +PACKAGE_VERSION='2.4.3.4' +PACKAGE_STRING='tripwire 2.4.3.4' PACKAGE_BUGREPORT='https://github.com/Tripwire/tripwire-open-source/issues' 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. # This message is too long to be a string in the A/UX 3.1 sh. 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]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then 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 cat <<\_ACEOF @@ -1504,7 +1504,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tripwire configure 2.4.3.3 +tripwire configure 2.4.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2391,7 +2391,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while 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 $ $0 $@ @@ -3365,7 +3365,7 @@ fi # Define the identity of the package. PACKAGE='tripwire' - VERSION='2.4.3.3' + VERSION='2.4.3.4' 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 # values after options handling. 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 CONFIG_FILES = $CONFIG_FILES @@ -7700,7 +7700,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 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, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 40935af..ebefa51 100644 --- a/configure.ac +++ b/configure.ac @@ -2,14 +2,14 @@ dnl Process this file with autoconf to produce a configure script. 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_CANONICAL_TARGET([]) AM_INIT_AUTOMAKE 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_REVISION([$Revision: 2.4.3.3 $]) +AC_REVISION([$Revision: 2.4.3.4 $]) dnl ################################# dnl Cleanup Cruft Leftover From Patch diff --git a/src/tw/textreportviewer.cpp b/src/tw/textreportviewer.cpp index 82c9bda..bbbf5ea 100644 --- a/src/tw/textreportviewer.cpp +++ b/src/tw/textreportviewer.cpp @@ -1519,9 +1519,6 @@ void cTextReportViewer::DisplayChangedProps( const iFCO* const pfcoOld, const iF void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList ) { - if (!pFCONameList) - return; - if( ! ri.GetAddedSet()->IsEmpty() ) { (*mpOut) << TSS_GetString( cTW, tw::STR_ADDED ) << _T(":") << endl; @@ -1533,7 +1530,7 @@ void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOLis PrintBallotLine( *pSetIterAdded->FCO() ); // if we're updating, save a list of FCO names - if( mfUpdate ) + if( mfUpdate && pFCONameList) pFCONameList->insert( pSetIterAdded->FCO()->GetName() ); } (*mpOut) << endl; @@ -1542,9 +1539,6 @@ void cTextReportViewer::OutputAddedSummary( const cFCOReportSpecIter& ri, FCOLis void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList) { - if (!pFCONameList) - return; - if( ! ri.GetRemovedSet()->IsEmpty() ) { (*mpOut) << TSS_GetString( cTW, tw::STR_REMOVED ) << _T(":") << endl; @@ -1556,7 +1550,7 @@ void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOL PrintBallotLine( *pSetIterRemoved->FCO() ); // if we're updating, save a list of FCO names - if( mfUpdate ) + if( mfUpdate && pFCONameList) pFCONameList->insert( pSetIterRemoved->FCO()->GetName() ); } (*mpOut) << endl; @@ -1565,9 +1559,6 @@ void cTextReportViewer::OutputRemovedSummary( const cFCOReportSpecIter& ri, FCOL void cTextReportViewer::OutputChangedSummary( const cFCOReportSpecIter& ri, FCOList* pFCONameList ) { - if (!pFCONameList) - return; - if( ri.GetNumChanged() > 0 ) { (*mpOut) << TSS_GetString( cTW, tw::STR_CHANGED ) << _T(":") << endl; @@ -1579,7 +1570,7 @@ void cTextReportViewer::OutputChangedSummary( const cFCOReportSpecIter& ri, FCOL PrintBallotLine( *changedIter.GetNew() ); // if we're updating, save a list of FCO names - if( mfUpdate ) + if( mfUpdate && pFCONameList) pFCONameList->insert( changedIter.GetNew()->GetName() ); } From c4c8821145699972f5d1e88e202a080f07325699 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Sat, 4 Mar 2017 22:56:55 -0800 Subject: [PATCH 2/3] Fix install-strip target so it actually strips binaries --- Makefile.am | 1 + Makefile.in | 1 + installer/install.sh | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/Makefile.am b/Makefile.am index 924300c..e0446a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 install-data-hook: + export INSTALL_STRIP_FLAG prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ ./installer/install.sh diff --git a/Makefile.in b/Makefile.in index fd7dc2b..f9e3f25 100644 --- a/Makefile.in +++ b/Makefile.in @@ -798,6 +798,7 @@ uninstall-am: install-data-hook: + export INSTALL_STRIP_FLAG prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ ./installer/install.sh diff --git a/installer/install.sh b/installer/install.sh index e1d57ab..6957da9 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -605,6 +605,11 @@ for i in $loosefiles; do fi 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 if [ -e "$TWBIN/twtest" ] ; then rm -f "$TWBIN/twtest" From e88df2f2260ac391c41e4907ed9e5429274bfed2 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Sat, 4 Mar 2017 23:27:27 -0800 Subject: [PATCH 3/3] update ChangeLog --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 657af5c..deca8d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-05 Brian Cox + * 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 * Bump version to 2.4.3.3 * Run Clang static analyzer & fix some of its quibbles