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

Julien Valroff julien-guest at alioth.debian.org
Sun Nov 29 09:26:53 UTC 2009


Author: julien-guest
Date: Sun Nov 29 09:26:52 2009
New Revision: 216

Log:
Renamed patches

Added:
   branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff   (contents, props changed)
   branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff   (contents, props changed)
   branches/experimental/debian/patches/003_update-dspam.conf.diff   (contents, props changed)
   branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff   (contents, props changed)
   branches/experimental/debian/patches/005_background-dspam.diff   (contents, props changed)
   branches/experimental/debian/patches/006_clean-manpages.diff   (contents, props changed)
   branches/experimental/debian/patches/007_path-to-dspam_for-training-script.diff   (contents, props changed)
   branches/experimental/debian/patches/008_where-to-find-txt-files.diff   (contents, props changed)
   branches/experimental/debian/patches/100_fix-fr-templates.diff   (contents, props changed)
   branches/experimental/debian/patches/101_strings.pl-hack.diff   (contents, props changed)
Deleted:
   branches/experimental/debian/patches/01_drivers-in-usr_lib_dspam.diff
   branches/experimental/debian/patches/02_dspam-webfrontend-config-debian.diff
   branches/experimental/debian/patches/03_update-dspam.conf.diff
   branches/experimental/debian/patches/04_dspam-default.prefs-in_etc.diff
   branches/experimental/debian/patches/05_background-dspam.diff
   branches/experimental/debian/patches/06_clean-manpages.diff
   branches/experimental/debian/patches/07_path-to-dspam_for-training-script.diff
   branches/experimental/debian/patches/09_where-to-find-txt-files.diff
   branches/experimental/debian/patches/10_fix-fr-templates.diff
   branches/experimental/debian/patches/11_strings.pl-hack.diff
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/series

Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog	Thu Nov 26 19:28:47 2009	(r215)
+++ branches/experimental/debian/changelog	Sun Nov 29 09:26:52 2009	(r216)
@@ -1,4 +1,4 @@
-dspam (3.9.0~beta4-1) stable; urgency=low
+dspam (3.9.0~beta4-1) experimental; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
@@ -65,7 +65,7 @@
   * Fix verbose_bug build option
   * Add logrotate entry for dspam.messages and sql.errors
   * Add 'notifempty' option for logrotate
-  * Fix 'hyphen-used-as-minus-sign' lintian information: escape all -
+  * Fix 'hyphen-used-as-minus-sign' lintian information: escape all --
     in manpages
   * Update dspam_admin manpage to list aggregate feature
   * Makes drv-sqlite3 daily cronjob quiet if package is removed and

Added: branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/001_drivers-in-usr_lib_dspam.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,15 @@
+Description: Default hash storage driver is installed in /usr/lib/dspam
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/src/dspam.conf.in
++++ b/src/dspam.conf.in
+@@ -26,7 +26,7 @@
+ # this option. If you do not wish to lose all of your data, you will need to
+ # migrate it to the new backend before making this change.
+ #
+-StorageDriver @libdir@/dspam/@storage_driver@
++StorageDriver /usr/lib/dspam/libhash_drv.so
+ 
+ #
+ # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call 

Added: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,184 @@
+Description: Debian configuration for the WebUI
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/webui/cgi-bin/admin.cgi
++++ b/webui/cgi-bin/admin.cgi
+@@ -24,7 +24,7 @@
+ require "ctime.pl";
+ 
+ # Read configuration parameters common to all CGI scripts
+-require "configure.pl";
++require "/etc/dspam/webfrontend.conf";
+ 
+ #
+ # Read language file
+@@ -48,7 +48,7 @@
+ #
+ do {
+   my($admin) = 0;
+-  open(FILE, "<./admins");
++  open(FILE, "/etc/dspam/admins");
+   while(<FILE>) {
+     chomp;
+     if ($_ eq $ENV{'REMOTE_USER'}) {
+@@ -145,9 +145,9 @@
+ 
+   $DATA{'USERNAME'} = $USER;
+ 
+-  if ($FORM{'username'} eq "") {
+-    $FILE = "./default.prefs";
+-    if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "$CONFIG{'DSPAM_HOME'}/default.prefs") {
++  if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
++    $FILE = "/etc/dspam/default.prefs";
++    if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "/etc/dspam/default.prefs") {
+       $DATA{'ERROR'} = "<em>WARNING:</em> " .
+         "These default preferences will not be loaded by DSPAM, but only by ".
+         " the CGI interface when a user initially sets up their preferences. ".
+@@ -241,7 +241,7 @@
+   }
+ 
+   if (! -e $FILE) {
+-    %PREFS = GetPrefs($USER, "./default.prefs");
++    %PREFS = GetPrefs($USER, "/etc/dspam/default.prefs");
+   } else {
+     %PREFS = GetPrefs($USER, $FILE);
+   }
+@@ -833,7 +833,7 @@
+     close(PIPE);
+   } else {
+     if (! -e $FILE) {
+-      $FILE = "./default.prefs";
++      $FILE = "/etc/dspam/default.prefs";
+     }
+                                                                                 
+     if (! -e $FILE) {
+--- a/webui/cgi-bin/admingraph.cgi
++++ b/webui/cgi-bin/admingraph.cgi
+@@ -24,7 +24,7 @@
+ use vars qw { %CONFIG %FORM %LANG @spam @nonspam @period @data @inoc @sm @fp @wh @corpus @virus @black @block };
+ 
+ # Read configuration parameters common to all CGI scripts
+-require "configure.pl";
++require "/etc/dspam/webfrontend.conf";
+ 
+ #
+ # Read language file
+@@ -39,7 +39,7 @@
+ 
+ %FORM = &ReadParse();
+ 
+-GD::Graph::colour::read_rgb("rgb.txt"); 
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt"); 
+ 
+ do {
+   my($spam, $nonspam, $sm, $fp, $inoc, $wh, $corpus, $virus, $black, $block, $period) = split(/\_/, $FORM{'data'});
+--- a/webui/cgi-bin/configure.pl.in
++++ b/webui/cgi-bin/configure.pl.in
+@@ -29,11 +29,11 @@
+ $CONFIG{'DSPAM_STATS'}	= $CONFIG{'DSPAM_BIN'} . "/dspam_stats";
+ $CONFIG{'DSPAM_ARGS'}	= "--deliver=innocent --class=innocent " .
+                           "--source=error --user %CURRENT_USER% -d %u";
+-$CONFIG{'TEMPLATES'}	= "./templates";	# Location of HTML templates
++$CONFIG{'TEMPLATES'}	= "/etc/dspam/templates";	# Location of HTML templates
+ $CONFIG{'DSPAM_PROCESSES'} = "ps auxw | grep dspam | grep -v 'grep\|cgi\|sock' | wc -l"; # use ps -deaf for Solaris
+ $CONFIG{'MAIL_QUEUE'}   = "mailq | grep '^[0-9,A-F]\{10,12\}[\t ][\t ]*[1-9]' | wc -l";
+ 
+-$CONFIG{'WEB_ROOT'}     = ""; # URL location of included htdocs/ files
++$CONFIG{'WEB_ROOT'}     = "/usr/share/dspam/"; # URL location of included htdocs/ files
+ 
+ # Default DSPAM display
+ #$CONFIG{'DATE_FORMAT'}  = "%d.%m.%Y %H:%M"; # Date format in strftime style
+@@ -44,8 +44,7 @@
+ $CONFIG{'MAX_COL_LEN'}	= 50;		# Max chars in list columns
+ $CONFIG{'SORT_DEFAULT'}	= "Rating";	# Show quarantine by "Date" or "Rating"
+ $CONFIG{'3D_GRAPHS'}	= 1;
+-$CONFIG{'OPTMODE'}	= "NONE";	# OUT=OptOut IN=OptIn NONE=not selectable
+-$CONFIG{'LOCAL_DOMAIN'}	= "localhost";
++$CONFIG{'OPTMODE'}	= "IN";		# OUT=OptOut IN=OptIn NONE=not selectable
+ 
+ # Add customized settings below
+ $CONFIG{'LOCAL_DOMAIN'}	= "yourdomain.com";
+@@ -57,10 +56,9 @@
+ 
+ # Or, if you're running dspam.cgi as untrusted, it won't be able to auto-detect
+ # so you will need to specify some features manually:
+-#$CONFIG{'AUTODETECT'} = 0;
+ #$CONFIG{'LARGE_SCALE'} = 0;
+-#$CONFIG{'DOMAIN_SCALE'} = 0;
+-#$CONFIG{'PREFERENCES_EXTENSION'} = 0;
++#$CONFIG{'DOMAIN_SCALE'} = 1;
++#$CONFIG{'PREFERENCES_EXTENSION'} = 1;
+ 
+ # Get DSPAM version
+ $CONFIG{'DSPAM_VERSION'} = "Unknown Version";
+--- a/webui/cgi-bin/dspam.cgi
++++ b/webui/cgi-bin/dspam.cgi
+@@ -25,7 +25,7 @@
+ require "ctime.pl";
+ 
+ # Read configuration parameters common to all CGI scripts
+-require "configure.pl";
++require "/etc/dspam/webfrontend.conf";
+ 
+ #
+ # Read language file
+@@ -78,7 +78,7 @@
+ 
+ $CONFIG{'ADMIN'} = 0;
+ if ($ENV{'REMOTE_USER'} ne "") {
+-  open(FILE, "<./admins");
++  open(FILE, "/etc/dspam/admins");
+   while(<FILE>) {
+     chomp;
+     if ($_ eq $ENV{'REMOTE_USER'}) {
+@@ -637,7 +637,7 @@
+ 
+ sub DisplayPreferences {
+   my(%PREFS);
+-  my($FILE) = "$USER.prefs";
++  my($FILE) = "/etc/dspam/default.prefs";
+ 
+   my $username = $CURRENT_USER;
+ 
+@@ -1655,6 +1655,7 @@
+   my(%PREFS);
+ 
+   my($FILE) = "$USER.prefs";
++  my($DEFAULT_PREFS) = "/etc/dspam/default.prefs";
+ 
+   if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
+     open(PIPE, "$CONFIG{'DSPAM_BIN'}/dspam_admin agg pref " . quotemeta($CURRENT_USER) . "|");
+@@ -1668,10 +1669,10 @@
+ 
+   if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
+ 
+-    if (! -e "./default.prefs") {
++    if (! -e "$DEFAULT_PREFS") {
+       &error("$LANG{'error_load_default_prefs'}");
+     }
+-    open(FILE, "<./default.prefs");
++    open(FILE, "<$DEFAULT_PREFS");
+     while(<FILE>) {
+       chomp;
+       my($directive, $value) = split(/\=/);
+--- a/webui/cgi-bin/graph.cgi
++++ b/webui/cgi-bin/graph.cgi
+@@ -25,7 +25,7 @@
+ use vars qw { %CONFIG %FORM %LANG @spam_day @nonspam_day @period @data };
+ 
+ # Read configuration parameters common to all CGI scripts
+-require "configure.pl";
++require "/etc/dspam/webfrontend.conf";
+ 
+ #
+ # Read language file
+@@ -40,7 +40,7 @@
+ 
+ %FORM = &ReadParse();
+ 
+-GD::Graph::colour::read_rgb("rgb.txt"); 
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
+ 
+ do {
+   my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});

Added: branches/experimental/debian/patches/003_update-dspam.conf.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,263 @@
+Description: Debian default configuration
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/src/dspam.conf.in
++++ b/src/dspam.conf.in
+@@ -129,11 +129,10 @@
+ #
+ Trust root
+ Trust dspam
+-Trust apache
++Trust www-data
+ Trust mail
+-Trust mailnull 
+-Trust smmsp
+ Trust daemon
++Trust amavis
+ #Trust nobody
+ #Trust majordomo
+ 
+@@ -273,11 +272,11 @@
+ # If user or default.prefs are found, the user's preferences will override any
+ # defaults.
+ #
+-Preference "spamAction=quarantine"
++#Preference "spamAction=quarantine"
+ Preference "signatureLocation=message"	# 'message' or 'headers'
+ Preference "showFactors=on"
+-#Preference "spamAction=tag"
+-#Preference "spamSubject=SPAM"
++Preference "spamAction=tag"
++Preference "spamSubject=SPAM"
+ 
+ #
+ # Overrides: Specifies the user preferences which may override configuration
+@@ -294,175 +293,6 @@
+ AllowOverride optIn optOut
+ AllowOverride whitelistThreshold
+ 
+-# --- MySQL ---
+-
+-#
+-# Storage driver settings: Specific to a particular storage driver. Uncomment
+-# the configuration specific to your installation, if applicable.
+-#
+-#MySQLServer    	/var/lib/mysql/mysql.sock
+-#MySQLPort
+-#MySQLUser 	     	dspam
+-#MySQLPass    		changeme
+-#MySQLDb      	  	dspam
+-#MySQLCompress		true
+-#MySQLReconnect		true
+-
+-# If you are using replication for clustering, you can also specify a separate
+-# server to perform all writes to.
+-#
+-#MySQLWriteServer	/var/lib/mysql/mysql.sock
+-#MySQLWritePort		
+-#MySQLWriteUser		dspam
+-#MySQLWritePass		changeme
+-#MySQLWriteDb		dspam_write
+-#MySQLCompress		true
+-#MySQLReconnect		true
+-
+-# If your replication isn't close to real-time, your retraining might fail if 
+-# the  signature isn't found. One workaround for this is to use the write
+-# database for all signature reads:
+-#
+-#MySQLReadSignaturesFromWriteDb	on
+-
+-# Use this if you have the 4.1 quote bug (see doc/mysql.txt)
+-#MySQLSupressQuote	on
+-
+-# If you're running DSPAM in client/server (daemon) mode, uncomment the
+-# setting below to override the default connection cache size (the number
+-# of connections the server pools between all clients). The connection cache
+-# represents the maximum number of database connections *available* and should
+-# be set based on the maximum number of concurrent connections you're likely
+-# to have. Each connection may be used by only one thread at a time, so all
+-# other threads _will block_ until another connection becomes available.
+-#
+-#MySQLConnectionCache	10
+-
+-# If you're using vpopmail or some other type of virtual setup and wish to
+-# change the table dspam uses to perform username/uid lookups, you can over-
+-# ride it below
+-
+-#MySQLVirtualTable          dspam_virtual_uids
+-#MySQLVirtualUIDField       uid
+-#MySQLVirtualUsernameField  username
+-
+-# UIDInSignature: MySQL supports the insertion of the user id into the DSPAM 
+-# signature. This allows you to create one single spam or fp alias 
+-# (pointing to some arbitrary user), and the uid in the signature will
+-# switch to the correct user. Result: you need only one spam alias 
+-
+-#MySQLUIDInSignature    on
+-
+-# --- PostgreSQL ---
+-
+-#PgSQLServer    	127.0.0.1
+-#PgSQLPort      	5432
+-#PgSQLUser      	dspam
+-#PgSQLPass      	changeme
+-#PgSQLDb        	dspam
+-
+-# If you're running DSPAM in client/server (daemon) mode, uncomment the
+-# setting below to override the default connection cache size (the number
+-# of connections the server pools between all clients).
+-#
+-#PgSQLConnectionCache	3
+-
+-# UIDInSignature: PgSQL supports the insertion of the user id into the DSPAM 
+-# signature. This allows you to create one single spam or fp alias 
+-# (pointing to some arbitrary user), and the uid in the signature will
+-# switch to the correct user. Result: you need only one spam alias
+-
+-#PgSQLUIDInSignature	on 
+-
+-# If you're using vpopmail or some other type of virtual setup and wish to
+-# change the table dspam uses to perform username/uid lookups, you can over-
+-# ride it below
+-
+-#PgSQLVirtualTable          dspam_virtual_uids
+-#PgSQLVirtualUIDField       uid
+-#PgSQLVirtualUsernameField  username
+-
+-# --- SQLite ---
+-
+-#SQLitePragma   "synchronous = OFF"
+-
+-# --- Hash ---
+-
+-#
+-# HashRecMax: Default number of records to create in the initial segment when
+-# building hash files. 100,000 yields files 1.6MB in size, but can fill up
+-# fast, so be sure to increase this (to a million or more) if you're not using
+-# autoextend.
+-#
+-# NOTE: If you're using a heavy-weight tokenizer, such as SBPH, you should be
+-#       looking for settings in the 'millions' of records.
+-#
+-# Primes List:
+-#  53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 49157, 98317, 196613,
+-#  393241, 786433, 1572869, 3145739, 6291469, 12582917, 25165843, 50331653, 
+-#  100663319, 201326611, 402653189, 805306457, 1610612741, 3221225473, 
+-#  4294967291
+-#
+-HashRecMax		98317
+-
+-#
+-# HashAutoExtend: Autoextend hash databases when they fill up. This allows
+-# them to continue to train by adding extents (extensions) to the file. There 
+-# will be a small delay during the growth process, as everything needs to be 
+-# closed and remapped. 
+-#
+-HashAutoExtend		on  
+-
+-#
+-# HashMaxExtents: The maximum number of extents that may be created in a single
+-# hash file. Set this to zero for unlimited
+-#
+-HashMaxExtents		0
+-
+-#
+-# HashExtentSize: The initial record size for newly created extents. Creating 
+-# this too small could result in many extents being created. Creating this too 
+-# large could result in excessive disk space usage. Typically, a value close 
+-# to half of the HashRecMax size is good.
+-#
+-HashExtentSize		49157
+-
+-#
+-# HashPctIncrease: Increase the next extent size by n% from the size of the
+-# last extent. This is useful in accommodating systems where the default 
+-# HashExtentSize can be too small for certain high-volume users, and can also
+-# help keep seeks nice and speedy and/or prevent too many unnecessary extents 
+-# from being created when using a low HashMaxSeek. The default behavior, when 
+-# HashPctIncrease is not used, is to always use # HashExtentSize with no 
+-# increase.
+-#
+-HashPctIncrease 10
+-
+-#
+-# HashMaxSeek: The maximum number of record seeks when inserting a new record
+-# before failing or adding a new extent. This ultimately translates into the
+-# max # of acceptable seeks per segment. Setting this too high will exhaustively
+-# scan each segment and hurt performance. Typically, a low value is acceptable
+-# as even older extents will continue to fill as training progresses.
+-#
+-HashMaxSeek		10
+-
+-#
+-# HashConcurrentUser: If you are using a single, stateful hash database in
+-# daemon mode, specifying a concurrent user below will cause the user to be 
+-# permanently mapped into memory and shared via rwlocks. This is very fast and
+-# very cool if you are running a "userless" relay appliance.
+-#
+-#HashConcurrentUser	user
+-
+-#
+-# HashConnectionCache: If running in daemon mode, this is the max # of
+-# concurrent connections that will be supported. NOTE: If you are using
+-# HashConcurrentUser, this option is ignored, as all connections are read-
+-# write locked instead of mutex locked.
+-#
+-HashConnectionCache	10
+-
+ 
+ # -- ExtLookup --
+ 
+@@ -651,7 +481,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
+@@ -659,7 +489,7 @@
+ # blacklist and would like to use this information. Spam reporting also drops
+ # RABL blacklist files (see http://www.nuclearelephant.com/projects/rabl/). 
+ #
+-#TrackSources spam nonspam
++#TrackSources spam nonspam virus
+ 
+ #
+ # ParseToHeaders: In lieu of setting up individual aliases for each user,
+@@ -738,7 +568,7 @@
+ #ServerHost		127.0.0.1
+ #ServerPort		24
+ #ServerQueueSize	32
+-#ServerPID              /var/run/dspam.pid
++#ServerPID              /var/run/dspam/dspam.pid
+ 
+ #
+ # ServerMode specifies the type of LMTP server to start. This can be one of:
+@@ -774,14 +604,14 @@
+ # you are running the client and server on the same machine, as it eliminates
+ # much of the bandwidth overhead.
+ #
+-#ServerDomainSocketPath  "/tmp/dspam.sock"
++ServerDomainSocketPath  "/var/run/dspam/dspam.sock"
+ 
+ #
+ # Client Mode: If you are running DSPAM in client/server mode, uncomment and
+ # set these variables. A ClientHost beginning with a / will be treated as
+ # a domain socket.
+ #
+-#ClientHost	/tmp/dspam.sock
++#ClientHost	/var/run/dspam/dspam.sock
+ #ClientIdent	"secret at Relay1"
+ #
+ #ClientHost	127.0.0.1
+@@ -828,4 +658,7 @@
+ #
+ StripRcptDomain off
+ 
++# Include a directory with configuration items.
++Include /etc/dspam/dspam.d/
++
+ ## EOF

Added: branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,50 @@
+Description: default.prefs file is installed in /etc/dspam
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/src/pref.c
++++ b/src/pref.c
+@@ -179,7 +179,7 @@
+   PTX[0] = NULL;
+ 
+   if (user == NULL) {
+-    snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
++    snprintf(filename, MAX_FILENAME_LENGTH, "/etc/dspam/default.prefs", home);
+   } else {
+     _ds_userdir_path (filename, home, user, "prefs");
+   }
+@@ -307,7 +307,7 @@
+   FILE *out_file;
+ 
+   if (username == NULL) {
+-    snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
++    snprintf(filename, MAX_FILENAME_LENGTH, "/etc/dspam/default.prefs", home);
+   } else {
+     _ds_userdir_path (filename, home, username, "prefs");
+   }
+@@ -334,7 +334,7 @@
+   int nlines; 
+ 
+   if (username == NULL) {
+-    snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
++    snprintf(filename, MAX_FILENAME_LENGTH, "/etc/dspam/default.prefs", home);
+   } else {
+     _ds_userdir_path (filename, home, username, "prefs");
+   }
+--- a/webui/cgi-bin/admin.cgi
++++ b/webui/cgi-bin/admin.cgi
+@@ -147,14 +147,6 @@
+ 
+   if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
+     $FILE = "/etc/dspam/default.prefs";
+-    if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "/etc/dspam/default.prefs") {
+-      $DATA{'ERROR'} = "<em>WARNING:</em> " .
+-        "These default preferences will not be loaded by DSPAM, but only by ".
+-        " the CGI interface when a user initially sets up their preferences. ".
+-        "To have DSPAM override its configuration with these default ".
+-        "preferences, symlink $CONFIG{'DSPAM_HOME'}/default.prefs to the ".
+-        "default.prefs file in the CGI directory.<BR><BR>";
+-    }
+   } else {
+     $FILE = GetPath($FORM{'username'}) . ".prefs";
+   }

Added: branches/experimental/debian/patches/005_background-dspam.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/005_background-dspam.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,19 @@
+Description: Fork dspam into the background.
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: http://www.mail-archive.com/dspam-devel@lists.sourceforge.net/msg00052.html
+
+
+--- a/src/dspam.c
++++ b/src/dspam.c
+@@ -3944,6 +3944,11 @@
+   DRIVER_CTX DTX;
+   char *pidfile;
+ 
++  /* Fork dspam into the background */
++  if (fork()) {
++    exit(EXIT_SUCCESS);
++  }
++
+   __daemon_run  = 1;
+   __num_threads = 0;
+   __hup = 0;

Added: branches/experimental/debian/patches/006_clean-manpages.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/006_clean-manpages.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,206 @@
+Description: Various fixes to manpages
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: http://www.mail-archive.com/dspam-devel@lists.sourceforge.net/msg00458.html
+
+
+--- a/man/dspam.1
++++ b/man/dspam.1
+@@ -102,7 +102,7 @@
+ delivered, the $u (or %u) parameters of the argument string will be interpolated
+ for the current user being processed.
+  
+-.n3 3
++.ne 3
+ .TP
+ .BI \--mode= [toe|tum|teft|notrain]\c
+ Configures the training mode to be used for this process, overriding any
+@@ -121,7 +121,7 @@
+ : No training.  Do not train the user's data, and do not keep totals.  This should only be used in cases where you want to process mail for a particular user (based on a group, for example), but don't want the user to accumulate any learning data.
+ 
+ .B unlearn
+-: Unlearn original training. Use this if you wish to unlearn a previously learned message. Be sure to specify --source=error and --class to whatever the original classification the message was learned under. If not using TrainPristine, this will require the original signature from training.
++: Unlearn original training. Use this if you wish to unlearn a previously learned message. Be sure to specify \--source=error and \--class to whatever the original classification the message was learned under. If not using TrainPristine, this will require the original signature from training.
+ 
+ .ne 3
+ .TP
+@@ -150,7 +150,7 @@
+ should be used when a misclassification has occured, when the user is
+ corpus-feeding a message, or when an inoculation is being presented. This
+ flag should not be used for standard processing. This flag must be used in
+-conjunction with the --source flag. Omitting this flag causes DSPAM to
++conjunction with the \--source flag. Omitting this flag causes DSPAM to
+ determine the disposition of the message on its own (the standard operating
+ mode).
+  
+@@ -186,7 +186,7 @@
+ .BI \--deliver= [innocent,spam]\c
+ Tells
+ .B DSPAM
+-to deliver the message if its result falls within the criteria specified. For example, --deliver=innocent will cause DSPAM to only deliver the message if its classification has been determined as innocent. Providing --deliver=innocent,spam will cause DSPAM to deliver the message regardless of its classification. This flag provides a significant amount of flexibility for nonstandard implementations.
++to deliver the message if its result falls within the criteria specified. For example, \--deliver=innocent will cause DSPAM to only deliver the message if its classification has been determined as innocent. Providing \--deliver=innocent,spam will cause DSPAM to deliver the message regardless of its classification. This flag provides a significant amount of flexibility for nonstandard implementations.
+ 
+ .ne 3
+ .TP
+@@ -228,7 +228,7 @@
+ .TP
+ .BI \--signature =[signature]
+ If only the signature is available for training, and not the entire message,
+-the --signature flag may be used to feed the signature into DSPAM and forego
++the \--signature flag may be used to feed the signature into DSPAM and forego
+ the reading of stdin. DSPAM will process the signature with whatever
+ commandline classification was specified. NOTE: This should only be used
+ with
+@@ -241,7 +241,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-debug
+-then using --debug will turn on debugging messages to /tmp/dspam.debug.
++then using \--debug will turn on debugging messages to /tmp/dspam.debug.
+ 
+ .ne 3
+ .TP
+@@ -250,7 +250,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-daemon
+-then using --daemon will cause DSPAM to enter daemon mode, where it will listen
++then using \--daemon will cause DSPAM to enter daemon mode, where it will listen
+ for DSPAM clients to connect and actively service requests.
+ 
+ .ne 3
+@@ -260,7 +260,7 @@
+ .B DSPAM
+ was compiled with
+ .B --enable-daemon
+-then using --client will cause DSPAM to act as a client and attempt to connect to the DSPAM server specified in the client's configuration within dspam.conf. If client behavior is desired, this option
++then using \--client will cause DSPAM to act as a client and attempt to connect to the DSPAM server specified in the client's configuration within dspam.conf. If client behavior is desired, this option
+ .B must
+ be specified, otherwise the agent simply operate as self-contained and processes the message on its own, eliminating any benefit of using the daemon.
+ 
+@@ -269,7 +269,7 @@
+ .BI \--rcpt-to\c
+ If
+ .B DSPAM
+-will be configured to deliver via LMTP or SMTP, this flag may be used to define the RCPT TOs which will be used for the delivery of each user specified with --user. If no recipients are provided, the RCPT TOs will match the username.
++will be configured to deliver via LMTP or SMTP, this flag may be used to define the RCPT TOs which will be used for the delivery of each user specified with \--user. If no recipients are provided, the RCPT TOs will match the username.
+ NOTE: The recipient list should always be balanced with the user list, or empty. Specifying an unbalanced number of recipients to users will result in undefined behavior.
+ 
+ .ne 3
+--- a/man/dspam_clean.1
++++ b/man/dspam_clean.1
+@@ -45,7 +45,7 @@
+ 14 days will be overridden. Specifying an age of 0 will delete all signatures
+ from the user(s) processed.
+ 
+-.n 3
++.ne 3
+ .TP
+ .BI \-p\fR\c
+ Deletes all tokens from the target user(s) database whose probability is
+@@ -54,7 +54,7 @@
+ to use this flag once with a life of 0 days for users after a significant amount
+ of corpus training. 
+ 
+-.n 3
++.ne 3
+ .TP
+ .BI \-u\fR\c
+ Deletes all unused tokens from a user's dataset. Four different life values
+@@ -73,11 +73,11 @@
+ .B ihl
+ Tokens with a single innocent hit
+ 
+-Ages may be overridden by specifying a format string, such as -u30,15,10,10
++Ages may be overridden by specifying a format string, such as \-u30,15,10,10
+ where each number represents the respective life. Specifying a life of zero
+ will delete all unused tokens in the category.
+ 
+-.n 3
++.ne 3
+ .TP
+ .BI \ user1\ user2\ ...\ userN\fR\c
+ Specify the username(s) to perform the selected maintenance operations on. If
+--- a/man/dspam_dump.1
++++ b/man/dspam_dump.1
+@@ -39,7 +39,7 @@
+ The username of the user to dump. Only trusted users (or root) can use this
+ program for the usernames different from the current one.
+  
+-.n3
++.ne 3
+ .TP
+ .BI \ token \fR\c
+ .br
+--- a/man/dspam_merge.1
++++ b/man/dspam_merge.1
+@@ -32,7 +32,7 @@
+ token and per-user totals are added together to produce a single composite
+ dataset. After creating a composite user,
+ .B dspam_clean
+-should be run with the -p option to clean up extraneous data.
++should be run with the \-p option to clean up extraneous data.
+ 
+ .B NOTE
+ : Merges may take a considerable amount of time. This could potentially increase
+@@ -46,7 +46,7 @@
+ .BI \ user1\ user2\ ...\ userN \fR\c
+ A list of users to merge together.
+  
+-.n3
++.ne 3
+ .TP
+ .BI \ -o \ username \fR\c
+ The target user which will be created (if necessary). This user will contain
+--- a/man/dspam_stats.1
++++ b/man/dspam_stats.1
+@@ -62,7 +62,7 @@
+ .BI \-t\fR\c
+ Displays a total of all statistics displayed
+ 
+-.n3 3
++.ne 3
+ .TP
+ .BI [username]\c
+ Specifies the username to query. If no username is provided, all users will be
+--- a/man/dspam_train.1
++++ b/man/dspam_train.1
+@@ -43,24 +43,24 @@
+ .ne 3
+ .TP
+ 
+-.n3 3
++.ne 3
+ .TP
+ .BI --client\c
+ If specified, dspam is used in client-server mode.
+ 
+-.n3 3
++.ne 3
+ .TP
+ .BI username\c
+ Specifies the user to train, if omitted the current user name is used.
+ 
+-.n3 3
++.ne 3
+ .TP
+ .BI spam_corpus\c
+ Specifies either the pathname to the directory containing the corpus of spam,
+ with each in a separate file (e.g. maildir format) or a path to the mailbox in
+ the traditional Unix MBOX format.
+ 
+-.n3 3
++.ne 3
+ .TP
+ .BI nonspam_corpus\c
+ Specifies either the pathname to the directory containing the corpus of
+--- a/man/libdspam.3
++++ b/man/libdspam.3
+@@ -11,7 +11,7 @@
+ .TH libdspam 3  "Sep 29, 2004" "libdspam" "libdspam"
+ 
+ .SH NAME
+-libdspam, dspam_init, dspam_create, dspam_addattribute, dspam_attach, dspam_process, dspam_getsource, dspam_detach, dspam_clearattributes, dspam_destroy 
++libdspam - core message processing and classification for dspam
+ .PP
+ DSPAM Core Analyis Engine Functions
+ 

Added: branches/experimental/debian/patches/007_path-to-dspam_for-training-script.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/007_path-to-dspam_for-training-script.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,15 @@
+Description: Fix path to dspam binary
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/scripts/train.pl
++++ b/scripts/train.pl
+@@ -14,7 +14,7 @@
+ use vars qw { $USER $PATH $REPORTING_WINDOW $CORPUS $TRAINING_MODE };
+ 
+ $REPORTING_WINDOW  = 250;			# How often to summarize
+-$PATH              = "/usr/local/dspam/bin";	# Path to dspam binaries
++$PATH              = "/usr/bin";		# Path to dspam binaries
+ $TRAINING_MODE     = "teft";			# Training mode
+ 
+ ### DO NOT CONFIGURE BELOW THIS LINE ###

Added: branches/experimental/debian/patches/008_where-to-find-txt-files.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/008_where-to-find-txt-files.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,15 @@
+Description: txt files are installed in /etc/dspam/txt
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: not-needed
+
+--- a/src/dspam.c
++++ b/src/dspam.c
+@@ -1530,7 +1530,7 @@
+ 
+   time(&now);
+ 
+-  snprintf(msgfile, sizeof(msgfile), "%s/txt/%s", _ds_read_attribute(agent_config, "Home"), filename);
++  snprintf(msgfile, sizeof(msgfile), "/etc/dspam/txt/%s", filename);
+   f = fopen(msgfile, "r");
+   if (!f) {
+     LOG(LOG_ERR, ERR_IO_FILE_OPEN, filename, strerror(errno));

Added: branches/experimental/debian/patches/100_fix-fr-templates.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/100_fix-fr-templates.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,139 @@
+Description: Fixes for French translation of WebGUI templates
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: http://www.mail-archive.com/dspam-devel@lists.sourceforge.net/msg00460.html
+
+--- a/webui/cgi-bin/templates/fr/nav_admin_error.html
++++ b/webui/cgi-bin/templates/fr/nav_admin_error.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_admin_preferences.html
++++ b/webui/cgi-bin/templates/fr/nav_admin_preferences.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+@@ -46,7 +46,7 @@
+ <INPUT TYPE=HIDDEN NAME="template" VALUE="preferences">
+ 
+ <div class="content">
+-        <h3><strong>Apprentissage</strong> - Configure la fa&ccedil;don dont le filtre apprend lors de l'analyse des messages</h3>
++        <h3><strong>Apprentissage</strong> - Configure la fa&ccedil;on dont le filtre apprend lors de l'analyse des messages</h3>
+ <p>
+ <table class="hollow">
+ <tr><td>
+--- a/webui/cgi-bin/templates/fr/nav_admin_status.html
++++ b/webui/cgi-bin/templates/fr/nav_admin_status.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_admin_user.html
++++ b/webui/cgi-bin/templates/fr/nav_admin_user.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Administrative Suite</TITLE>
++<HEAD><TITLE>DSPAM v3 - Administration</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_alerts.html
++++ b/webui/cgi-bin/templates/fr/nav_alerts.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_analysis.html
++++ b/webui/cgi-bin/templates/fr/nav_analysis.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_error.html
++++ b/webui/cgi-bin/templates/fr/nav_error.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_fragment.html
++++ b/webui/cgi-bin/templates/fr/nav_fragment.html
+@@ -1,5 +1,5 @@
+ 
+-<HEAD><TITLE>DSPAM v3 Control Center: $SUBJECT$</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le: $SUBJECT$</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000 MARGINHEIGHT=0 MARGINWIDTH=0 TOPMARGIN=0 LEFTMARGIN=0 RIGHTMARGIN=0>
+--- a/webui/cgi-bin/templates/fr/nav_history.html
++++ b/webui/cgi-bin/templates/fr/nav_history.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ <script type="text/javascript" src="$WEB_ROOT$/dspam.js"></script>
+ </HEAD>
+--- a/webui/cgi-bin/templates/fr/nav_performance.html
++++ b/webui/cgi-bin/templates/fr/nav_performance.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+--- a/webui/cgi-bin/templates/fr/nav_preferences.html
++++ b/webui/cgi-bin/templates/fr/nav_preferences.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>
+@@ -38,7 +38,7 @@
+ <INPUT TYPE=HIDDEN NAME="user" VALUE="$REMOTE_USER$">
+ 
+ <div class="content">
+-	<h3><strong>Apprentissage</strong> - Configure la fa&ccedil;don dont le filtre apprend lors de l'analyse des messages</h3>
++	<h3><strong>Apprentissage</strong> - Configure la fa&ccedil;on dont le filtre apprend lors de l'analyse des messages</h3>
+ <p>
+ <table class="hollow">
+ <tr><td>
+--- a/webui/cgi-bin/templates/fr/nav_quarantine.html
++++ b/webui/cgi-bin/templates/fr/nav_quarantine.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ <script type="text/javascript" src="$WEB_ROOT$/dspam.js"></script>
+ </HEAD>
+--- a/webui/cgi-bin/templates/fr/nav_viewmessage.html
++++ b/webui/cgi-bin/templates/fr/nav_viewmessage.html
+@@ -1,5 +1,5 @@
+ <HTML>
+-<HEAD><TITLE>DSPAM v3 Control Center</TITLE>
++<HEAD><TITLE>DSPAM v3 - Centre de contr&ocirc;le</TITLE>
+ <LINK REL="STYLESHEET" HREF="$WEB_ROOT$/base.css">
+ </HEAD>
+ <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000000 VLINK=#000000 ALINK=#000000>

Added: branches/experimental/debian/patches/101_strings.pl-hack.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/101_strings.pl-hack.diff	Sun Nov 29 09:26:52 2009	(r216)
@@ -0,0 +1,198 @@
+Description: Updating make files to include changes mentioned in log entry [20090818:0100]
+Origin: upstream git commit 2a057507c3890fe52d83f5338bbe5ed79389967b
+Forwarded: not-needed
+
+ at DPATCH@
+--- a/webui/cgi-bin/templates/Makefile.am
++++ b/webui/cgi-bin/templates/Makefile.am
+@@ -13,4 +13,5 @@
+         nav_admin_status.html \
+         nav_admin_user.html \
+         nav_admin_preferences.html \
+-	nav_fragment.html
++	nav_fragment.html \
++	strings.pl
+--- a/webui/cgi-bin/templates/fr/Makefile.am
++++ b/webui/cgi-bin/templates/fr/Makefile.am
+@@ -13,4 +13,5 @@
+         nav_admin_status.html \
+         nav_admin_user.html \
+         nav_admin_preferences.html \
+-	nav_fragment.html
++	nav_fragment.html \
++	strings.pl
+--- /dev/null
++++ b/webui/cgi-bin/templates/fr/strings.pl
+@@ -0,0 +1,85 @@
++#!/usr/bin/perl
++
++# $Id: strings.pl,v 1.00 2009/08/18 01:17:50 sbajic Exp $
++# DSPAM
++# COPYRIGHT (C) DSPAM PROJECT 2002-2009
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; version 2
++# of the License.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++
++$LANG{'empty'}				= "Vide";
++$LANG{'admin_suite'}			= "Administration";
++$LANG{'alert_name'}			= "Nom de l'alerte";
++$LANG{'remove_alert'}			= "Supprimer";
++$LANG{'user_form'}			= "Centre de contr&ocirc;le DSPAM pour";
++$LANG{'user_form_submit'}		= "Changer";
++
++$LANG{'option_disable_filtering'}       = "D&eacute;sactiver le filtre DSPAM";
++$LANG{'option_enable_filtering'}        = "Activer le filtre DSPAM";
++
++$LANG{'quarantine_rating'}		= "Score";
++$LANG{'quarantine_date'}		= "Date";
++$LANG{'quarantine_from'}		= "Exp&eacute;diteur";
++$LANG{'quarantine_subject'}		= "Objet";
++
++$LANG{'history_show'}			= "Afficher&nbsp;";
++$LANG{'history_show_all'}		= "tous";
++$LANG{'history_show_spam'}		= "pourriels";
++$LANG{'history_show_innocent'}		= "l&eacute;gitimes";
++$LANG{'history_show_virus'}		= "virus";
++$LANG{'history_show_whitelisted'}	= "mis en liste blanche";
++$LANG{'history_retrain_as_spam'}	= "pourriel";
++$LANG{'history_retrain_as_innocent'}	= "l&eacute;gitime";
++$LANG{'history_retrain_as'}		= "comme";
++$LANG{'history_retrained'}		= "R&eacute;-analys&eacute;";
++$LANG{'history_retrain_undo'}		= "d&eacute;faire";
++$LANG{'history_label_resend'}		= "Renvoi";
++$LANG{'history_label_whitelist'}	= "Liste blanche";
++$LANG{'history_label_spam'}		= "Pourriel";
++$LANG{'history_label_innocent'}		= "L&eacute;gitime";
++$LANG{'history_label_miss'}		= "Manqu&eacute;";
++$LANG{'history_label_virus'}		= "Virus";
++$LANG{'history_label_RBL'}		= "RBL";
++$LANG{'history_label_block'}		= "Bloqu&eacute;";
++$LANG{'history_label_corpus'}		= "Corpus";
++$LANG{'history_label_unknown'}		= "Inconnu";
++$LANG{'history_label_error'}		= "Erreur";
++
++$LANG{'error_no_historic'}		= "Aucune donn&eacute;e d'historique n'est disponible.";
++$LANG{'error_cannot_open_log'}		= "Impossible d'ouvrir le journal";
++$LANG{'error_no_identity'}		= "Erreur syst&egrave;me. Impossible de d&eacute;terminer votre identit&eacute;.";
++$LANG{'error_invalid_command'}		= "Commande invalide";
++$LANG{'error_cannot_write_prefs'}	= "Impossible d'enregistrer les pr&eacute;f&eacute;rences";
++$LANG{'error_no_sigid'}			= "Aucun identifiant de message n'a &eacute;t&eacute; sp&eacute;cifi&eacute;";
++$LANG{'error_no_alert_specified'}	= "Aucune alerte sp&eacute;cifi&eacute;e.";
++$LANG{'error_message_part1'}		= "L'erreur suivante s'est produite pendant le traitement de votre requ&ecirc;te&nbsp;:";
++$LANG{'error_message_part2'}		= "Si le probl&egrave;me persiste, contactez votre administrateur.";
++$LANG{'error_filesystem_scale'}		= "Impossible de d&eacute;terminer l'organisation du syst&egrave;me de fichiers";
++$LANG{'error_load_default_prefs'}	= "Impossible de charger les pr&eacute;f&eacute;rences par d&eacute;faut.";
++$LANG{'error_access_denied'}		= "Acc&egrave;s interdit";
++
++$LANG{'graph_legend_nb_messages'}	= "Nombre de messages";
++$LANG{'graph_legend_spam'}		= "Pourriels";
++$LANG{'graph_legend_good'}		= "Messages legitimes";
++$LANG{'graph_legend_inoculations'}	= "Inoculations";
++$LANG{'graph_legend_corpusfeds'}	= "Depuis le corpus";
++$LANG{'graph_legend_virus'}		= "Virus";
++$LANG{'graph_legend_RBL'}		= "RBL";
++$LANG{'graph_legend_blocklisted'}	= "Mis en liste noire";
++$LANG{'graph_legend_whitelisted'}	= "Mis en liste blanche";
++$LANG{'graph_legend_nonspam'}		= "Messages legitimes";
++$LANG{'graph_legend_spam_misses'}	= "Pourriels manques";
++$LANG{'graph_legend_falsepositives'}	= "Faux positifs";
++
++1;
+--- /dev/null
++++ b/webui/cgi-bin/templates/strings.pl
+@@ -0,0 +1,84 @@
++#!/usr/bin/perl
++
++# $Id: strings.pl,v 1.00 2009/08/18 00:41:12 sbajic Exp $
++# DSPAM
++# COPYRIGHT (C) DSPAM PROJECT 2002-2009
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; version 2
++# of the License.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++
++$LANG{'empty'}				= "Empty";
++$LANG{'admin_suite'}			= "Administrative Suite";
++$LANG{'alert_name'}			= "Alert Name";
++$LANG{'remove_alert'}			= "Remove";
++$LANG{'user_form'}			= "Statistical SPAM Protection for";
++$LANG{'user_form_submit'}		= "Change";
++
++$LANG{'option_disable_filtering'}	= "Disable DSPAM filtering";
++$LANG{'option_enable_filtering'}	= "Enable DSPAM filtering";
++
++$LANG{'quarantine_rating'}		= "Rating";
++$LANG{'quarantine_date'}		= "Date";
++$LANG{'quarantine_from'}		= "From";
++$LANG{'quarantine_subject'}		= "Subject";
++
++$LANG{'history_show'}			= "Show";
++$LANG{'history_show_all'}		= "all";
++$LANG{'history_show_spam'}		= "spam";
++$LANG{'history_show_innocent'}		= "innocent";
++$LANG{'history_show_whitelisted'}	= "whitelisted";
++$LANG{'history_retrain_as_spam'}	= "spam";
++$LANG{'history_retrain_as_innocent'}	= "innocent";
++$LANG{'history_retrain_as'}		= "As";
++$LANG{'history_retrain_undo'}		= "Undo";
++$LANG{'history_retrained'}		= "Retrained";
++$LANG{'history_label_resend'}		= "Resend";
++$LANG{'history_label_whitelist'}	= "Whitelist";
++$LANG{'history_label_spam'}		= "SPAM";
++$LANG{'history_label_innocent'}		= "Good";
++$LANG{'history_label_miss'}		= "Miss";
++$LANG{'history_label_virus'}		= "Virus";
++$LANG{'history_label_RBL'}		= "RBL";
++$LANG{'history_label_block'}		= "BLOCK";
++$LANG{'history_label_corpus'}		= "Corpus";
++$LANG{'history_label_unknown'}		= "UNKN";
++$LANG{'history_label_error'}		= "Error";
++
++$LANG{'error_no_historic'}		= "No historical data is available.";
++$LANG{'error_cannot_open_log'}		= "Unable to open logfile";
++$LANG{'error_no_identity'}		= "System Error. I was unable to determine your identity.";
++$LANG{'error_invalid_command'}		= "Invalid Command";
++$LANG{'error_cannot_write_prefs'}	= "Unable to write preferences";
++$LANG{'error_no_sigid'}			= "No Message ID Specified";
++$LANG{'error_no_alert_specified'}	= "No Alert Specified.";
++$LANG{'error_message_part1'}		= "The following error occured while trying to process your request:";
++$LANG{'error_message_part2'}		= "If this problem persists, please contact your administrator.";
++$LANG{'error_filesystem_scale'}		= "Unable to determine filesystem scale";
++$LANG{'error_load_default_prefs'}	= "Unable to load default preferences";
++$LANG{'error_access_denied'}		= "Access Denied";
++
++$LANG{'graph_legend_nb_messages'}	= "Number of Messages";
++$LANG{'graph_legend_spam'}		= "SPAM";
++$LANG{'graph_legend_good'}		= "Good";
++$LANG{'graph_legend_inoculations'}	= "Inoculations";
++$LANG{'graph_legend_corpusfeds'}	= "Corpusfeds";
++$LANG{'graph_legend_virus'}		= "Virus";
++$LANG{'graph_legend_RBL'}		= "Blacklisted (RBL)";
++$LANG{'graph_legend_blocklisted'}	= "Blocklisted";
++$LANG{'graph_legend_whitelisted'}	= "Auto-Whitelisted";
++$LANG{'graph_legend_nonspam'}		= "Nonspam";
++$LANG{'graph_legend_spam_misses'}	= "Spam Misses";
++$LANG{'graph_legend_falsepositives'}	= "False Positives";
++
++1;

Modified: branches/experimental/debian/patches/series
==============================================================================
--- branches/experimental/debian/patches/series	Thu Nov 26 19:28:47 2009	(r215)
+++ branches/experimental/debian/patches/series	Sun Nov 29 09:26:52 2009	(r216)
@@ -1,10 +1,10 @@
-01_drivers-in-usr_lib_dspam.diff
-02_dspam-webfrontend-config-debian.diff
-03_update-dspam.conf.diff
-04_dspam-default.prefs-in_etc.diff
-05_background-dspam.diff
-06_clean-manpages.diff
-07_path-to-dspam_for-training-script.diff
-09_where-to-find-txt-files.diff
-10_fix-fr-templates.diff
-11_strings.pl-hack.diff
+001_drivers-in-usr_lib_dspam.diff
+002_dspam-webfrontend-config-debian.diff
+003_update-dspam.conf.diff
+004_dspam-default.prefs-in_etc.diff
+005_background-dspam.diff
+006_clean-manpages.diff
+007_path-to-dspam_for-training-script.diff
+008_where-to-find-txt-files.diff
+100_fix-fr-templates.diff
+101_strings.pl-hack.diff



More information about the Pkg-dspam-commits mailing list