Merge pull request #9 from brc0x1/master

Open Source Tripwire 2.4.3.1

.gitignore

@@ -17,8 +17,10 @@ lib/
 **/tripwire
 **/twadmin
 **/twprint
+**/twtest
 **/siggen.exe
 **/tripwire.exe
 **/twadmin.exe
 **/twprint.exe
+**/twtest.exe
 releases/

ChangeLog

@@ -1,3 +1,11 @@
+2016-04-20 Brian Cox <bcox@tripwire.com>
+	* Bump version to 2.4.3.1
+	* Revive old 'twtest' unit test suite (such as it is); move _t.cpp files into twtest dir.
+	* Fix -Wnarrowing warnings in yyparse.cpp - GCC 6 would treat these as errors.
+	* Build with -Wextra to enable more warnings.
+	* Fix a variety of other compiler warnings, some exposed by -Wextra, others preexisting.
+	* Replace remaining tabs w/ 4 spaces. Mixing the 2 styles can now cause GCC 6 'misleading indentation' warnings.
+
 2016-04-11 Brian Cox <bcox@tripwire.com>
 	* Bump version to 2.4.3.0
 	* Compilation fixes for gcc 4.7+ and LLVM/clang 

ReadMe-2.4.3

@@ -1,4 +1,4 @@
-What's new in Open Source Tripwire 2.4.3.0:
+What's new in Open Source Tripwire 2.4.3:
 
 * 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
@@ -39,6 +39,7 @@ Linuxes
 - Raspbian 7 (wheezy) (armv6l) + gcc 4.6.3
 - openSuSE Tumbleweed (20160408) (i586) + gcc 5.3.1
 - RHEL 6.0 (powerpc64) + gcc 4.4.4
+- Fedora 24 Alpha 7 (amd64) + gcc 6.0.0
 
 OSX
 - Mac OS X 10.11 + LLVM 7.0.2 / clang-700.1.81
@@ -90,7 +91,7 @@ may be desirable elsewhere. It's simplest to add these to configure.in and run
 autoreconf -i instead of hand-editing each Makefile individually.
 
 * Older versions of Open Source Tripwire reportedly do not build on Tru64 UNIX.
-This is likely to be true with 2.4.3.0 as well, due to the lack of appropriate
+This is likely to be true with 2.4.3 as well, due to the lack of appropriate
 hardware to test it on. If anyone out there has a Tru64 box and wants to fix 
 this, patches are always welcome.
 

configure

@@ -3107,7 +3107,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=tripwire
- VERSION=2.4.3.0
+ VERSION=2.4.3.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6682,7 +6682,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile man/Makefile man/man4/Makefile man/man5/Makefile man/man8/Makefile src/Makefile src/cryptlib/Makefile src/core/Makefile src/db/Makefile src/fco/Makefile src/fs/Makefile src/tw/Makefile src/twcrypto/Makefile src/twparser/Makefile src/util/Makefile src/twprint/Makefile src/twadmin/Makefile src/siggen/Makefile src/tripwire/Makefile"
+ac_config_files="$ac_config_files Makefile man/Makefile man/man4/Makefile man/man5/Makefile man/man8/Makefile src/Makefile src/cryptlib/Makefile src/core/Makefile src/db/Makefile src/fco/Makefile src/fs/Makefile src/tw/Makefile src/twcrypto/Makefile src/twparser/Makefile src/util/Makefile src/twprint/Makefile src/twadmin/Makefile src/siggen/Makefile src/tripwire/Makefile src/twtest/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7418,6 +7418,7 @@ do
     "src/twadmin/Makefile") CONFIG_FILES="$CONFIG_FILES src/twadmin/Makefile" ;;
     "src/siggen/Makefile") CONFIG_FILES="$CONFIG_FILES src/siggen/Makefile" ;;
     "src/tripwire/Makefile") CONFIG_FILES="$CONFIG_FILES src/tripwire/Makefile" ;;
+    "src/twtest/Makefile") CONFIG_FILES="$CONFIG_FILES src/twtest/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.in

@@ -5,7 +5,7 @@ dnl
 AC_INIT
 AC_CONFIG_SRCDIR([src/tw/tw.cpp])
 AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE(tripwire, 2.4.3.0)
+AM_INIT_AUTOMAKE(tripwire, 2.4.3.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl #################################
@@ -431,5 +431,6 @@ src/twprint/Makefile
 src/twadmin/Makefile
 src/siggen/Makefile
 src/tripwire/Makefile
+src/twtest/Makefile
 ])
 AC_OUTPUT

contrib/make-bin-dist

@@ -5,7 +5,7 @@
 set -e
 
 PRODUCT=tripwire
-VERSION=2.4.3.0
+VERSION=2.4.3.1
 
 platform() {
   case `uname` in

install/install.sh

@@ -605,6 +605,12 @@ for i in $loosefiles; do
        	fi
 done
 
+#Make extra sure we don't install the unit test binary to sbin
+if  [ -e "$TWBIN/twtest" ] ; then
+  rm -f "$TWBIN/twtest"
+fi
+
+
 ##=======================================================
 ## Files are now present on user's system.
 ## Begin Tripwire configuration.

src/Makefile.am

@@ -1,2 +1,3 @@
 SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util
-SUBDIRS+= twprint twadmin siggen tripwire
+SUBDIRS+= twprint twadmin siggen tripwire twtest
+

src/Makefile.in

@@ -160,7 +160,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util twprint twadmin siggen tripwire
+SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util twprint twadmin siggen tripwire twtest
 all: all-recursive
 
 .SUFFIXES:

src/core/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = -I..
 noinst_LIBRARIES = libcore.a
 libcore_a_SOURCES = \
    file_unix.cpp unixfsservices.cpp					\
-   charutil_t.cpp displayencoder_t.cpp archive.cpp charutil.cpp		\
+   archive.cpp charutil.cpp		\
    cmdlineparser.cpp codeconvert.cpp core.cpp coreerrors.cpp		\
    corestrings.cpp crc32.cpp debug.cpp displayencoder.cpp		\
    displayutil.cpp error.cpp errorbucketimpl.cpp errortable.cpp		\

src/core/Makefile.in

@@ -52,7 +52,6 @@ AR = ar
 ARFLAGS = cru
 libcore_a_AR = $(AR) $(ARFLAGS)
 am_libcore_a_OBJECTS = file_unix.$(OBJEXT) unixfsservices.$(OBJEXT) \
-	charutil_t.$(OBJEXT) displayencoder_t.$(OBJEXT) \
 	archive.$(OBJEXT) charutil.$(OBJEXT) cmdlineparser.$(OBJEXT) \
 	codeconvert.$(OBJEXT) core.$(OBJEXT) coreerrors.$(OBJEXT) \
 	corestrings.$(OBJEXT) crc32.$(OBJEXT) debug.$(OBJEXT) \
@@ -193,7 +192,7 @@ INCLUDES = -I..
 noinst_LIBRARIES = libcore.a
 libcore_a_SOURCES = \
    file_unix.cpp unixfsservices.cpp					\
-   charutil_t.cpp displayencoder_t.cpp archive.cpp charutil.cpp		\
+   archive.cpp charutil.cpp		\
    cmdlineparser.cpp codeconvert.cpp core.cpp coreerrors.cpp		\
    corestrings.cpp crc32.cpp debug.cpp displayencoder.cpp		\
    displayutil.cpp error.cpp errorbucketimpl.cpp errortable.cpp		\