Merge pull request #23 from Tripwire/dev/2435

Open Source Tripwire 2.4.3.5

.gitignore

@@ -12,6 +12,7 @@ src/tripwire/tripwire
 src/twadmin/twadmin
 src/twprint/twprint
 src/twtest/twtest
+src/test-harness/twtest
 **/Makefile
 **/*.o
 **/*.dylib

ChangeLog

@@ -1,3 +1,11 @@
+2017-03-30 Brian Cox <[email protected]>
+	* Bump version to 2.4.3.5
+	* Fix ‘install-strip’, ‘check’, ‘uninstall’, and ‘distcheck’ make targets.
+	* Fix GCC 7.0.x warnings; use std::unique_ptr instead of deprecated std::auto_ptr where available.
+	* Add ‘--disable-extrawarnings’ configure option, for old compilers that don’t support the ’-Wextra’ compile option.
+	* Clean up unit tests & enable disabled tests.
+	* Address more static analyzer warnings, including from CppCheck & Flawfinder
+
 2017-03-05 Brian Cox <[email protected]>
 	* 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.

Makefile.am

@@ -6,4 +6,13 @@ 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
+        $(top_srcdir)/installer/install.sh
+
+uninstall-hook:
+	rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen
+	rm -Rf $(prefix)/doc
+
+check:
+	rm -Rf $(top_srcdir)/src/test-harness/twtest
+	cd $(top_srcdir)/src/test-harness && perl ./twtest.pl
+	$(top_srcdir)/bin/twtest all

Makefile.in

@@ -774,9 +774,10 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am:
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(am__recursive_targets) all install-am install-data-am \
-	install-strip
+	install-strip uninstall-am
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
@@ -792,7 +793,7 @@ uninstall-am:
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am
+	tags-am uninstall uninstall-am uninstall-hook
 
 .PRECIOUS: Makefile
 
@@ -801,7 +802,16 @@ 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
+        $(top_srcdir)/installer/install.sh
+
+uninstall-hook:
+	rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen
+	rm -Rf $(prefix)/doc
+
+check:
+	rm -Rf $(top_srcdir)/src/test-harness/twtest
+	cd $(top_srcdir)/src/test-harness && perl ./twtest.pl
+	$(top_srcdir)/bin/twtest all
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

ReadMe-2.4.3

@@ -1,4 +1,14 @@
-What's new in Open Source Tripwire 2.4.3.2:
+What's new in Open Source Tripwire 2.4.3.x:
+
+* Useful ‘install-strip’, ‘check’, ‘uninstall’ & ‘distcheck’ make targets as of OST 2.4.3.5.  Check target invokes both the test-harness framework and twtest unit tests.
+
+* Verify OST builds without errors w/ GCC 7.0.x; fix new warnings from the new compiler, including deprecation warnings; use std::unique_ptr instead of std::auto_ptr where available.
+
+* Add ‘--disable-extrawarnings’ configure option, for old compilers that don’t support the ’-Wextra’ compile option.
+
+* Clean up unit tests, enable various disabled tests, make results more useful.
+
+* Additional cleanup due to static analysis tool results (CppCheck, Flawfinder, Clang analyzer).
 
 * OST now includes optional iconv support when configured with --enable-iconv.
 When enabled, binary database & report files store paths as UTF-16, making these files more
@@ -29,11 +39,6 @@ specifying a build directory outside the source dir now works as expected.
 * Assorted platform tweaks:  Add DOS/FreeDOS + DJGPP as a new platform; support Cygwin
 //host/share/path syntax for UNC paths; passphrase & tempfile fixes for AROS.
 
-
-======================================
-
-What was new in earlier 2.4.3 versions:
-
 * This update fixes compilation errors on modern compilers (GCC 4.7+ and LLVM/clang), 
 as well as some additional errors encountered on various platforms.  This is intended
 to supersede patches against 2.4.2.x, e.g. http://www.linuxfromscratch.org/blfs/view/svn/postlfs/tripwire.html
@@ -66,15 +71,22 @@ defined incorrectly otherwise.
 The update has been tested on a variety of platforms: 
 
 Linuxes
-- CentOS 7 (amd64) + gcc 4.8.5
-- Ubuntu 14.0.4 (amd64) + gcc 4.x
-- RHEL 3.4 (Itanium) + gcc 3.4.3
 - Alpine Linux 3.3.3 + gcc 5.3.0
-- Android 6.0 (arm) + gcc 4.9
+- Alpine Linux 3.5.1 + gcc 6.2.1
+- Arch Linux 232 + gcc 6.3.1
+- Amazon Linux AMI 2016.09 + gcc 4.8.3
+- Android 6.0 (arm) + gcc 4.9 (NDK)
+- CentOS 7 (amd64) + gcc 4.8.5
+- Fedora 24 Alpha 7 (amd64) + gcc 6.0.0
+- Fedora 27 Rawhide (amd64) + gcc 7.0.1
 - Raspbian 7 (wheezy) (armv6l) + gcc 4.6.3
-- openSuSE Tumbleweed (20160408) (i586) + gcc 5.3.1
+- RHEL 3.4 (Itanium) + gcc 3.4.3
 - RHEL 6.0 (powerpc64) + gcc 4.4.4
-- Fedora 24 Alpha 7 (amd64) + gcc 6.0.0
+- openSuSE Tumbleweed (20160408) (i586) + gcc 5.3.1
+- Oracle Linux 6.8 + gcc 4.4.7
+- Ubuntu 14.0.4 (amd64) + gcc 4.x
+- Ubuntu 16.0.4 (amd64) + gcc 5.4.0
+- Wind River Pulsar Linux 8 + gcc 5.2.0
 
 OSX
 - Mac OS X 10.11 + LLVM 7.0.2 / clang-700.1.81
@@ -90,7 +102,7 @@ BSDs
 UNIXes
 - Solaris 10 SPARC + gcc 3.4.6
 - Solaris 10 x86 + gcc 3.4.3
-- OpenIndiana 151 + gcc 4.8.5 [an OpenSolaris/illumos distro]
+- OpenIndiana 151 + gcc 4.8.5
 - AIX 5.2 + gcc 4.3.1
 - HP-UX 11.23 + gcc 4.2.3
 

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 2.4.3.4 .
+# From configure.ac Revision: 2.4.3.5 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tripwire 2.4.3.4.
+# Generated by GNU Autoconf 2.69 for tripwire 2.4.3.5.
 #
 # Report bugs to <https://github.com/Tripwire/tripwire-open-source/issues>.
 #
@@ -584,8 +584,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tripwire'
 PACKAGE_TARNAME='tripwire'
-PACKAGE_VERSION='2.4.3.4'
-PACKAGE_STRING='tripwire 2.4.3.4'
+PACKAGE_VERSION='2.4.3.5'
+PACKAGE_STRING='tripwire 2.4.3.5'
 PACKAGE_BUGREPORT='https://github.com/Tripwire/tripwire-open-source/issues'
 PACKAGE_URL='https://github.com/Tripwire/tripwire-open-source'
 
@@ -748,6 +748,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
+enable_extrawarnings
 enable_static
 enable_debug
 enable_dependency_tracking
@@ -1321,7 +1322,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.4 to adapt to many kinds of systems.
+\`configure' configures tripwire 2.4.3.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1393,7 +1394,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tripwire 2.4.3.4:";;
+     short | recursive ) echo "Configuration of tripwire 2.4.3.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1403,6 +1404,7 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  —-disable-extrawarnings do not compile with -Wextra warnings enabled
   --enable-static         compile static binaries
   --enable-debug          compile with debuging enabled
   --enable-dependency-tracking
@@ -1504,7 +1506,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tripwire configure 2.4.3.4
+tripwire configure 2.4.3.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2391,7 +2393,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.4, which was
+It was created by tripwire $as_me 2.4.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3365,7 +3367,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tripwire'
- VERSION='2.4.3.4'
+ VERSION='2.4.3.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3460,15 +3462,21 @@ fi
 
 ac_config_headers="$ac_config_headers config.h"
 
+CFLAGS=${CFLAGS:-"-O -pipe -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
+CXXFLAGS=${CXXFLAGS:-"-O -pipe -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
 
 
+# This is primarily to support old compilers that don’t understand -Wextra
+# Check whether --enable-extrawarnings was given.
+if test "${enable_extrawarnings+set}" = set; then :
+  enableval=$enable_extrawarnings;
+fi
 
-
-rm -f src/tripwire/syslog.h 2> /dev/null
-chmod 755 install-sh 2> /dev/null
-
-CFLAGS=${CFLAGS:-"-O -pipe -Wall -Wextra -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
-CXXFLAGS=${CXXFLAGS:-"-O -pipe -Wall -Wextra -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
+if test "x$enable_extrawarnings" != "xno"
+then
+   CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
+   CXXFLAGS="${CXXFLAGS} -Wextra -Wno-unused-parameter"
+fi
 
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -3478,6 +3486,7 @@ fi
 if test "x$enable_static" = xyes
 then LDFLAGS="${LDFLAGS} -static"
 fi
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
@@ -4349,7 +4358,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ clang++ sunCC aCC xlC_r xlC cl.exe
+  for ac_prog in g++ c++ clang++ sunCC aCC xlC_r xlC cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4393,7 +4402,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ clang++ sunCC aCC xlC_r xlC cl.exe
+  for ac_prog in g++ c++ clang++ sunCC aCC xlC_r xlC cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -7633,7 +7642,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.4, which was
+This file was extended by tripwire $as_me 2.4.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7700,7 +7709,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.4
+tripwire config.status 2.4.3.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,34 +2,38 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl
 
-AC_INIT([tripwire], [2.4.3.4], [https://github.com/Tripwire/tripwire-open-source/issues], [tripwire], [https://github.com/Tripwire/tripwire-open-source])
+AC_INIT([tripwire], [2.4.3.5], [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.4 $])
-
-dnl #################################
-dnl Cleanup Cruft Leftover From Patch
-dnl #################################
-rm -f src/tripwire/syslog.h 2> /dev/null
-chmod 755 install-sh 2> /dev/null
+AC_REVISION([$Revision: 2.4.3.5 $])
 
 dnl ###############
 dnl Setup defaults
 dnl ###############
-CFLAGS=${CFLAGS:-"-O -pipe -Wall -Wextra -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
-CXXFLAGS=${CXXFLAGS:-"-O -pipe -Wall -Wextra -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
+CFLAGS=${CFLAGS:-"-O -pipe -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
+CXXFLAGS=${CXXFLAGS:-"-O -pipe -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"}
 
 dnl #####################
 dnl Configuration options
 dnl #####################
+
+# This is primarily to support old compilers that don’t understand -Wextra
+AC_ARG_ENABLE(extrawarnings,  [  —-disable-extrawarnings do not compile with -Wextra warnings enabled])
+if test "x$enable_extrawarnings" != "xno"
+then
+   CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
+   CXXFLAGS="${CXXFLAGS} -Wextra -Wno-unused-parameter"
+fi
+
 AC_ARG_ENABLE(static, [  --enable-static         compile static binaries])
 if test "x$enable_static" = xyes
 then LDFLAGS="${LDFLAGS} -static"
 fi
+
 AC_ARG_ENABLE(debug,  [  --enable-debug          compile with debuging enabled])
 if test "x$enable_debug" = xyes
 then
@@ -42,7 +46,7 @@ dnl ###################
 dnl Checks for programs
 dnl ###################
 AC_PROG_CC([gcc clang suncc aCC xlC_r xlC cl.exe])
-AC_PROG_CXX([g++ clang++ sunCC aCC xlC_r xlC cl.exe])
+AC_PROG_CXX([g++ c++ clang++ sunCC aCC xlC_r xlC cl.exe])
 AC_PROG_RANLIB
 AC_PROG_YACC
 AC_PROG_LN_S