diff --git a/ChangeLog b/ChangeLog index 8fad3c3..971a8f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-20 Brian Cox + * 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. + 2016-04-11 Brian Cox * Bump version to 2.4.3.0 * Compilation fixes for gcc 4.7+ and LLVM/clang diff --git a/ReadMe-2.4.3 b/ReadMe-2.4.3 index 77beb7e..501bb1a 100644 --- a/ReadMe-2.4.3 +++ b/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 @@ -90,7 +90,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. diff --git a/configure b/configure index 7f5b1cf..e3499db 100755 --- a/configure +++ b/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 diff --git a/configure.in b/configure.in index 77e0ca5..da9f7fd 100644 --- a/configure.in +++ b/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 ################################# diff --git a/contrib/make-bin-dist b/contrib/make-bin-dist index cbe2952..7fd07e0 100755 --- a/contrib/make-bin-dist +++ b/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 diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp index 02c9af3..38bd82e 100644 --- a/src/tw/twstrings.cpp +++ b/src/tw/twstrings.cpp @@ -56,7 +56,7 @@ # define DEBUG_STR _T("") #endif -#define TSS_PRODUCT_NAME _T("Open Source Tripwire(R) 2.4.3.0.") +#define TSS_PRODUCT_NAME _T("Open Source Tripwire(R) 2.4.3.1.") #define TSS_COPYRIGHT_NOTICE \ _T("Open Source Tripwire 2.4 Portions copyright 2000 Tripwire, Inc. Tripwire is a registered\n\ @@ -158,7 +158,7 @@ TSS_BeginStringtable( cTW ) TSS_StringEntry( tw::STR_WRITE_REPORT_FILE, _T("Wrote report file: ") ), TSS_StringEntry( tw::STR_WRITE_CONFIG_FILE, _T("Wrote configuration file: ") ), - TSS_StringEntry( tw::STR_REPORT_TITLE, _T("Open Source Tripwire(R) 2.4.3.0 Integrity Check Report") ), + TSS_StringEntry( tw::STR_REPORT_TITLE, _T("Open Source Tripwire(R) 2.4.3.1 Integrity Check Report") ), TSS_StringEntry( tw::STR_R_GENERATED_BY, _T("Report generated by: ") ), TSS_StringEntry( tw::STR_R_CREATED_ON, _T("Report created on: ") ), TSS_StringEntry( tw::STR_DB_CREATED_ON, _T("Database generated on: ") ), @@ -219,7 +219,7 @@ TSS_BeginStringtable( cTW ) TSS_StringEntry( tw::STR_REMOVED_SHORT, _T("R") ), TSS_StringEntry( tw::STR_CHANGED_SHORT, _T("C") ), - TSS_StringEntry( tw::STR_DBPRINT_TITLE, _T("Open Source Tripwire(R) 2.4.3.0 Database") ), + TSS_StringEntry( tw::STR_DBPRINT_TITLE, _T("Open Source Tripwire(R) 2.4.3.1 Database") ), TSS_StringEntry( tw::STR_DB_GENERATED_BY, _T("Database generated by: ") ), TSS_StringEntry( tw::STR_TOTAL_NUM_FILES, _T("Total number of objects: ") ), TSS_StringEntry( tw::STR_END_OF_DB, _T("*** End of database ***") ),