[Pkg-dspam-commits] [pkg-dspam-commits] r168 - in trunk/debian: . patches

[Kurt B. Kaiser]

Author: kbk-guest
Date: Tue Aug 12 17:41:02 2008
New Revision: 168

Log:
Add amavis to Trusted users.


Modified:
   trunk/debian/changelog
   trunk/debian/patches/update-dspam.conf.dpatch

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Tue Aug 12 17:41:02 2008
@@ -23,8 +23,8 @@
       sites-available.
     - Modify dspam-apache2.conf to install a working example website
       running on localhost.  Use /etc/dspam/passwd, which doesn't need access
-      to /etc/shadow.
-    - Clean up customize.cgi and add it to README.Debian (Closes: #430589). 
+      to /etc/shadow. (Closes: #430589)
+    - Clean up customize.cgi and add it to README.Debian. 
     - Delete the old, obsolete apache.conf file from the package, and
       purge it when dspam-webfrontend is purged if it is present in
       /etc/dspam/.
@@ -34,6 +34,7 @@
     - Use dh_lintian to install the webfrontend conffile override.
   * Add NEWS.Debian file with entry explaining web interface changes.
   * Move to Standards Version 3.8.0.
+  * Add amavis to trusted users (Closes: #477508)
 
  -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Fri, 08 Aug 2008 16:29:26 -0400
 

Modified: trunk/debian/patches/update-dspam.conf.dpatch
==============================================================================
--- trunk/debian/patches/update-dspam.conf.dpatch	(original)
+++ trunk/debian/patches/update-dspam.conf.dpatch	Tue Aug 12 17:41:02 2008
@@ -1,15 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
+#!/bin/sh /usr/share/dpatch/dpatch-run
 ## Updates dspam.conf
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Make some changes to dspam.conf
-
+## DP: KBK: Add amavis to Trusted users.  (Closes: #477508)
 
 @DPATCH@
-diff -urNad dspam-3.6.8~/src/dspam.conf.in dspam-3.6.8/src/dspam.conf.in
---- dspam-3.6.8~/src/dspam.conf.in	2006-10-07 19:53:52.737369150 +0200
-+++ dspam-3.6.8/src/dspam.conf.in	2006-10-07 19:54:11.653493462 +0200
-@@ -127,6 +127,7 @@
+diff -urNad dspam~/src/dspam.conf.in dspam/src/dspam.conf.in
+--- dspam~/src/dspam.conf.in	2008-08-12 13:35:42.000000000 -0400
++++ dspam/src/dspam.conf.in	2008-08-12 13:37:21.000000000 -0400
+@@ -127,10 +127,12 @@
  # able to specify delivery agent privileges or use tools.
  #
  Trust root
@@ -17,7 +16,12 @@
  Trust mail
  Trust mailnull 
  Trust smmsp
-@@ -246,7 +247,7 @@
+ Trust daemon
++Trust amavis
+ #Trust nobody
+ #Trust majordomo
+ 
+@@ -246,7 +248,7 @@
  # If user or default.prefs are found, the user's preferences will override any
  # defaults.
  #
@@ -26,7 +30,7 @@
  Preference "signatureLocation=message"	# 'message' or 'headers'
  Preference "showFactors=on"
  #Preference "spamAction=tag"
-@@ -267,92 +268,6 @@
+@@ -267,92 +269,6 @@
  AllowOverride optIn optOut
  AllowOverride whitelistThreshold
  
@@ -119,7 +123,7 @@
  # --- Oracle ---
  
  #OraServer       "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-@@ -563,7 +478,7 @@
+@@ -563,7 +479,7 @@
  # users will be filtered unless a .nodspam file is dropped in 
  # /var/dspam/opt-out/user.nodspam
  #
@@ -128,7 +132,7 @@
  
  #
  # TrackSources: specify which (if any) source addresses to track and report
-@@ -644,7 +559,7 @@
+@@ -644,7 +560,7 @@
  #
  #ServerPort		24
  #ServerQueueSize	32
@@ -137,7 +141,7 @@
  
  #
  # ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -721,4 +636,7 @@
+@@ -721,4 +637,7 @@
  #
  ProcessorBias on