diff -Nru corekeeper-1.4/.gitattributes corekeeper-1.5/.gitattributes --- corekeeper-1.4/.gitattributes 2013-01-24 02:44:53.000000000 +0000 +++ corekeeper-1.5/.gitattributes 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/changelog merge=dpkg-mergechangelogs diff -Nru corekeeper-1.4/debian/.gitignore corekeeper-1.5/debian/.gitignore --- corekeeper-1.4/debian/.gitignore 2013-01-24 02:45:02.000000000 +0000 +++ corekeeper-1.5/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -/corekeeper -/corekeeper.debhelper.log -/corekeeper.postinst.debhelper -/corekeeper.postrm.debhelper -/corekeeper.preinst.debhelper -/corekeeper.prerm.debhelper -/corekeeper.substvars -/files diff -Nru corekeeper-1.4/debian/changelog corekeeper-1.5/debian/changelog --- corekeeper-1.4/debian/changelog 2013-05-25 08:42:17.000000000 +0000 +++ corekeeper-1.5/debian/changelog 2013-11-22 02:25:17.000000000 +0000 @@ -1,3 +1,13 @@ +corekeeper (1.5) unstable; urgency=low + + * Print new cores, deleted cores then old cores + * Don't use systemctl unless systemd is running as init + * Bump debhelper compat to 9 + * Fix typo: extra -a in the call to test + * Bump Standards-Version, no changes needed + + -- Paul Wise Thu, 21 Nov 2013 08:28:22 +0800 + corekeeper (1.4) unstable; urgency=low * Set core patterns before setuid options (Closes: #708128) diff -Nru corekeeper-1.4/debian/compat corekeeper-1.5/debian/compat --- corekeeper-1.4/debian/compat 2012-11-09 09:22:48.000000000 +0000 +++ corekeeper-1.5/debian/compat 2013-11-22 02:24:01.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru corekeeper-1.4/debian/control corekeeper-1.5/debian/control --- corekeeper-1.4/debian/control 2013-04-25 08:41:56.000000000 +0000 +++ corekeeper-1.5/debian/control 2013-11-22 02:24:42.000000000 +0000 @@ -2,15 +2,16 @@ Section: admin Priority: extra Maintainer: Paul Wise -Build-Depends: debhelper (>= 8.1.0~) -Standards-Version: 3.9.4 +Build-Depends: + debhelper (>= 9) +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/collab-maint/corekeeper.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/corekeeper.git Package: corekeeper -# This is because the sysctl files are unfortunately per-kernel Architecture: kfreebsd-any linux-any -Pre-Depends: ${misc:Pre-Depends} +Pre-Depends: + ${misc:Pre-Depends} Depends: lsb-base (>= 3.2-14) [kfreebsd-any], procps [linux-any], diff -Nru corekeeper-1.4/debian/copyright corekeeper-1.5/debian/copyright --- corekeeper-1.4/debian/copyright 2013-04-25 06:50:48.000000000 +0000 +++ corekeeper-1.5/debian/copyright 2013-11-22 02:23:37.000000000 +0000 @@ -18,4 +18,3 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - diff -Nru corekeeper-1.4/debian/corekeeper.cron.daily corekeeper-1.5/debian/corekeeper.cron.daily --- corekeeper-1.4/debian/corekeeper.cron.daily 2013-04-25 07:50:12.000000000 +0000 +++ corekeeper-1.5/debian/corekeeper.cron.daily 2013-11-22 02:23:28.000000000 +0000 @@ -4,4 +4,31 @@ if [ ! -e /usr/share/lintian/overrides/corekeeper ] ; then exit 0 fi -find /var/crash -name '*.core' \( \( -mtime +7 -delete -printf 'Deleted core file: %p\n' \) -o \( -printf 'Remaining core file: %p\n' \) \) | sort +cd /var/cache/corekeeper/ +find /var/crash -name '*.core' \( \( -mtime +7 -delete -fprint /dev/stderr \) -o \( -print \) \) > next 2> deleted +sort current current next | uniq -u > new +sort deleted deleted new new next | uniq -u > old + +if [ -s new ] ; then + echo 'New core file(s):' + echo + cat new + echo +fi + +if [ -s deleted ] ; then + echo 'Deleted core file(s):' + echo + sort deleted + echo +fi + +if [ -s old ] ; then + echo 'Old core file(s):' + echo + cat old + echo +fi + +rm -f deleted old new +mv -f next current diff -Nru corekeeper-1.4/debian/corekeeper.dirs corekeeper-1.5/debian/corekeeper.dirs --- corekeeper-1.4/debian/corekeeper.dirs 2013-04-25 06:50:48.000000000 +0000 +++ corekeeper-1.5/debian/corekeeper.dirs 2013-11-22 02:23:28.000000000 +0000 @@ -1 +1,2 @@ /var/crash +/var/cache/corekeeper diff -Nru corekeeper-1.4/debian/corekeeper.lintian-overrides corekeeper-1.5/debian/corekeeper.lintian-overrides --- corekeeper-1.4/debian/corekeeper.lintian-overrides 2013-04-25 06:50:48.000000000 +0000 +++ corekeeper-1.5/debian/corekeeper.lintian-overrides 2013-11-22 02:23:42.000000000 +0000 @@ -1,3 +1,7 @@ # /var/crash is intentionally world-writable to allow for # centralized core dumps. non-standard-dir-perm + +# The postrm script checks if systemd is running before +# using the systemctl command +maintainer-script-calls-systemctl diff -Nru corekeeper-1.4/debian/corekeeper.postrm corekeeper-1.5/debian/corekeeper.postrm --- corekeeper-1.4/debian/corekeeper.postrm 2013-04-29 09:52:42.000000000 +0000 +++ corekeeper-1.5/debian/corekeeper.postrm 2013-11-22 02:24:24.000000000 +0000 @@ -2,12 +2,13 @@ set -e # Delete leftover core files when removing/purging -[ $1 != purge -a $1 != remove -a ] || [ ! -d /var/crash ] || find /var/crash -name '*.core' -delete +[ $1 != purge -a $1 != remove ] || [ ! -d /var/crash ] || find /var/crash -name '*.core' -delete +[ $1 != purge -a $1 != remove ] || [ ! -d /var/cache/corekeeper ] || find /var/cache/corekeeper -type f -delete # Turn off core dumps after remove/purge # Only after purge will they be fully turned off if [ $1 = purge -o $1 = remove ] ; then - if [ -x /bin/systemctl ] ; then + if [ -x /bin/systemctl -a -d /run/systemd/system/ ] ; then systemctl restart systemd-sysctl.service elif [ -x /etc/init.d/procps ] ; then invoke-rc.d procps reload