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

[Matthijs Mohlmann]

Author: active2-guest
Date: Mon Jun 12 21:31:45 2006
New Revision: 99

Removed:
   trunk/debian/patches/fix-delivery-segv.dpatch
   trunk/debian/patches/ldap-verify-fix.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/patches/make-daemon-quiet.dpatch

Log:
 * New upstream release
 * Updated patch make-daemon-quiet
 * Removed patches ldap-verify-fix and fix-delivery-segv


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Mon Jun 12 21:31:45 2006
@@ -1,3 +1,12 @@
+dspam (3.6.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop patch ldap-verify-fix incorporated upstream.
+  * Drop patch fix-delivery-segv incorporated upstream.
+  * Updated patch make-daemon-quiet.
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Mon, 12 Jun 2006 20:39:21 +0200
+
 dspam (3.6.6-2) unstable; urgency=low
 
   * Update add-config-dir patch: patch from Daniel Kahn Gillmor

Modified: trunk/debian/patches/00list
==============================================================================
--- trunk/debian/patches/00list	(original)
+++ trunk/debian/patches/00list	Mon Jun 12 21:31:45 2006
@@ -7,7 +7,6 @@
 dspam-default.prefs-in_etc.dpatch
 where-to-find-txt-files.dpatch
 add-config-dir.dpatch
-ldap-verify-fix.dpatch
 autogen-sh.dpatch
 default-server-pidfile.dpatch
 background-dspam.dpatch
@@ -16,7 +15,6 @@
 make-daemon-quiet.dpatch
 make-dspam_clean-quiet.dpatch
 improper-quotation-fix.dpatch
-fix-delivery-segv.dpatch
 enable-domain-quarantine.dpatch
 virus-notifications.dpatch
 clean-warnings.dpatch

Modified: trunk/debian/patches/make-daemon-quiet.dpatch
==============================================================================
--- trunk/debian/patches/make-daemon-quiet.dpatch	(original)
+++ trunk/debian/patches/make-daemon-quiet.dpatch	Mon Jun 12 21:31:45 2006
@@ -5,15 +5,18 @@
 ## DP: No description.
 
 @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 @@
+diff -urNad dspam-3.6.8~/src/error.c dspam-3.6.8/src/error.c
+--- dspam-3.6.8~/src/error.c	2006-06-12 20:45:51.000000000 +0200
++++ dspam-3.6.8/src/error.c	2006-06-12 20:48:48.606521153 +0200
+@@ -79,11 +79,6 @@
+   pthread_mutex_lock(&__syslog_lock);
  #endif
  
-   va_start (ap, err);
+-  va_start (ap, err);
 -  vsnprintf (buf, sizeof (buf), err, ap);
 -  fprintf(stderr, "%ld: [%s] %s\n", (long) getpid(), format_date_r(date), buf);
- 
+-  va_end (ap);
+-
  #ifdef USE_SYSLOG
+   va_start (ap, err);
    openlog ("dspam", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_MAIL);