unblock sendfile/2.1b.20080616-4

[Joey Schulze <joey@infodrom.org>]

Please allow sendfile 2.1b.20080616-4 to migrate into squeeze.
It closes one important and one nasty (not in bts, though) bug.

Regards,

	Joey

sendfile (2.1b.20080616-4) unstable; urgency=low

  * Terminate weekly cronjob (sf_cleenup) preemptively when no sendfile
    program exists (closes: Bug#571935)
  * Clean up temporary directory before exiting during weekly cronjob

 -- Joey Schulze <joey@infodrom.org>  Sun, 22 Aug 2010 14:49:42 +0200

Here's the patch:

Index: debian/sf_cleanup
===================================================================
RCS file: /var/cvs/debian/sendfile/debian/sf_cleanup,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- debian/sf_cleanup	15 Aug 2007 19:49:25 -0000	1.1
+++ debian/sf_cleanup	19 Aug 2010 21:35:51 -0000	1.2
@@ -5,6 +5,7 @@
 # see /etc/sendfile.cf for settings
 
 test -f /etc/sendfile.cf || exit 0
+test -x /usr/bin/sendfile || exit 0
 spooldir=$(sendfile -qW=spool)
 cd $spooldir || exit 0
 export LANG=C
Index: src/sendfile.c
===================================================================
RCS file: /var/cvs/debian/sendfile/src/sendfile.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- src/sendfile.c	19 Jun 2008 06:39:53 -0000	1.18
+++ src/sendfile.c	20 Aug 2010 20:56:03 -0000	1.19
@@ -855,7 +855,7 @@ const char
       if (quiet<2) message(prg,'I',"you may specify -W=config, -W=spool, or "
 			           "-W=userspool");
     } 
-    if (argc-optind<1) exit(0);
+    if (argc-optind<1) {cleanup();exit(0);}
   }
 
   /* check tmp files */


-- 
Life is too short to run proprietary software.  -- Bdale Garbee