colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix building w/ ancient gcc versions that require STLport; also fix some tests & typos

This commit is contained in:
Brian Cox 2020-09-26 12:01:07 -07:00
parent c617ed56bb
commit ed558c1578
29 changed files with 163 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

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

6
config.h.in
View File

@ -265,6 +265,9 @@
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if you have the <sstream> header file. */
#undef HAVE_SSTREAM
/* Define to 1 if you have the `stat' function. */
#undef HAVE_STAT
@ -292,6 +295,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <strstream> header file. */
#undef HAVE_STRSTREAM
/* Define to 1 if `st_attrib' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_ATTRIB

81
configure vendored
View File

@ -723,6 +723,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -753,7 +754,6 @@ enable_debug
enable_coverage
enable_profiling
enable_urandom
with_stlport_dir
enable_largefile
enable_commoncrypto
enable_iconv
@ -813,6 +813,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}'
@ -1065,6 +1066,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=* \
@ -1202,7 +1212,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.
@ -1355,6 +1365,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]
@ -1413,7 +1424,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-stlport-dir=PATH Specify path to STLport installation
--with-ssl-dir=PATH Specify path to OpenSSL installation
Some influential environment variables:
@ -5973,27 +5983,6 @@ $as_echo "#define ENABLE_DEV_URANDOM 1" >>confdefs.h
fi
# Check whether --with-stlport-dir was given.
if test "${with_stlport_dir+set}" = set; then :
withval=$with_stlport_dir;
if test "x$withval" != "xno" ; then
stlport_base=$withval
stlport_include="${stlport_base}/stlport"
stlport_lib="${stlport_base}/lib"
stlport_paths="-I ${stlport_include} -L ${stlport_lib}"
CPPFLAGS="${CPPFLAGS} ${stlport_paths}"
CXXFLAGS="${CXXFLAGS} ${stlport_paths}"
LDFLAGS="${LDFLAGS} ${stlport_lib} -lstlport_gcc -lm"
# Append lib dir to LD_LIBRARY_PATH (or set LD_LIBRARY_PATH if unset)
# This is mostly for the benefit of configure-time test programs.
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${stlport_lib}
fi
fi
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@ -7581,7 +7570,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -7627,7 +7616,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -7651,7 +7640,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -7696,7 +7685,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -7720,7 +7709,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -8632,6 +8621,14 @@ fi
fi
if test -z "${STLPORT}"; then
STLPORT="."
fi
stlport_include="${STLPORT}/stlport"
stlport_lib="${STLPORT}/lib"
for ac_header in limits limits.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@ -8662,11 +8659,12 @@ if ${ac_cv_stlportdir+:} false; then :
$as_echo_n "(cached) " >&6
else
echo "Native <locale> header not found; checking if STLport is available"
found_locale=""
for inclpath in ${stlport_include} /usr/local/include /usr/local/include/stlport
do
CPPFLAGS_save=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} -I${inclpath}"
CPPFLAGS="${CPPFLAGS} -I${inclpath} -nostdinc++"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8717,7 +8715,7 @@ done
if test "x${ac_cv_stlportdir}" != "x"
then
CPPFLAGS="${CPPFLAGS} -I ${ac_cv_stlportdir}"
CPPFLAGS="${CPPFLAGS} -I ${ac_cv_stlportdir} -nostdinc++"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -8743,6 +8741,7 @@ else
LDFLAGS_TEMP="${LDFLAGS}"
LDFLAGS="${LDFLAGS_TEMP} -pthread"
unset ac_cv_func_pthread_getspecific
ac_fn_cxx_check_func "$LINENO" "pthread_getspecific" "ac_cv_func_pthread_getspecific"
if test "x$ac_cv_func_pthread_getspecific" = xyes; then :
@ -8782,8 +8781,12 @@ else
do
LDFLAGS_save=${LDFLAGS}
LIBS_save=${LIBS}
LD_LIBRARY_PATH_save=${LD_LIBRARY_PATH}
LDFLAGS="${LDFLAGS} -L${inclpath}"
LIBS="${LIBS} -l${stllib}"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${inclpath}"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8805,6 +8808,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=${LDFLAGS_save}
LIBS=${LIBS_save}
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH_save}"
if test "x${found_lib}" = "x1"
then
ac_cv_stlportlib=${inclpath}
@ -8837,6 +8841,8 @@ $as_echo "$ac_cv_stlportlib" >&6; }
then
LDFLAGS="${LDFLAGS} -L ${ac_cv_stlportlib}"
LIBS="${LIBS} -l${stllib}"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${ac_cv_stlportlib}"
$as_echo "#define HAVE_LOCALE 1" >>confdefs.h
@ -8862,6 +8868,19 @@ fi
done
for ac_header in sstream strstream
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
cat >>confdefs.h <<_ACEOF

40
configure.ac
View File

@ -167,24 +167,6 @@ then
AC_DEFINE(ENABLE_DEV_URANDOM, 1, [Enable use of /dev/urandom])
fi
AC_ARG_WITH(stlport-dir,
[ --with-stlport-dir=PATH Specify path to STLport installation ],
[
if test "x$withval" != "xno" ; then
stlport_base=$withval
stlport_include="${stlport_base}/stlport"
stlport_lib="${stlport_base}/lib"
stlport_paths="-I ${stlport_include} -L ${stlport_lib}"
CPPFLAGS="${CPPFLAGS} ${stlport_paths}"
CXXFLAGS="${CXXFLAGS} ${stlport_paths}"
LDFLAGS="${LDFLAGS} ${stlport_lib} -lstlport_gcc -lm"
# Append lib dir to LD_LIBRARY_PATH (or set LD_LIBRARY_PATH if unset)
# This is mostly for the benefit of configure-time test programs.
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${stlport_lib}
fi
]
)
dnl #######################
@ -407,6 +389,14 @@ dnl Check for STL support, either native or STLport
dnl
dnl Check for STL headers
dnl
if test -z "${STLPORT}"; then
STLPORT="."
fi
stlport_include="${STLPORT}/stlport"
stlport_lib="${STLPORT}/lib"
AC_CHECK_HEADERS(limits limits.h)
dnl Use <locale> as a proxy for C++98-compliant-ish STL
@ -414,11 +404,12 @@ dnl and look for STLport if file isn't found immediately
AC_CHECK_HEADERS(locale,,[
dnl Don't have native STL headers, look in other places
AC_CACHE_CHECK([for STLport directory], ac_cv_stlportdir, [
echo "Native <locale> header not found; checking if STLport is available"
found_locale=""
for inclpath in ${stlport_include} /usr/local/include /usr/local/include/stlport
do
CPPFLAGS_save=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} -I${inclpath}"
CPPFLAGS="${CPPFLAGS} -I${inclpath} -nostdinc++"
AC_TRY_COMPILE([
#include <locale>
]
@ -443,7 +434,7 @@ AC_CHECK_HEADERS(locale,,[
if test "x${ac_cv_stlportdir}" != "x"
then
CPPFLAGS="${CPPFLAGS} -I ${ac_cv_stlportdir}"
CPPFLAGS="${CPPFLAGS} -I ${ac_cv_stlportdir} -nostdinc++"
fi
AC_TRY_LINK([#include <locale>],,,[
@ -453,6 +444,7 @@ AC_CHECK_HEADERS(locale,,[
LDFLAGS_TEMP="${LDFLAGS}"
LDFLAGS="${LDFLAGS_TEMP} -pthread"
unset ac_cv_func_pthread_getspecific
AC_CHECK_FUNC(pthread_getspecific, [:], [
@ -472,14 +464,19 @@ AC_CHECK_HEADERS(locale,,[
do
LDFLAGS_save=${LDFLAGS}
LIBS_save=${LIBS}
LD_LIBRARY_PATH_save=${LD_LIBRARY_PATH}
LDFLAGS="${LDFLAGS} -L${inclpath}"
LIBS="${LIBS} -l${stllib}"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${inclpath}"
AC_TRY_LINK([
#include <locale>
]
, , [ found_lib="1" ], )
LDFLAGS=${LDFLAGS_save}
LIBS=${LIBS_save}
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH_save}"
if test "x${found_lib}" = "x1"
then
ac_cv_stlportlib=${inclpath}
@ -504,6 +501,8 @@ AC_CHECK_HEADERS(locale,,[
then
LDFLAGS="${LDFLAGS} -L ${ac_cv_stlportlib}"
LIBS="${LIBS} -l${stllib}"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}${ac_cv_stlportlib}"
AC_DEFINE(HAVE_LOCALE, 1, [Define to 1 if you have the <locale> header file.])
AC_DEFINE(HAVE_STLPORT, 1, [Define if STLport library is used])
fi
@ -514,6 +513,7 @@ dnl #####################
dnl STL specific headers
dnl #####################
AC_CHECK_HEADERS(wchar.h)
AC_CHECK_HEADERS(sstream strstream)
dnl #######################################################################
dnl Local checks/hacks. The goal is to make this part as short as possible

1
man/Makefile.in
View File

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

1
man/man4/Makefile.in
View File

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

1
man/man5/Makefile.in
View File

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

1
man/man8/Makefile.in
View File

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

1
src/Makefile.in
View File

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

1
src/core/Makefile.in
View File

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

6
src/core/serializerimpl.cpp
View File

@ -287,7 +287,7 @@ iTypedSerializable* cSerializerImpl::ReadObjectDynCreate()
}
else
{
// refrence counted...
// reference counted...
iSerRefCountObj* pObj;
pObj = mRefCtObjTbl.Lookup(objIdx);
if (pObj == NULL)
@ -304,7 +304,7 @@ iTypedSerializable* cSerializerImpl::ReadObjectDynCreate()
ThrowAndAssert(eSerializerUnknownType(str.str(), mFileName, eSerializer::TY_FILE));
}
pObj = ((*rci).second)();
d.TraceDetail("Creating Ref-Coutnted object [%d] %s(%p)\n", objIdx, pObj->GetType().AsString(), pObj);
d.TraceDetail("Creating Ref-Counted object [%d] %s(%p)\n", objIdx, pObj->GetType().AsString(), pObj);
pObj->Read(this);
mRefCtObjTbl.Add(pObj, objIdx);
@ -316,7 +316,7 @@ iTypedSerializable* cSerializerImpl::ReadObjectDynCreate()
else
{
// already serialized; just return this object.
d.TraceDetail("Adding refrence to previously serialized object [%d] %s(%p)\n",
d.TraceDetail("Adding reference to previously serialized object [%d] %s(%p)\n",
objIdx,
pObj->GetType().AsString(),
pObj);

69
src/core/types.h
View File

@ -81,34 +81,79 @@ typedef unsigned long long uint64_t;
#endif // !HAVE_STDINT_H
#if HAVE_STDINT_H
#ifdef INT8_MIN
# define TSS_INT8_MIN INT8_MIN
# define TSS_INT8_MAX INT8_MAX
# define TSS_UINT8_MAX UINT8_MAX
# define TSS_INT16_MIN INT16_MIN
# define TSS_INT16_MAX INT16_MAX
# define TSS_UINT16_MAX UINT16_MAX
# define TSS_INT32_MIN INT32_MIN
# define TSS_INT32_MAX INT32_MAX
# define TSS_UINT32_MAX UINT32_MAX
# define TSS_INT64_MIN INT64_MIN
# define TSS_INT64_MAX INT64_MAX
# define TSS_UINT64_MAX UINT64_MAX
#else
# define TSS_INT8_MIN (-127 - 1)
#endif
#ifdef INT8_MAX
# define TSS_INT8_MAX INT8_MAX
#else
# define TSS_INT8_MAX 127
#endif
#ifdef UINT8_MAX
# define TSS_UINT8_MAX UINT8_MAX
#else
# define TSS_UINT8_MAX 0xFFU
#endif
#ifdef INT16_MIN
# define TSS_INT16_MIN INT16_MIN
#else
# define TSS_INT16_MIN (-32767 - 1)
#endif
#ifdef INT16_MAX
# define TSS_INT16_MAX INT16_MAX
#else
# define TSS_INT16_MAX 32767
#endif
#ifdef UINT16_MAX
# define TSS_UINT16_MAX UINT16_MAX
#else
# define TSS_UINT16_MAX 0xFFFFU
#endif
#ifdef INT32_MIN
# define TSS_INT32_MIN INT32_MIN
#else
# define TSS_INT32_MIN (-2147483647 - 1)
#endif
#ifdef INT32_MAX
# define TSS_INT32_MAX INT32_MAX
#else
# define TSS_INT32_MAX 2147483647
#endif
#ifdef UINT32_MAX
# define TSS_UINT32_MAX UINT32_MAX
#else
# define TSS_UINT32_MAX 0xFFFFFFFFU
#endif
#ifdef INT64_MIN
# define TSS_INT64_MIN INT64_MIN
#else
# define TSS_INT64_MIN (-9223372036854775807LL - 1)
#endif
#ifdef INT64_MAX
# define TSS_INT64_MAX INT64_MAX
#else
# define TSS_INT64_MAX 9223372036854775807LL
#endif
#ifdef UINT64_MAX
# define TSS_UINT64_MAX UINT64_MAX
#else
# define TSS_UINT64_MAX 0xFFFFFFFFFFFFFFFFULL
#endif
//-----------------------------------------------------------------------------
// Byte Swapping
//-----------------------------------------------------------------------------

1
src/cryptlib/Makefile.in
View File

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

1
src/db/Makefile.in
View File

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

1
src/fco/Makefile.in
View File

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

1
src/fs/Makefile.in
View File

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

1
src/siggen/Makefile.in
View File

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

4
src/test-harness/tests/integritycheck.pm
View File

@ -33,12 +33,12 @@ sub PolicyFileString
return <<POLICY_END;
# Policy file generated by integrity checks test
#
(rulename="RuleA", severity=30, emailto="elvis@mars")
(rulename="RuleA", severity=30, emailto="elvis\@mars")
{
$root -> \$(ReadOnly) +S -ab; #read only plus SHA-1 minus atime & blocks
}
(rulename="RuleB", severity=200, emailto="elvis@mars")
(rulename="RuleB", severity=200, emailto="elvis\@mars")
{
$root2 -> \$(ReadOnly) +S -ab; #read only plus SHA-1 minus atime & blocks
}

2
src/test-harness/tests/md5sum.pm
View File

@ -37,7 +37,7 @@ sub run() {
# lets see if the system 'md5sum' agree's with siggen's md5 hash
#
my ($md5sum, undef) = split(/ /, `md5sum $twtools::twrootdir/test`);
if ($mf5sum eq "") {
if ($md5sum eq "") {
twtools::logStatus("md5sum not found, trying openssl instead\n");
(undef, $md5sum) = split(/=/, `openssl md5 $twtools::twrootdir/test`);
}

2
src/test-harness/twtest.pl
View File

@ -119,7 +119,7 @@ sub runTests {
}
else {
print "no test '$module' found...\n";
print "Could not find or load test module '$module', error = $@ \n";
}
}
}

1
src/tripwire/Makefile.in
View File

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

1
src/tw/Makefile.in
View File

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

1
src/twadmin/Makefile.in
View File

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

1
src/twcrypto/Makefile.in
View File

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

1
src/twparser/Makefile.in
View File

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

1
src/twprint/Makefile.in
View File

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

1
src/twtest/Makefile.in
View File

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

4
src/twtest/errorbucketimpl_t.cpp
View File

@ -39,6 +39,8 @@
#include "core/errorgeneral.h"
#include "core/errortable.h"
TSS_EXCEPTION(eTestErrorBucketImpl, eError);
// test option 7
void TestErrorBucketImpl()
{
@ -82,7 +84,7 @@ void TestErrorBucketImpl()
// TODO -- test the error table
// TODO -- test the error filter
// set some errors...
TSS_EXCEPTION(eTestErrorBucketImpl, eError);
eTestErrorBucketImpl error1(_T("Error A")), error2(_T("Error B")), error3(_T("Error C"));
er.AddError(error1);

1
src/util/Makefile.in
View File

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