Hello community, here is the log from the commit of package tripwire for openSUSE:Factory checked in at 2019-07-26 12:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tripwire (Old) and /work/SRC/openSUSE:Factory/.tripwire.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tripwire" Fri Jul 26 12:45:00 2019 rev:4 rq:718777 version:2.4.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/tripwire/tripwire.changes 2019-06-18 14:56:04.545413487 +0200 +++ /work/SRC/openSUSE:Factory/.tripwire.new.4126/tripwire.changes 2019-07-26 12:45:03.129816643 +0200 @@ -1,0 +2,11 @@ +Fri Jun 28 08:33:20 UTC 2019 - Tuukka Pasanen <tuukka.pasa...@ilmi.fi> + +- Fix bug Bug 1096636 - tripwire looks for the configuration file in + /etc instead of /etc/tripwire. Now tw.cfg will really appead in /etc/tripwire + * add patch 'tripwire-2.4.3.7-config-dir-location.patch' + which update config dir to /etc/tripwire. + * add build require libtool (which pulls automake and autoconf) + * add 'autoreconf -a -i' to make sure automake is overwritten + * Move /etc/tw.cfg to /etc/tripwire/tw.cfg in %post as make transition smoother + +------------------------------------------------------------------- New: ---- tripwire-2.4.3.7-config-dir-location.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tripwire.spec ++++++ --- /var/tmp/diff_new_pack.BCPWmG/_old 2019-07-26 12:45:03.965816116 +0200 +++ /var/tmp/diff_new_pack.BCPWmG/_new 2019-07-26 12:45:03.973816112 +0200 @@ -26,10 +26,12 @@ Source: https://github.com/Tripwire/tripwire-open-source/releases/download/%{version}/tripwire-open-source-%{version}.tar.gz Source1: twcfg.txt Source2: README.SUSE -Patch: tripwire-2.4.1.2-src-policyconfig.patch +Patch0: tripwire-2.4.1.2-src-policyconfig.patch +Patch1: tripwire-2.4.3.7-config-dir-location.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libstdc++-devel +BuildRequires: libtool BuildRequires: procps Provides: Tripwire = %version-%release @@ -40,8 +42,10 @@ %prep %setup -q -n tripwire-open-source-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p1 cp %{S:2} . +autoreconf -f -i %build %configure @@ -58,6 +62,13 @@ install -m 700 bin/* %{buildroot}/usr/sbin for i in `find man -type f -name "*.?"`; do install -m 644 "$i" "%{buildroot}/%{_mandir}/${i#man}"; done +%post +# Transition from old system +if [ -f /etc/tw.cfg ] && [ ! -f /etc/tripwire/tw.cfg ] +then + mv /etc/tw.cfg /etc/tripwire/tw.cfg +fi + %check make check ++++++ tripwire-2.4.3.7-config-dir-location.patch ++++++ diff --git a/src/tw/Makefile.am b/src/tw/Makefile.am index 1bea795..d426c52 100644 --- a/src/tw/Makefile.am +++ b/src/tw/Makefile.am @@ -19,7 +19,7 @@ libtw_a_HEADERS = \ stdtw.h systeminfo.h textdbviewer.h textreportviewer.h \ tw.h twerrors.h twinit.h twstrings.h twutil.h -DEFS = @DEFS@ -DCONFIG_DIR=\"$(sysconfdir)\" +DEFS = @DEFS@ -DCONFIG_DIR=\"$(sysconfdir)/tripwire\" CLEANFILES = *.gcno *.gcda all: $(noinst_LIBRARIES) diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp index f112e8e..ee14533 100644 --- a/src/tw/twstrings.cpp +++ b/src/tw/twstrings.cpp @@ -105,7 +105,7 @@ TSS_BeginStringtable(cTW) // the current working directory TSS_StringEntry(tw::STR_DEF_CFG_FILENAME, _T(CONFIG_DIR "/tw.cfg")), #else - TSS_StringEntry(tw::STR_DEF_CFG_FILENAME, _T("/etc/tw.cfg")), + TSS_StringEntry(tw::STR_DEF_CFG_FILENAME, _T("/etc/tripwire/tw.cfg")), #endif TSS_StringEntry(tw::STR_GET_HELP, _T("Use --help to get help.")), TSS_StringEntry(tw::STR_NEWLINE, _T("\n")),
