tag 645016 + patch tag 631580 + patch tag 618728 + patch thanks Hi,
The attached patch should sort out these two issues. Cheers, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : sg...@debian.org | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u samhain-2.6.2/debian/samhain.logrotate.d samhain-2.6.2/debian/samhain.logrotate.d --- samhain-2.6.2/debian/samhain.logrotate.d +++ samhain-2.6.2/debian/samhain.logrotate.d @@ -8,7 +8,7 @@ create 640 root adm sharedscripts postrotate - if [ -f /var/run/samhain.pid ]; then \ + if [ -f /var/run/samhain/samhain.pid ]; then \ /etc/init.d/samhain reload > /dev/null; fi endscript } diff -u samhain-2.6.2/debian/samhain.init samhain-2.6.2/debian/samhain.init --- samhain-2.6.2/debian/samhain.init +++ samhain-2.6.2/debian/samhain.init @@ -36,6 +36,7 @@ if test -f /var/samhain/.samhain_lock; then rm -f /var/samhain/.samhain_lock fi + mkdir -p /var/run/samhain start-stop-daemon --start --quiet --exec $DAEMON log_end_msg $? # diff -u samhain-2.6.2/debian/rules samhain-2.6.2/debian/rules --- samhain-2.6.2/debian/rules +++ samhain-2.6.2/debian/rules @@ -11,6 +11,18 @@ # This is the debhelper compatability version to use. # export DH_COMPAT=5 +ifeq (linux,$(DEB_HOST_ARCH_OS)) +ifeq (ia64,$(DEB_HOST_ARCH)) +DNMALLOC = --disable-dnmalloc +else ifeq (s390,$(DEB_HOST_ARCH)) +DNMALLOC = --disable-dnmalloc +else +DNMALLOC = --enable-dnmalloc +endif +else +DNMALLOC = --disable-dnmalloc +endif + build: build-stamp build-stamp: dh_testdir @@ -19,8 +31,9 @@ --with-config-file=/etc/samhain/samhainrc \ --with-state-dir=/var/state/samhain \ --with-prelude \ + $(DNMALLOC) \ --enable-network=no \ - --with-pid-file=/var/run/samhain.pid \ + --with-pid-file=/var/run/samhain/samhain.pid \ --with-log-file=/var/log/samhain/samhain.log $(MAKE) diff -u samhain-2.6.2/debian/changelog samhain-2.6.2/debian/changelog --- samhain-2.6.2/debian/changelog +++ samhain-2.6.2/debian/changelog @@ -1,3 +1,12 @@ +samhain (2.6.2-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Disable dnmalloc where we know it doesn't work (closes: #618728) + * Switch back to /var/run/samhain, as /var/run is now a symlink to /run, and + samhain won't run if it's piddir is a symlink. (closes: #645016, #631580) + + -- Stephen Gran <sg...@debian.org> Wed, 12 Oct 2011 07:27:14 +0000 + samhain (2.6.2-2) unstable; urgency=low * Change configuration so that the pidfile used is /var/run/samhain.pid
signature.asc
Description: Digital signature