From 35cb9bb6a7bb4cd0b5a1b464324fc6bcc7612700 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Mon, 20 Feb 2017 14:48:30 -0800 Subject: [PATCH 1/9] Create 2.4.3.3 branch & update version string --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 77ef0de..d32e23b 100755 --- a/configure +++ b/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 . # @@ -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' @@ -1310,7 +1310,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]... @@ -1381,7 +1381,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 +1492,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 +2379,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 +3353,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 +7621,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 +7688,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\\" diff --git a/configure.ac b/configure.ac index 7bd14df..40935af 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.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 From 005be38165e76522b842bb4c6e4cf75ae84ac35e Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Mon, 20 Feb 2017 14:49:52 -0800 Subject: [PATCH 2/9] Fix permissions on a couple of cpp files (issue #14) --- src/core/codeconvert.cpp | 0 src/db/hierdatabase.cpp | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/core/codeconvert.cpp mode change 100755 => 100644 src/db/hierdatabase.cpp diff --git a/src/core/codeconvert.cpp b/src/core/codeconvert.cpp old mode 100755 new mode 100644 diff --git a/src/db/hierdatabase.cpp b/src/db/hierdatabase.cpp old mode 100755 new mode 100644 From f52ddb9c6f30607d2a4fc61018326a03c6a15678 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Mon, 20 Feb 2017 14:50:25 -0800 Subject: [PATCH 3/9] Add an include to fix Alpine Linux build issue (issue #15) --- src/core/fsservices.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/fsservices.h b/src/core/fsservices.h index e67b9e6..8c58a0e 100644 --- a/src/core/fsservices.h +++ b/src/core/fsservices.h @@ -69,6 +69,10 @@ #if HAVE_SYS_PARAM_H #include #endif + +#if HAVE_SYS_STAT_H +#include +#endif #endif //========================================================================= From 86baf94ddfbe85e41c24116d00efca47b26daae4 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Mon, 20 Feb 2017 17:03:24 -0800 Subject: [PATCH 4/9] Fix man page handling in make install --- Makefile.in | 1 + configure | 14 +++++++++++++- man/Makefile.in | 1 + man/man4/Makefile.am | 3 +-- man/man4/Makefile.in | 10 +++++----- man/man5/Makefile.am | 3 +-- man/man5/Makefile.in | 10 +++++----- man/man8/Makefile.am | 3 +-- man/man8/Makefile.in | 10 +++++----- src/Makefile.am | 3 +++ src/Makefile.in | 5 ++++- src/core/Makefile.in | 1 + src/cryptlib/Makefile.in | 1 + src/db/Makefile.in | 1 + src/fco/Makefile.in | 1 + src/fs/Makefile.in | 1 + src/siggen/Makefile.in | 1 + src/tripwire/Makefile.in | 1 + src/tw/Makefile.in | 1 + src/twadmin/Makefile.in | 1 + src/twcrypto/Makefile.in | 1 + src/twparser/Makefile.in | 1 + src/twprint/Makefile.in | 1 + src/twtest/Makefile.in | 1 + src/util/Makefile.in | 1 + 25 files changed, 54 insertions(+), 23 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8e58aa..0c17953 100644 --- a/Makefile.in +++ b/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@ diff --git a/configure b/configure index d32e23b..1dca42e 100755 --- a/configure +++ b/configure @@ -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. @@ -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] diff --git a/man/Makefile.in b/man/Makefile.in index ffd3622..9cf2615 100644 --- a/man/Makefile.in +++ b/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@ diff --git a/man/man4/Makefile.am b/man/man4/Makefile.am index 3ee9884..7ea2fb8 100644 --- a/man/man4/Makefile.am +++ b/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 \ No newline at end of file +dist_man_MANS = twconfig.4 twpolicy.4 diff --git a/man/man4/Makefile.in b/man/man4/Makefile.in index 2d5c2f9..01437ef 100644 --- a/man/man4/Makefile.in +++ b/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,.,'`; \ diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index 09a087d..3c6716b 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -1,3 +1,2 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = twfiles.5 -dist_man_MANS = twfiles.5 \ No newline at end of file +dist_man_MANS = twfiles.5 diff --git a/man/man5/Makefile.in b/man/man5/Makefile.in index bf744fb..9bb9a4d 100644 --- a/man/man5/Makefile.in +++ b/man/man5/Makefile.in @@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \ man5dir = $(mandir)/man5 am__installdirs = "$(DESTDIR)$(man5dir)" 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 = twfiles.5 dist_man_MANS = twfiles.5 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-man5: $(dist_man_MANS) $(man_MANS) +install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ + list2='$(dist_man_MANS)'; \ test -n "$(man5dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -341,7 +341,7 @@ uninstall-man5: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man5dir)" || 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 '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index cf05479..a3d568b 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -1,3 +1,2 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 -dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 \ No newline at end of file +dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in index 4d628ae..9341d22 100644 --- a/man/man8/Makefile.in +++ b/man/man8/Makefile.in @@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \ man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" 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 = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 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-man8: $(dist_man_MANS) $(man_MANS) +install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ + list2='$(dist_man_MANS)'; \ test -n "$(man8dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -341,7 +341,7 @@ uninstall-man8: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man8dir)" || 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 '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/src/Makefile.am b/src/Makefile.am index f8e10cf..d795672 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,3 +2,6 @@ SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util SUBDIRS+= twprint twadmin siggen tripwire twtest EXTRA_DIST = buildnum.h buildnum.txt buildnuminc.pl dep_addprefix.pl rmcr.pl check_st.pl prime.pl parser test-harness core/md5.cpp core/sha.cpp +install: + /bin/true + diff --git a/src/Makefile.in b/src/Makefile.in index c5e1faa..1914aca 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -282,6 +282,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -489,7 +490,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: -install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -602,6 +602,9 @@ uninstall-am: .PRECIOUS: Makefile +install: + /bin/true + # 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. .NOEXPORT: diff --git a/src/core/Makefile.in b/src/core/Makefile.in index e56f419..b838a07 100644 --- a/src/core/Makefile.in +++ b/src/core/Makefile.in @@ -314,6 +314,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/cryptlib/Makefile.in b/src/cryptlib/Makefile.in index d09773a..84de4fb 100644 --- a/src/cryptlib/Makefile.in +++ b/src/cryptlib/Makefile.in @@ -303,6 +303,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/db/Makefile.in b/src/db/Makefile.in index 4458f4a..f80ab34 100644 --- a/src/db/Makefile.in +++ b/src/db/Makefile.in @@ -300,6 +300,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/fco/Makefile.in b/src/fco/Makefile.in index 7065828..cb15522 100644 --- a/src/fco/Makefile.in +++ b/src/fco/Makefile.in @@ -308,6 +308,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 15eacf0..2734d23 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -303,6 +303,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/siggen/Makefile.in b/src/siggen/Makefile.in index dac8497..05165fb 100644 --- a/src/siggen/Makefile.in +++ b/src/siggen/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/tripwire/Makefile.in b/src/tripwire/Makefile.in index 8ec0412..24a68bf 100644 --- a/src/tripwire/Makefile.in +++ b/src/tripwire/Makefile.in @@ -299,6 +299,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/tw/Makefile.in b/src/tw/Makefile.in index 641bad0..bac6b09 100644 --- a/src/tw/Makefile.in +++ b/src/tw/Makefile.in @@ -306,6 +306,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twadmin/Makefile.in b/src/twadmin/Makefile.in index 1e1bbf9..7130f57 100644 --- a/src/twadmin/Makefile.in +++ b/src/twadmin/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twcrypto/Makefile.in b/src/twcrypto/Makefile.in index e34e90f..c4e40df 100644 --- a/src/twcrypto/Makefile.in +++ b/src/twcrypto/Makefile.in @@ -301,6 +301,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twparser/Makefile.in b/src/twparser/Makefile.in index d793002..fd23dd2 100644 --- a/src/twparser/Makefile.in +++ b/src/twparser/Makefile.in @@ -302,6 +302,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twprint/Makefile.in b/src/twprint/Makefile.in index 852d5f7..5a5ae62 100644 --- a/src/twprint/Makefile.in +++ b/src/twprint/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twtest/Makefile.in b/src/twtest/Makefile.in index ca9c7e7..69befaf 100644 --- a/src/twtest/Makefile.in +++ b/src/twtest/Makefile.in @@ -335,6 +335,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 0559ab8..f2a7741 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -300,6 +300,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ From 05b6d7c860526bbb7c2d687792fad25a7965c232 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Mon, 20 Feb 2017 17:38:19 -0800 Subject: [PATCH 5/9] Fix twexe install in install.sh --- installer/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/install.sh b/installer/install.sh index b8f02f4..e1d57ab 100755 --- a/installer/install.sh +++ b/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\"" From 530e7d318607ea12362cf4bdf14e292d0b3b1564 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Mon, 20 Feb 2017 17:54:20 -0800 Subject: [PATCH 6/9] Fix filename case issue w/ make dist --- Makefile.am | 2 +- Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a555745..924300c 100644 --- a/Makefile.am +++ b/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)" \ diff --git a/Makefile.in b/Makefile.in index 0c17953..fd7dc2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -322,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 From d6df22f9dc3ad15ff412b3e4ff1cd6c4fc249456 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Mon, 20 Feb 2017 23:21:00 -0800 Subject: [PATCH 7/9] Fix various Clang static analyzer quibbles --- src/core/codeconvert.cpp | 62 ++++++++++++++++++------------- src/core/unixfsservices.cpp | 4 +- src/fco/fcopropvector.cpp | 8 +++- src/tripwire/integritycheck.cpp | 15 +++++--- src/tripwire/mailmessage.h | 4 -- src/tripwire/pipedmailmessage.cpp | 8 +--- src/tw/dbdebug.cpp | 2 +- src/tw/fcoreport.cpp | 7 ---- src/tw/fcoreport.h | 3 +- src/tw/textreportviewer.cpp | 13 ++++++- src/twadmin/twadmincl.cpp | 7 ---- 11 files changed, 68 insertions(+), 65 deletions(-) diff --git a/src/core/codeconvert.cpp b/src/core/codeconvert.cpp index 07d40f2..3d926d5 100644 --- a/src/core/codeconvert.cpp +++ b/src/core/codeconvert.cpp @@ -1323,7 +1323,9 @@ cWcharIs32BitUcs2Converterer::Convert( throw eConverterFatal( TSS_GetString( cCore, core::STR_ERR_ISNULL ) ); // cast our dbchar_t to wchar_t's first - ntwcs_t pwzBuffer = new wchar_t[ nCount + 1 ]; + std::vector buf(nCount+1); + wchar_t* pwzBuffer = &buf[0]; + for( size_t n = 0; n < nCount; n++ ) pwzBuffer[n] = pwz[n]; pwzBuffer[nCount] = 0x00; // null terminate @@ -1358,7 +1360,8 @@ cWcharIs32BitUcs2Converterer::Convert( throw eConverterFatal( TSS_GetString( cCore, core::STR_ERR_ISNULL ) ); // mb to wc to a buffer of wide chars then.... - wchar_t* pwzBuffer = new wchar_t[ nCount ]; + std::vector buf(nCount); + wchar_t* pwzBuffer = &buf[0]; int nConv = tss_mbstowcs( pwzBuffer, pbz, nCount ); if ( nConv == -1 ) @@ -1451,22 +1454,26 @@ cGoodEnoughConverterer::Convert( throw eConverterFatal( TSS_GetString( cCore, core::STR_ERR_ISNULL ) ); char* at = pbz; - const dbchar_t* dat = pwz; - while ( *dat ) + + if (pwz) { - if( *dat > 0xFF ) + const dbchar_t* dat = pwz; + while ( *dat ) { - *at = cConvertUtil::ConvertNonChar( *dat ); + if( *dat > 0xFF ) + { + *at = cConvertUtil::ConvertNonChar( *dat ); + } + else + { + *at = (char)*dat; + } + + at++; + dat++; } - else - { - *at = (char)*dat; - } - - at++; - dat++; } - + *at = 0x00; return( (size_t)at - (size_t)pbz ); @@ -1481,23 +1488,26 @@ cGoodEnoughConverterer::Convert( if ( pwz == 0 || ( pbz == 0 && nBytes ) ) throw eConverterFatal( TSS_GetString( cCore, core::STR_ERR_ISNULL ) ); - const char* at = pbz; dbchar_t* dat = pwz; - while ( *at ) + + if (pbz) { - if( (unsigned char)*at > (unsigned char)0x7Fu ) + const char* at = pbz; + while ( *at ) { - *dat = cConvertUtil::ConvertNonChar( *at ); - } - else - { - *dat = (uint16)(unsigned char)*at; - } + if( (unsigned char)*at > (unsigned char)0x7Fu ) + { + *dat = cConvertUtil::ConvertNonChar( *at ); + } + else + { + *dat = (uint16)(unsigned char)*at; + } - dat++; - at++; + dat++; + at++; + } } - *dat = 0x0000; return( ( (size_t)dat - (size_t)pwz ) / sizeof( dbchar_t ) ); diff --git a/src/core/unixfsservices.cpp b/src/core/unixfsservices.cpp index b2b4ef5..5da6073 100644 --- a/src/core/unixfsservices.cpp +++ b/src/core/unixfsservices.cpp @@ -1105,8 +1105,8 @@ bool util_GetNextPathElement( const TSTRING& strPathC, TSTRING& strElem, int ind TSTRING strPath = strPathC; // writable local version bool fMoreSeps = true; - TSTRING::size_type firstSep, nextSep, nextNonSep; - firstSep = nextSep = nextNonSep = (TSTRING::size_type)-1; + TSTRING::size_type nextSep, nextNonSep; + nextSep = nextNonSep = (TSTRING::size_type)-1; for( int i = 0; i <= index && fMoreSeps; i++ ) { // go past leading separators diff --git a/src/fco/fcopropvector.cpp b/src/fco/fcopropvector.cpp index 000ed41..449aaff 100644 --- a/src/fco/fcopropvector.cpp +++ b/src/fco/fcopropvector.cpp @@ -260,8 +260,12 @@ int cFCOPropVector::SetSize(int max) } else //mpBuf!=NULL && max>msBitlength { - (*mpBuf).resize (((max/msBitlength)+1), 0); - return mSize = ((*mpBuf).capacity() * msBitlength); + if (mpBuf) + { + (*mpBuf).resize (((max/msBitlength)+1), 0); + mSize = ((*mpBuf).capacity() * msBitlength); + } + return mSize; } } diff --git a/src/tripwire/integritycheck.cpp b/src/tripwire/integritycheck.cpp index 4d6a603..8dc7147 100644 --- a/src/tripwire/integritycheck.cpp +++ b/src/tripwire/integritycheck.cpp @@ -353,12 +353,15 @@ void cIntegrityCheck::ProcessDir( cDbDataSourceIter dbIter, iFCODataSourceIter* if( dbIter.Done() ) { ASSERT( pIter != 0); - d.TraceDetail( "Examining and %s\n", pIter->GetName().AsString().c_str() ); - // - // these are all new entries, add them to the "Added" set... - // - ProcessAddedFCO( dbIter, pIter ); - pIter->Next(); + if (pIter) + { + d.TraceDetail( "Examining and %s\n", pIter->GetName().AsString().c_str() ); + // + // these are all new entries, add them to the "Added" set... + // + ProcessAddedFCO( dbIter, pIter ); + pIter->Next(); + } } else if( ! pIter ) { diff --git a/src/tripwire/mailmessage.h b/src/tripwire/mailmessage.h index 498df66..b8ef197 100644 --- a/src/tripwire/mailmessage.h +++ b/src/tripwire/mailmessage.h @@ -273,10 +273,6 @@ private: void SendInit();// throw (eMailMessageError) // opens a pipe to sendmail and writes the header. - FILE* GetFilePointer() const; - // returns a pointer to the current file pointer. Only valid between - // SendInit() and SendFinit() - void SendFinit(); //throw (eMailMessageError) // closes the file descriptor, sending the rest of the message diff --git a/src/tripwire/pipedmailmessage.cpp b/src/tripwire/pipedmailmessage.cpp index 9fbb753..15cd432 100644 --- a/src/tripwire/pipedmailmessage.cpp +++ b/src/tripwire/pipedmailmessage.cpp @@ -80,8 +80,7 @@ bool cPipedMailMessage::Send() SendInit(); - FILE* sendPipe = GetFilePointer(); - ASSERT( sendPipe != 0 ); + ASSERT( mpFile != 0 ); //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // Get Body and Attachments //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -213,8 +212,3 @@ void cPipedMailMessage::SendFinit() //throw ( eMailMessageError ) } -FILE* cPipedMailMessage::GetFilePointer() const -{ - return mpFile; -} - diff --git a/src/tw/dbdebug.cpp b/src/tw/dbdebug.cpp index c5b0220..2f5318a 100644 --- a/src/tw/dbdebug.cpp +++ b/src/tw/dbdebug.cpp @@ -450,6 +450,7 @@ void cDbDebug::OutputResults( void ) // Begin code for manipulating Database -- This is just a straight port from the DbExplore code. It's presence is // purely for convenience, and for debugging this class. /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/* static inline bool IsSpace( TCHAR c ) { return ( (c == _T(' ')) || (c == _T('\t')) || (c == _T('\r')) || (c == _T('\n')) || (c == _T('\0')) ); @@ -460,7 +461,6 @@ static inline bool IsEnd( TCHAR c ) return ( (c == _T('\0')) ); } -/* /////////////////////////////////////////////////////////////////////////////// // util_PrintFCO /////////////////////////////////////////////////////////////////////////////// diff --git a/src/tw/fcoreport.cpp b/src/tw/fcoreport.cpp index 9084cac..79af470 100644 --- a/src/tw/fcoreport.cpp +++ b/src/tw/fcoreport.cpp @@ -514,13 +514,6 @@ cFCOReportChangeIter::cFCOReportChangeIter(const cFCOReportSpecIter& specIter) SetSpecIter(specIter); } -cFCOReportChangeIter::cFCOReportChangeIter() -{ - mpData = new cFCOReportChangeIter_i; - mpData->mpList = 0; - mpData->mIter = mpData->mpList->begin(); -} - cFCOReportChangeIter::cFCOReportChangeIter(const cFCOReportChangeIter& rhs) { mpData = new cFCOReportChangeIter_i; diff --git a/src/tw/fcoreport.h b/src/tw/fcoreport.h index 5c578b6..7da27d1 100644 --- a/src/tw/fcoreport.h +++ b/src/tw/fcoreport.h @@ -227,7 +227,6 @@ class cFCOReportChangeIter { public: cFCOReportChangeIter(const cFCOReportSpecIter& specIter); - cFCOReportChangeIter(); cFCOReportChangeIter(const cFCOReportChangeIter& rhs); ~cFCOReportChangeIter(); @@ -251,6 +250,8 @@ public: const cFCOPropVector& GetChangeVector() const; private: + cFCOReportChangeIter() {} + cFCOReportChangeIter_i* mpData; // TODO -- if it turns out that we are creating a lot of these, we should consider // making a pool of them. diff --git a/src/tw/textreportviewer.cpp b/src/tw/textreportviewer.cpp index 05eac5f..82c9bda 100644 --- a/src/tw/textreportviewer.cpp +++ b/src/tw/textreportviewer.cpp @@ -1519,6 +1519,9 @@ 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; @@ -1538,7 +1541,10 @@ 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; @@ -1558,7 +1564,10 @@ 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; diff --git a/src/twadmin/twadmincl.cpp b/src/twadmin/twadmincl.cpp index f259640..17db7e2 100644 --- a/src/twadmin/twadmincl.cpp +++ b/src/twadmin/twadmincl.cpp @@ -1556,16 +1556,12 @@ int cTWAModeExamine::Execute(cErrorQueue* pQueue) // Output the keys that decrypt the file. iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTWAdmin, twadmin::STR_KEYS_DECRYPT ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTW, tw::STR_NEWLINE ).c_str()); - - bool siteDecrypts = false, localDecrypts = false; if (siteKey.KeysLoaded()) try { if (manip.TestDecryption(*siteKey.GetPublicKey(), false) != false) { - siteDecrypts = true; - iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_SITEKEYFILE ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mSiteKeyFile ).c_str()); @@ -1579,7 +1575,6 @@ int cTWAModeExamine::Execute(cErrorQueue* pQueue) { if (manip.TestDecryption(*localKey.GetPublicKey(), false) != false) { - localDecrypts = true; iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_LOCALKEYFILE ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mLocalKeyFile ).c_str()); @@ -1834,7 +1829,6 @@ int cTWAModeGenerateKeys::Execute(cErrorQueue* pQueue) // if(! bPrintedPassphraseHint) { - bPrintedPassphraseHint = true; iUserNotify::GetInstance()->Notify( iUserNotify::V_NORMAL, TSS_GetString(cTWAdmin, twadmin::STR_PASSPHRASE_HINT).c_str() ); } @@ -2162,7 +2156,6 @@ int cTWAModeChangePassphrases::Execute(cErrorQueue* pQueue) // if(! bPrintedPassphraseHint) { - bPrintedPassphraseHint = true; iUserNotify::GetInstance()->Notify( iUserNotify::V_NORMAL, TSS_GetString(cTWAdmin, twadmin::STR_PASSPHRASE_HINT).c_str() ); } From d2307110440acec1b71117b572ffba403e304db1 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Tue, 21 Feb 2017 01:03:29 -0800 Subject: [PATCH 8/9] Fix no-op install & uninstall targets in src --- src/Makefile.am | 5 ++++- src/Makefile.in | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d795672..6b8084e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,5 +3,8 @@ SUBDIRS+= twprint twadmin siggen tripwire twtest EXTRA_DIST = buildnum.h buildnum.txt buildnuminc.pl dep_addprefix.pl rmcr.pl check_st.pl prime.pl parser test-harness core/md5.cpp core/sha.cpp install: - /bin/true + true + +uninstall: + true diff --git a/src/Makefile.in b/src/Makefile.in index 1914aca..7769907 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -492,7 +492,6 @@ installdirs: installdirs-recursive installdirs-am: install-exec: install-exec-recursive install-data: install-data-recursive -uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am @@ -603,7 +602,10 @@ uninstall-am: install: - /bin/true + true + +uninstall: + true # 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. From 388a29a17537812ff7f412690bc4a08449798b3c Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Tue, 21 Feb 2017 19:56:05 -0800 Subject: [PATCH 9/9] Update changelog for 2.4.3.3 --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4fa18a9..657af5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-02-21 Brian Cox + * 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 * Bump version to 2.4.3.2 * DOS/DJGPP platform support.