[Pkg-dspam-commits] [pkg-dspam-commits] r261 - in branches/experimental/debian: . patches

[Julien Valroff]

Author: julien-guest
Date: Sat Aug 14 16:30:23 2010
New Revision: 261

Log:
Updates for current git HEAD

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/003_update-dspam.conf.diff
   branches/experimental/debian/patches/010_default-daemon-port.diff

Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog	Sat Aug  7 05:38:44 2010	(r260)
+++ branches/experimental/debian/changelog	Sat Aug 14 16:30:23 2010	(r261)
@@ -1,4 +1,4 @@
-dspam (3.9.1~rc1+git20100806-1) experimental; urgency=low
+dspam (3.9.1~rc1+git20100814-1) unstable; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
@@ -87,7 +87,7 @@
   * Only ships SQL files for MySQL >= 4.1 as no older version is available
     in Debian
 
- -- Julien Valroff <julien at kirya.net>  Sat, 07 Aug 2010 07:38:28 +0200
+ -- Julien Valroff <julien at kirya.net>  Sat, 14 Aug 2010 14:17:40 +0200
 
 dspam (3.6.8-9.3) unstable; urgency=low
 

Modified: branches/experimental/debian/patches/003_update-dspam.conf.diff
==============================================================================
--- branches/experimental/debian/patches/003_update-dspam.conf.diff	Sat Aug  7 05:38:44 2010	(r260)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff	Sat Aug 14 16:30:23 2010	(r261)
@@ -13,7 +13,7 @@
  #   libsqlite3_drv.so   libhash_drv.so
  #
  # IMPORTANT: Switching storage drivers requires more than merely changing
-@@ -143,10 +143,8 @@
+@@ -143,11 +143,10 @@
  #
  Trust root
  Trust dspam
@@ -23,9 +23,11 @@
 -Trust mailnull
 -Trust smmsp
  Trust daemon
++Trust amavis
  #Trust nobody
  #Trust majordomo
-@@ -286,7 +284,7 @@
+ 
+@@ -286,7 +285,7 @@
  # defaults.
  #
  Preference "trainingMode=TEFT"		# { TOE | TUM | TEFT | NOTRAIN } -> default:teft
@@ -34,7 +36,7 @@
  Preference "spamSubject=[SPAM]"		# { string } -> default:[SPAM]
  Preference "statisticalSedation=5"	# { 0 - 10 } -> default:0
  Preference "enableBNR=on"		# { on | off } -> default:off
-@@ -346,19 +344,19 @@
+@@ -346,19 +345,19 @@
  # Storage driver settings: Specific to a particular storage driver. Uncomment
  # the configuration specific to your installation, if applicable.
  #
@@ -63,7 +65,7 @@
  #MySQLWriteUser		dspam
  #MySQLWritePass		changeme
  #MySQLWriteDb		dspam_write
-@@ -405,11 +403,11 @@
+@@ -405,11 +404,11 @@
  # in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
  # resits (without .s.PGSQL.5432).
  
@@ -80,7 +82,7 @@
  
  # If you're running DSPAM in client/server (daemon) mode, uncomment the
  # setting below to override the default connection cache size (the number
-@@ -803,7 +801,7 @@
+@@ -803,7 +802,7 @@
  #ServerHost		127.0.0.1
  #ServerPort		24
  #ServerQueueSize	32
@@ -89,7 +91,7 @@
  
  #
  # ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -839,14 +837,14 @@
+@@ -839,14 +838,14 @@
  # you are running the client and server on the same machine, as it eliminates
  # much of the bandwidth overhead.
  #
@@ -106,7 +108,7 @@
  #ClientIdent	"secret at Relay1"
  #
  #ClientHost	127.0.0.1
-@@ -900,7 +898,7 @@
+@@ -900,7 +899,7 @@
  # --- Split Configuration File Support ---
  
  # Include a directory with configuration items.

Modified: branches/experimental/debian/patches/010_default-daemon-port.diff
==============================================================================
--- branches/experimental/debian/patches/010_default-daemon-port.diff	Sat Aug  7 05:38:44 2010	(r260)
+++ branches/experimental/debian/patches/010_default-daemon-port.diff	Sat Aug 14 16:30:23 2010	(r261)
@@ -25,7 +25,7 @@
  #DeliveryIdent		localhost
  #DeliveryProto		LMTP
  
-@@ -798,8 +798,12 @@
+@@ -799,8 +799,12 @@
  # ServerHost: Not enabling ServerHost will bind DSPAM server to all available
  # interfaces.
  #
@@ -39,7 +39,7 @@
  #ServerQueueSize	32
  #ServerPID		/var/run/dspam/dspam.pid
  
-@@ -848,7 +852,7 @@
+@@ -849,7 +853,7 @@
  #ClientIdent	"secret at Relay1"
  #
  #ClientHost	127.0.0.1