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

[Matthijs Mohlmann]

Author: active2-guest
Date: Tue Jan  3 12:50:39 2006
New Revision: 62

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/libdspam7-drv-mysql.postinst
   trunk/debian/libdspam7-drv-pgsql.postinst
   trunk/debian/patches/update-dspam.conf.dpatch
Log:
 * Added dependency libgd-graph3d-perl so graphs in the webinterface works
 * Updated dspam.conf to Trust the user dspam (this fixes some permissioni
   problems)
 * Install the postgresql and mysql config with owner dspam and permissions 640
   (this fixes permission problems)
 * Updated the changelog


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Tue Jan  3 12:50:39 2006
@@ -14,8 +14,12 @@
   * Added a patch to background dspam when issued with --daemon
   * Updated init script to give a TERM on stop instead of a HUP which is
     actually a reload of the configuration file.
+  * Updated the permission problems in /etc/dspam/dspam.d
+  * Updated the dspam.conf and Trust user dspam. (Otherwise it isn't possible
+    to train messages in the web interface)
+  * Make dspam easier to backport to Sarge
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Mon,  2 Jan 2006 13:13:21 +0100
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Tue,  3 Jan 2006 12:21:17 +0100
 
 dspam (3.6.2-1) experimental; urgency=low
 

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Tue Jan  3 12:50:39 2006
@@ -23,7 +23,7 @@
 
 Package: dspam-webfrontend
 Architecture: all
-Depends: libgd-gd2-perl
+Depends: libgd-gd2-perl, libgd-graph3d-perl
 Suggests: libapache-mod-perl | libapache-mod-perl2, libapache-mod-auth-curdir | libapache-mod-auth-kerb | libapache-mod-auth-mysql | libapache-mod-auth-pam | libapache-mod-auth-pgsql | libapache-mod-auth-plain | libapache-mod-auth-radius | libapache-mod-auth-shadow | libapache-mod-auth-useragent | libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-sys-group
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -69,7 +69,7 @@
 
 Package: libdspam7-drv-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0, ucf, postgresql-client-8.1
+Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0, ucf, postgresql-client-8.1 | postgresql-client
 Recommends: postgresql-8.1
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter

Modified: trunk/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postinst	(original)
+++ trunk/debian/libdspam7-drv-mysql.postinst	Tue Jan  3 12:50:39 2006
@@ -12,6 +12,8 @@
 
 # Set some variables
 dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
+dbc_generate_include_owner="dspam"
+dbc_generate_include_perms="640"
 dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-mysql/mysql.conf'"
 
 # Run dbconfig

Modified: trunk/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postinst	(original)
+++ trunk/debian/libdspam7-drv-pgsql.postinst	Tue Jan  3 12:50:39 2006
@@ -9,6 +9,8 @@
 
 # Set some variables
 dbc_generate_include=template:/etc/dspam/dspam.d/pgsql.conf
+dbc_generate_include_owner="dspam"
+dbc_generate_include_perms="640"
 dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-pgsql/pgsql.conf'"
 
 # Load dbconfig (pgsql part)

Modified: trunk/debian/patches/update-dspam.conf.dpatch
==============================================================================
--- trunk/debian/patches/update-dspam.conf.dpatch	(original)
+++ trunk/debian/patches/update-dspam.conf.dpatch	Tue Jan  3 12:50:39 2006
@@ -6,10 +6,18 @@
 
 
 @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-11-10 15:53:06.914293500 +0100
-+++ dspam-3.6.0/src/dspam.conf.in	2005-11-10 15:53:27.015549750 +0100
-@@ -222,7 +222,7 @@
+diff -urNad dspam-3.6.2~/src/dspam.conf.in dspam-3.6.2/src/dspam.conf.in
+--- dspam-3.6.2~/src/dspam.conf.in	2006-01-03 12:14:46.613186250 +0100
++++ dspam-3.6.2/src/dspam.conf.in	2006-01-03 12:15:15.178971500 +0100
+@@ -115,6 +115,7 @@
+ # able to specify delivery agent privileges or use tools.
+ #
+ Trust root
++Trust dspam
+ Trust mail
+ Trust mailnull 
+ Trust smmsp
+@@ -222,7 +223,7 @@
  # If user or default.prefs are found, the user's preferences will override any
  # defaults.
  #
@@ -18,7 +26,7 @@
  Preference "signatureLocation=message"	# 'message' or 'headers'
  Preference "showFactors=on"
  #Preference "spamAction=tag"
-@@ -243,76 +243,6 @@
+@@ -243,76 +244,6 @@
  AllowOverride optIn optOut
  AllowOverride whitelistThreshold
  
@@ -95,7 +103,7 @@
  # --- Oracle ---
  
  #OraServer       "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-@@ -511,7 +441,7 @@
+@@ -517,7 +448,7 @@
  # users will be filtered unless a .nodspam file is dropped in 
  # /var/dspam/opt-out/user.nodspam
  #
@@ -104,7 +112,7 @@
  
  #
  # TrackSources: specify which (if any) source addresses to track and report
-@@ -669,4 +599,7 @@
+@@ -675,4 +606,7 @@
  #
  ProcessorBias on