Merge pull request #16 from Tripwire/dev/2.4.3.3

Open Source Tripwire 2.4.3.3 update

Author: brc0x1

ChangeLog

@@ -1,3 +1,10 @@
+2017-02-21 Brian Cox <bcox@tripwire.com>
+	* Bump version to 2.4.3.3
+	* Run Clang static analyzer & fix some of its quibbles
+	* Fix compilation error on Alpine Linux 3.x
+	* Fix file permissions on a couple of source files
+	* Fix some errors w/ make install/uninstall/dist
+
 2017-01-15 Brian Cox <bcox@tripwire.com>
 	* Bump version to 2.4.3.2
 	* DOS/DJGPP platform support.

Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 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:
 	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \

Makefile.in

@@ -307,6 +307,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -321,7 +322,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 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
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 2.4.3.2 .
+# From configure.ac Revision: 2.4.3.3 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tripwire 2.4.3.2.
+# Generated by GNU Autoconf 2.69 for tripwire 2.4.3.3.
 #
 # 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.2'
-PACKAGE_STRING='tripwire 2.4.3.2'
+PACKAGE_VERSION='2.4.3.3'
+PACKAGE_STRING='tripwire 2.4.3.3'
 PACKAGE_BUGREPORT='https://github.com/Tripwire/tripwire-open-source/issues'
 PACKAGE_URL='https://github.com/Tripwire/tripwire-open-source'
 
@@ -724,6 +724,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -808,6 +809,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1060,6 +1062,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1197,7 +1208,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1310,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.2 to adapt to many kinds of systems.
+\`configure' configures tripwire 2.4.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1350,6 +1361,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1381,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.2:";;
+     short | recursive ) echo "Configuration of tripwire 2.4.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1492,7 +1504,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tripwire configure 2.4.3.2
+tripwire configure 2.4.3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2379,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.2, which was
+It was created by tripwire $as_me 2.4.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3353,7 +3365,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tripwire'
- VERSION='2.4.3.2'
+ VERSION='2.4.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7621,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.2, which was
+This file was extended by tripwire $as_me 2.4.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7688,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.2
+tripwire config.status 2.4.3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

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.2], [https://github.com/Tripwire/tripwire-open-source/issues], [tripwire], [https://github.com/Tripwire/tripwire-open-source])
+AC_INIT([tripwire], [2.4.3.3], [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.2 $])
+AC_REVISION([$Revision: 2.4.3.3 $])
 
 dnl #################################
 dnl Cleanup Cruft Leftover From Patch

installer/install.sh

@@ -569,10 +569,10 @@ echo
 #f1=' ff=$README ; d="" ; dd=$TWDOCS ; rr=0444 '
 #f2=' ff=$REL_NOTES ; d="" ; dd=$TWDOCS ; rr=0444 '
 f3=' ff=$TWLICENSEFILE ; d="" ; dd=$TWDOCS ; rr=0444 '
-#f4=' ff=tripwire ; d="/bin" ; dd=$TWBIN ; rr=0550 '
-#f5=' ff=twadmin ; d="/bin" ; dd=$TWBIN ; rr=0550 '
-#f6=' ff=twprint ; d="/bin" ; dd=$TWBIN ; rr=0550 '
-#f7=' ff=siggen ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+f4=' ff=tripwire ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+f5=' ff=twadmin ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+f6=' ff=twprint ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+f7=' ff=siggen ; d="/bin" ; dd=$TWBIN ; rr=0550 '
 f8=' ff=TRADEMARK ; d="" ; dd=$TWDOCS ; rr=0444 '
 f9=' ff=policyguide.txt ; d="/policy" ; dd=$TWDOCS ; rr=0444 '
 f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$TWPOLICY ; rr=0640 '
@@ -586,7 +586,7 @@ f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$TWPOLICY ; rr=0640 '
 #f18=' ff=twprint.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
 
 # Binaries and manpages are already installed by the install target
-loosefiles="f3 f8 f9 f10"
+loosefiles="f3 f4 f5 f6 f7 f8 f9 f10"
 
 for i in $loosefiles; do
 	eval "eval \"\$$i\""

man/Makefile.in

@@ -284,6 +284,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@

man/man4/Makefile.am

@@ -1,3 +1,2 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = twconfig.4 twpolicy.4
-dist_man_MANS = twconfig.4 twpolicy.4
+dist_man_MANS = twconfig.4 twpolicy.4

man/man4/Makefile.in

@@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \
 man4dir = $(mandir)/man4
 am__installdirs = "$(DESTDIR)$(man4dir)"
 NROFF = nroff
-MANS = $(dist_man_MANS) $(man_MANS)
+MANS = $(dist_man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/mkinstalldirs
@@ -256,6 +256,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -269,7 +270,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = twconfig.4 twpolicy.4
 dist_man_MANS = twconfig.4 twpolicy.4
 all: all-am
 
@@ -303,10 +303,10 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-man4: $(dist_man_MANS) $(man_MANS)
+install-man4: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
-	list2='$(dist_man_MANS) $(man_MANS)'; \
+	list2='$(dist_man_MANS)'; \
 	test -n "$(man4dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
@@ -341,7 +341,7 @@ uninstall-man4:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man4dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.4[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \

man/man5/Makefile.am

@@ -1,3 +1,2 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = twfiles.5
-dist_man_MANS = twfiles.5
+dist_man_MANS = twfiles.5