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

Sat Aug 7 05:38:45 UTC 2010

Author: julien-guest
Date: Sat Aug  7 05:38:44 2010
New Revision: 260

Log:
Update for current git head

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff
   branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
   branches/experimental/debian/patches/003_update-dspam.conf.diff
   branches/experimental/debian/patches/010_default-daemon-port.diff
   branches/experimental/debian/rules

Modified: branches/experimental/debian/changelog
==============================================================================

--- branches/experimental/debian/changelog	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/changelog	Sat Aug  7 05:38:44 2010	(r260)
@@ -1,4 +1,4 @@
-dspam (3.9.1~rc1-1) experimental; urgency=low
+dspam (3.9.1~rc1+git20100806-1) experimental; 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>  Mon, 19 Jul 2010 18:23:37 +0200
+ -- Julien Valroff <julien at kirya.net>  Sat, 07 Aug 2010 07:38:28 +0200
 
 dspam (3.6.8-9.3) unstable; urgency=low
 

Modified: branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff
==============================================================================
--- branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff	Sat Aug  7 05:38:44 2010	(r260)
@@ -12,4 +12,4 @@
 +StorageDriver /usr/lib/dspam/libhash_drv.so
  
  #
- # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call 
+ # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call

Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sat Aug  7 05:38:44 2010	(r260)
@@ -164,7 +164,7 @@
    while(<FILE>) {
      chomp;
      if ($_ !~ /^\s*#/) {
-@@ -1821,6 +1821,7 @@
+@@ -1817,6 +1817,7 @@
    my(%PREFS);
  
    my($FILE) = "$USER.prefs";
@@ -172,7 +172,7 @@
  
    if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
      my $PREF_USER = $CURRENT_USER;
-@@ -1836,10 +1837,10 @@
+@@ -1832,10 +1833,10 @@
  
    if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
  

Modified: branches/experimental/debian/patches/003_update-dspam.conf.diff
==============================================================================
--- branches/experimental/debian/patches/003_update-dspam.conf.diff	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff	Sat Aug  7 05:38:44 2010	(r260)
@@ -13,21 +13,19 @@
  #   libsqlite3_drv.so   libhash_drv.so
  #
  # IMPORTANT: Switching storage drivers requires more than merely changing
-@@ -143,11 +143,10 @@
+@@ -143,10 +143,8 @@
  #
  Trust root
  Trust dspam
 -Trust apache
 +Trust www-data
  Trust mail
--Trust mailnull 
+-Trust mailnull
 -Trust smmsp
  Trust daemon
-+Trust amavis
  #Trust nobody
  #Trust majordomo
- 
-@@ -286,7 +285,7 @@
+@@ -286,7 +284,7 @@
  # defaults.
  #
  Preference "trainingMode=TEFT"		# { TOE | TUM | TEFT | NOTRAIN } -> default:teft
@@ -36,7 +34,7 @@
  Preference "spamSubject=[SPAM]"		# { string } -> default:[SPAM]
  Preference "statisticalSedation=5"	# { 0 - 10 } -> default:0
  Preference "enableBNR=on"		# { on | off } -> default:off
-@@ -346,19 +345,19 @@
+@@ -346,19 +344,19 @@
  # Storage driver settings: Specific to a particular storage driver. Uncomment
  # the configuration specific to your installation, if applicable.
  #
@@ -65,7 +63,7 @@
  #MySQLWriteUser		dspam
  #MySQLWritePass		changeme
  #MySQLWriteDb		dspam_write
-@@ -405,11 +404,11 @@
+@@ -405,11 +403,11 @@
  # in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
  # resits (without .s.PGSQL.5432).
  
@@ -82,7 +80,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 +802,7 @@
+@@ -803,7 +801,7 @@
  #ServerHost		127.0.0.1
  #ServerPort		24
  #ServerQueueSize	32
@@ -91,7 +89,7 @@
  
  #
  # ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -839,14 +838,14 @@
+@@ -839,14 +837,14 @@
  # you are running the client and server on the same machine, as it eliminates
  # much of the bandwidth overhead.
  #
@@ -108,7 +106,7 @@
  #ClientIdent	"secret at Relay1"
  #
  #ClientHost	127.0.0.1
-@@ -900,7 +899,7 @@
+@@ -900,7 +898,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	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/patches/010_default-daemon-port.diff	Sat Aug  7 05:38:44 2010	(r260)
@@ -25,7 +25,7 @@
  #DeliveryIdent		localhost
  #DeliveryProto		LMTP
  
-@@ -799,8 +799,12 @@
+@@ -798,8 +798,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
  
-@@ -849,7 +853,7 @@
+@@ -848,7 +852,7 @@
  #ClientIdent	"secret at Relay1"
  #
  #ClientHost	127.0.0.1

Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules	Sun Jul 25 12:33:47 2010	(r259)
+++ branches/experimental/debian/rules	Sat Aug  7 05:38:44 2010	(r260)
@@ -71,6 +71,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+	./autogen.sh
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIGURE)
 	touch configure-stamp
 

