Hi,
This patch should fix the problem, moving the non-volatile state for the
samhain package to /var/lib/samhain.
Please, tell me if I need to fix something to make this acceptable.
Cheers,
Andrea
bts tags 771461 + patch
thanks
diff -u samhain-3.1.0/debian/changelog samhain-3.1.0/debian/changelog
--- samhain-3.1.0/debian/changelog
+++ samhain-3.1.0/debian/changelog
@@ -1,3 +1,11 @@
+samhain (3.1.0-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Move all non-volatile package state in /var/lib/<package>, according
+ to the FHS (Closes: #771461)
+
+ -- Andrea Claudi <a.cla...@univpm.it> Tue, 02 Dec 2014 00:36:33 +0100
+
samhain (3.1.0-6) unstable; urgency=medium
* debian/rules: Add an option to disable the ASM code when building
diff -u samhain-3.1.0/debian/dirs samhain-3.1.0/debian/dirs
--- samhain-3.1.0/debian/dirs
+++ samhain-3.1.0/debian/dirs
@@ -5,3 +5,3 @@
var/log/samhain
-var/state/samhain
+var/lib/samhain
etc/logrotate.d
diff -u samhain-3.1.0/debian/postrm samhain-3.1.0/debian/postrm
--- samhain-3.1.0/debian/postrm
+++ samhain-3.1.0/debian/postrm
@@ -7,7 +7,7 @@
case "$1" in
purge)
- for dir in /var/log/samhain/supervise /var/log/samhain /var/state/samhain /var/run/samhain
+ for dir in /var/log/samhain/supervise /var/log/samhain /var/lib/samhain /var/run/samhain
do
[ -d "$dir" ] && {
find $dir -type f -exec rm -f {} \;
diff -u samhain-3.1.0/debian/rules samhain-3.1.0/debian/rules
--- samhain-3.1.0/debian/rules
+++ samhain-3.1.0/debian/rules
@@ -51,7 +51,7 @@
endif
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
--with-config-file=/etc/samhain/samhainrc \
- --with-state-dir=/var/state/samhain \
+ --with-state-dir=/var/lib/samhain \
--with-prelude \
$(DNMALLOC) \
$(DISABLE_ASM) \
@@ -69,7 +69,7 @@
# dh_autoreconf
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
--with-config-file=/etc/yule/yulerc \
- --with-state-dir=/var/state/yule \
+ --with-state-dir=/var/lib/yule \
--with-prelude \
$(DNMALLOC) \
--enable-network=server \
@@ -85,7 +85,7 @@
# dh_autoreconf
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
--with-config-file=/etc/samhain/samhainrc \
- --with-state-dir=/var/state/samhain \
+ --with-state-dir=/var/lib/samhain \
--with-prelude \
$(DNMALLOC) \
--enable-network=client \
@@ -112,7 +112,7 @@
dh_installdirs
# Fix the permissions
chmod o-rX `pwd`/debian/samhain/var/log/samhain \
- `pwd`/debian/samhain/var/state/samhain \
+ `pwd`/debian/samhain/var/lib/samhain \
`pwd`/debian/samhain/etc/samhain
$(MAKE) install install-boot DESTDIR=`pwd`/debian/samhain
diff -u samhain-3.1.0/debian/samhain.init samhain-3.1.0/debian/samhain.init
--- samhain-3.1.0/debian/samhain.init
+++ samhain-3.1.0/debian/samhain.init
@@ -49,10 +49,10 @@
{
# Initialize the database only if does not exist yet, abort if
# it cannot be created
- [ -f /var/state/samhain/samhain_file ] && return
+ [ -f /var/lib/samhain/samhain_file ] && return
log_progress_msg "Creating integrity database (this can take some minutes)."
samhain -t init >/var/log/samhain/samhain-init.log 2>&1
- if [ ! -f /var/state/samhain/samhain_file ] ; then
+ if [ ! -f /var/lib/samhain/samhain_file ] ; then
log_failure_msg "Database could not be created. Review /var/log/samhain/samhain-init.log"
log_end_msg 1
exit 1
only in patch2:
unchanged:
--- samhain-3.1.0.orig/rules.deb.in
+++ samhain-3.1.0/rules.deb.in
@@ -51,7 +51,7 @@
# Fix the permissions
#chmod o-rX `pwd`/debian/tmp/var/log/samhain \
# `pwd`/debian/tmp/var/run/samhain \
- # `pwd`/debian/tmp/var/state/samhain \
+ # `pwd`/debian/tmp/var/lib/samhain \
# `pwd`/debian/tmp/etc/samhain
# $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp
