diff -u tiger-3.2.2/config.in tiger-3.2.2/config.in --- tiger-3.2.2/config.in +++ tiger-3.2.2/config.in @@ -133,8 +133,14 @@ # TODO: WORKDIR should be removed on exit if it is located in a temporary # directory if [ ! -d "$WORKDIR" ] ; then - echo "Configured working directory $WORKDIR does not exist" >&2 - exit 1 + case "$WORKDIR" in + /var/run/* | /tmp* | /var/tmp/* ) + mkdir -p "$WORKDIR" + ;; + *) + echo "Configured working directory $WORKDIR does not exist" >&2 + exit 1 + esac fi @@ -222,10 +228,11 @@ # [ -n "$RCFILE" -a -f $RCFILE ] && { + tmpf=$(tempfile) $GREP -v '^#' $RCFILE | - $SED -e 's/^\(.*\)=/export \1; \1=/' > $WORKDIR/rcfile.$$ - . $WORKDIR/rcfile.$$ - $RM -f $WORKDIR/rcfile.$$ + $SED -e 's/^\(.*\)=/export \1; \1=/' > $tmpf + . $tmpf + $RM -f $tmpf } HOSTNAME=`$GETHOSTNAME` diff -u tiger-3.2.2/debian/changelog tiger-3.2.2/debian/changelog --- tiger-3.2.2/debian/changelog +++ tiger-3.2.2/debian/changelog @@ -1,3 +1,17 @@ +tiger (1:3.2.2-11ubuntu1) karmic; urgency=low + + * Merge from debian/unstable, remaining changes: (LP: #378534) + - scripts/check_rootdir: Check for inode 2 on ext4 as well as ext2/3. + - debian/postrm: + + Clean directories correctly when purging. + - config.in: + + Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + * Launchpad bugs fixed: + - Use --debconf-ok when calling ucf (LP: #378514) + + -- Andreas Moog Wed, 10 Jun 2009 10:42:49 +0200 + tiger (1:3.2.2-11) unstable; urgency=low * Sort the system/Linux/2/inetd file since 'join' complains about it not being @@ -35,6 +49,20 @@ -- Javier Fernandez-Sanguino Pen~a Thu, 07 May 2009 23:55:22 +0200 +tiger (1:3.2.2-9ubuntu1) karmic; urgency=low + + * Merge from debian/unstable, remaining changes: (LP: #378534) + - scripts/check_rootdir: Check for inode 2 on ext4 as well as ext2/3. + - debian/postrm: + + Clean directories correctly when purging. + - config.in: + + Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + * Launchpad bugs fixed: + - Use --debconf-ok when calling ucf (LP: #378514) + + -- Andreas Moog Wed, 20 May 2009 02:30:27 +0200 + tiger (1:3.2.2-9) unstable; urgency=low * Use --debconf-ok when calling ucf (Closes: 517798, 521620) @@ -48,6 +76,28 @@ -- Javier Fernandez-Sanguino Pen~a Sat, 25 Apr 2009 14:01:26 +0200 +tiger (1:3.2.2-8ubuntu2) jaunty; urgency=low + + [ Aurimas Fischer ] + * system/Linux/2/gen_mounts: + - Added ext4 as a local FS (LP: #318933) + + [ Colin Watson ] + * scripts/check_rootdir: Check for inode 2 on ext4 as well as ext2/3. + + -- Colin Watson Wed, 21 Jan 2009 19:42:37 +0000 + +tiger (1:3.2.2-8ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #303893): + - debian/postrm: + + Clean directories correctly when purging. + - config.in: + + Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + + -- Nick Ellery Sun, 30 Nov 2008 22:59:52 -0800 + tiger (1:3.2.2-8) unstable; urgency=low * Acknowledge NMU (Closes: #503282) @@ -66,6 +116,13 @@ -- Javier Fernandez-Sanguino Pen~a Thu, 27 Nov 2008 23:47:16 +0100 +tiger (1:3.2.2-7.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Clean directories correctly when purging. + + -- Nick Ellery Wed, 05 Nov 2008 05:01:38 +0000 + tiger (1:3.2.2-7.1) unstable; urgency=medium * Non-maintainer upload. @@ -80,6 +137,13 @@ -- Javier Fernandez-Sanguino Pen~a Sun, 19 Oct 2008 12:45:38 +0200 +tiger (1:3.2.2-6ubuntu1) intrepid; urgency=low + + * Merge from Debian Unstable. Remaining Ubuntu changes: + - Clean directories correctly when purging. + + -- Luca Falavigna Sat, 04 Oct 2008 02:57:42 +0200 + tiger (1:3.2.2-6) unstable; urgency=medium * Bring changes from CVS to gen_mounts, amongst other fixes: @@ -140,6 +204,14 @@ -- Javier Fernandez-Sanguino Pen~a Tue, 26 Aug 2008 12:00:16 +0200 +tiger (1:3.2.2-3.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #241046) + - Continue to Clean directories correctly when purging. + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Steve Stalcup Thu, 01 May 2008 04:27:01 +0100 + tiger (1:3.2.2-3.1) unstable; urgency=medium * Non-maintainer upload. @@ -162,6 +234,23 @@ -- Javier Fernandez-Sanguino Pen~a Sun, 09 Dec 2007 15:36:44 +0100 +tiger (1:3.2.2-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/dirs, debian/postrm, debian/rules: + + Use /var/lib/tiger/work instead of /var/run/tiger/work as the default + work directory. + + Clean directories correctly when purging. + - debian/config.in: + + Auto-create the work directory if it's in /var/run, /tmp, + or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + - debian/control: + + Set Maintainer fields. + * Sync debian/po/pt.po with Debians as they are the same. + + -- Kenneth Drake Wed, 21 Nov 2007 19:14:44 +0000 + tiger (1:3.2.2-1) unstable; urgency=low * New upstream release @@ -189,12 +278,32 @@ -- Javier Fernandez-Sanguino Pen~a Wed, 27 Jun 2007 00:46:54 +0200 +tiger (1:3.2.1-37ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Move the default work directory to /var/lib/tiger/work. + - Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + - Clean directories correctly when purging. + - Update maintainer in field debian/control. + + -- Michele Angrisano Sun, 01 Jul 2007 19:32:18 +0200 + tiger (1:3.2.1-37) unstable; urgency=low * systems/Linux/2/check_rcumask: Fix syntax error (Closes: #430224) -- Javier Fernandez-Sanguino Pen~a Sat, 23 Jun 2007 15:52:58 +0200 +tiger (1:3.2.1-36ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp + - Move the default work directory to /var/lib/tiger/work. + - Clean directories correctly when purging. + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Andrea Veri Fri, 22 Jun 2007 11:33:20 +0200 + tiger (1:3.2.1-36) unstable; urgency=low * Fix the location of Tiger's default file (Closes: #426182) @@ -221,6 +330,17 @@ -- Javier Fernandez-Sanguino Pen~a Fri, 22 Jun 2007 01:04:17 +0200 +tiger (1:3.2.1-35ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp + - Move the default work directory to /var/lib/tiger/work. + - See launchpad bug #44329 + - Clean directories correctly when purging. + + + -- Stephan Hermann Thu, 21 Dec 2006 17:10:03 +0100 + tiger (1:3.2.1-35) unstable; urgency=low * [scripts/check_rootkit] @@ -258,6 +378,15 @@ -- Javier Fernandez-Sanguino Pen~a Wed, 30 Aug 2006 14:13:42 +0200 +tiger (1:3.2.1-31ubuntu1) edgy; urgency=low + + * Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp + * Move the default work directory to /var/lib/tiger/work. + - See launchpad bug #44329 + * Clean directories correctly when purging. + + -- Matthias Urlichs Wed, 30 Aug 2006 09:27:31 +0200 + tiger (1:3.2.1-31) unstable; urgency=low * systems/Linux/2/deb_checkmd5sums: Fix Ubuntu bug 50611 by excluding dev/ diff -u tiger-3.2.2/debian/postrm tiger-3.2.2/debian/postrm --- tiger-3.2.2/debian/postrm +++ tiger-3.2.2/debian/postrm @@ -9,11 +9,11 @@ case "$1" in purge) - for dir in /var/log/tiger/ /var/lib/tiger/work /var/run/tiger/work/ /var/run/tiger/ + for dir in /var/log/tiger/ /var/lib/tiger/work /var/lib/tiger/ /var/run/tiger/ do [ -d "$dir" ] && { - find "$dir" -type f -exec rm -f {} \; - rmdir "$dir" + find $dir -type d -o -exec rm -f {} \; + find $dir -type d -depth -exec rmdir {} \; } done # Do we have any tigerXX files under /var/log/? if so we should remove diff -u tiger-3.2.2/debian/control tiger-3.2.2/debian/control --- tiger-3.2.2/debian/control +++ tiger-3.2.2/debian/control @@ -1,7 +1,8 @@ Source: tiger Section: admin Priority: optional -Maintainer: Javier Fernandez-Sanguino Pen~a +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Javier Fernandez-Sanguino Pen~a Build-Depends: debhelper (>= 4.1.13), autoconf, po-debconf (>= 0.5.0) Standards-Version: 3.8.0 Homepage: http://savannah.nongnu.org/projects/tiger/ only in patch2: unchanged: --- tiger-3.2.2.orig/scripts/check_rootdir +++ tiger-3.2.2/scripts/check_rootdir @@ -90,7 +90,7 @@ # Checking to see if the root directory is on the correct INODE number inode=`$LS -di / | $AWK '{print $1}'` fstype=`$GETFS | $GREP " / " | $AWK -F " " '{ print $5;}'` -[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" ] && +[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" -o "$fstype" = "ext4" ] && message FAIL rootdir001f "" "Root directory on incorrect inode"