[pkg-dspam-commits] r36 - trunk/debian/patches

[Rudolf Weeber]

Author: mouvement-guest
Date: Fri Nov  4 16:28:35 2005
New Revision: 36

Added:
   trunk/debian/patches/update-dspam.conf.dpatch   (contents, props changed)
Modified:
   trunk/debian/patches/00list
Log:
Changed some defaults in dspam.conf
* Correct path to mysql socket
* "opt in" instead of "opt out"
* Spamaction=tag instead of quarantaine




Modified: trunk/debian/patches/00list
==============================================================================
--- trunk/debian/patches/00list	(original)
+++ trunk/debian/patches/00list	Fri Nov  4 16:28:35 2005
@@ -3,6 +3,7 @@
 link-dynamically.dpatch
 drivers-in-usr_lib_dspam.dpatch
 dspam-webfrontend-config-debian.dpatch
+update-dspam.conf.dpatch
 dspam-extpref-plain.dpatch
 dspam-default.prefs-in_etc.dpatch
 where-to-find-txt-files.dpatch

Added: trunk/debian/patches/update-dspam.conf.dpatch
==============================================================================
--- (empty file)
+++ trunk/debian/patches/update-dspam.conf.dpatch	Fri Nov  4 16:28:35 2005
@@ -0,0 +1,44 @@
+#! /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
+
+
+ at DPATCH@
+diff -urNad dspam-3.6.0~/src/dspam.conf.in dspam-3.6.0/src/dspam.conf.in
+--- dspam-3.6.0~/src/dspam.conf.in	2005-10-10 15:52:21.000000000 +0200
++++ dspam-3.6.0/src/dspam.conf.in	2005-11-02 14:18:22.000000000 +0100
+@@ -222,7 +222,7 @@
+ # If user or default.prefs are found, the user's preferences will override any
+ # defaults.
+ #
+-Preference "spamAction=quarantine"
++Preference "spamAction=tag"
+ Preference "signatureLocation=message"	# 'message' or 'headers'
+ Preference "showFactors=on"
+ #Preference "spamAction=tag"
+@@ -249,12 +249,12 @@
+ # Storage driver settings: Specific to a particular storage driver. Uncomment
+ # the configuration specific to your installation, if applicable.
+ #
+-#MySQLServer    	/var/lib/mysql/mysql.sock
++#MySQLServer    	/var/run/mysqld/mysqld.sock
+ #MySQLPort
+ #MySQLUser 	     	dspam
+ #MySQLPass    		changeme
+ #MySQLDb      	  	dspam
+-#MySQLCompress		true
++#MySQLCompress		false
+ 
+ # Use this if you have the 4.1 quote bug (see doc/mysql.txt)
+ #MySQLSupressQuote	on
+@@ -511,7 +511,7 @@
+ # users will be filtered unless a .nodspam file is dropped in 
+ # /var/dspam/opt-out/user.nodspam
+ #
+-Opt out
++Opt in 
+ 
+ #
+ # TrackSources: specify which (if any) source addresses to track and report