[pkg-dspam-commits] r94 - in trunk/debian: patches

[Matthijs Mohlmann]

Author: active2-guest
Date: Thu May 25 12:03:45 2006
New Revision: 94

Added:
   trunk/debian/patches/make-daemon-quiet.dpatch   (contents, props changed)
   trunk/debian/patches/make-dspam_clean-quiet.dpatch   (contents, props changed)
Modified:
   trunk/debian/changelog
   trunk/debian/dspam.cron.daily
   trunk/debian/patches/00list

Log:
 * Added 2 patches, make daemon quiet on startup (it's already logging to
   syslog) and make dspam_clean output to stdout instead of stderr. This will
   make it more easy to redirect stdout to /dev/null. Done so in cron.daily
   script.


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu May 25 12:03:45 2006
@@ -9,8 +9,9 @@
   * Updated patch dspam-webfrontend-config-debian. (default config for debian)
   * Updated patch update-dspam.conf (default config for debian)
   * Updated Standards-Version to 3.7.2.0
+  * Make dspam_clean a bit more quiet. (Closes: #368822)
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Fri, 19 May 2006 22:44:50 +0200
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Thu, 25 May 2006 13:59:00 +0200
 
 dspam (3.6.4-4) unstable; urgency=low
 

Modified: trunk/debian/dspam.cron.daily
==============================================================================
--- trunk/debian/dspam.cron.daily	(original)
+++ trunk/debian/dspam.cron.daily	Thu May 25 12:03:45 2006
@@ -6,7 +6,7 @@
 
 if egrep -q "^StorageDriver.*(hash|db4)_drv.so" $DSPAMCONF; then
   if [ -x /usr/bin/dspam_clean ]; then
-    /usr/bin/dspam_clean -s -p
+    /usr/bin/dspam_clean -s -p >/dev/null
   fi
 fi
 

Modified: trunk/debian/patches/00list
==============================================================================
--- trunk/debian/patches/00list	(original)
+++ trunk/debian/patches/00list	Thu May 25 12:03:45 2006
@@ -13,3 +13,5 @@
 background-dspam.dpatch
 pos-neg-switched.dpatch
 fix-nav-performance.dpatch
+make-daemon-quiet.dpatch
+make-dspam_clean-quiet.dpatch

Added: trunk/debian/patches/make-daemon-quiet.dpatch
==============================================================================
--- (empty file)
+++ trunk/debian/patches/make-daemon-quiet.dpatch	Thu May 25 12:03:45 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make-daemon-quiet.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad dspam-3.6.6~/src/error.c dspam-3.6.6/src/error.c
+--- dspam-3.6.6~/src/error.c	2006-05-14 17:54:01.000000000 +0200
++++ dspam-3.6.6/src/error.c	2006-05-25 13:58:01.197319568 +0200
+@@ -80,8 +80,6 @@
+ #endif
+ 
+   va_start (ap, err);
+-  vsnprintf (buf, sizeof (buf), err, ap);
+-  fprintf(stderr, "%ld: [%s] %s\n", (long) getpid(), format_date_r(date), buf);
+ 
+ #ifdef USE_SYSLOG
+   openlog ("dspam", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_MAIL);

Added: trunk/debian/patches/make-dspam_clean-quiet.dpatch
==============================================================================
--- (empty file)
+++ trunk/debian/patches/make-dspam_clean-quiet.dpatch	Thu May 25 12:03:45 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make-dspam_clean-quiet.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad dspam-3.6.6~/src/tools/dspam_clean.c dspam-3.6.6/src/tools/dspam_clean.c
+--- dspam-3.6.6~/src/tools/dspam_clean.c	2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/src/tools/dspam_clean.c	2006-05-25 12:55:47.552919792 +0200
+@@ -122,7 +122,7 @@
+   }
+ 
+ #ifdef DEBUG
+-  fprintf (stderr, "dspam_clean starting\n");
++  fprintf (stdout, "dspam_clean starting\n");
+ #endif
+ 
+   if (_ds_read_attribute(agent_config, "PurgeSignatures") &&