[Pkg-dspam-commits] [pkg-dspam-commits] r236 - in branches/experimental/debian: . manpages patches
Julien Valroff
julien-guest at alioth.debian.org
Tue Jan 12 19:42:36 UTC 2010
Author: julien-guest
Date: Tue Jan 12 19:42:35 2010
New Revision: 236
Log:
Revert some of previous commits which are not in the 3.9.0 release
Added:
branches/experimental/debian/manpages/dspam_admin.1
branches/experimental/debian/manpages/dspam_crc.1
branches/experimental/debian/manpages/dspam_logrotate.1
Modified:
branches/experimental/debian/dspam-webfrontend.install
branches/experimental/debian/dspam.manpages
branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
branches/experimental/debian/patches/003_update-dspam.conf.diff
branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff
branches/experimental/debian/patches/005_background-dspam.diff
branches/experimental/debian/patches/006_clean-manpages.diff
branches/experimental/debian/patches/008_where-to-find-txt-files.diff
branches/experimental/debian/rules
Modified: branches/experimental/debian/dspam-webfrontend.install
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.install Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/dspam-webfrontend.install Tue Jan 12 19:42:35 2010 (r236)
@@ -6,12 +6,11 @@
webui/cgi-bin/templates/he/*.html etc/dspam/templates/he
#webui/cgi-bin/templates/he/strings.pl etc/dspam/templates/he
webui/cgi-bin/templates/ro/*.html etc/dspam/templates/ro
-#webui/cgi-bin/templates/ro/strings.pl etc/dspam/templates/ro
webui/cgi-bin/configure.pl usr/share/dspam/
webui/htdocs/base.css usr/share/dspam/
webui/htdocs/dspam.js usr/share/dspam/
webui/htdocs/dspam-logo-small.gif usr/share/dspam/
webui/cgi-bin/admins etc/dspam/
-webui/cgi-bin/subadmins etc/dspam/
+#webui/cgi-bin/subadmins etc/dspam/
webui/cgi-bin/rgb.txt etc/dspam/
debian/dspam-apache2.conf etc/dspam/
Modified: branches/experimental/debian/dspam.manpages
==============================================================================
--- branches/experimental/debian/dspam.manpages Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/dspam.manpages Tue Jan 12 19:42:35 2010 (r236)
@@ -5,11 +5,11 @@
debian/manpages/cssconvert.1
debian/manpages/cssstat.1
man/dspam.1
-man/dspam_admin.1
+debian/manpages/dspam_admin.1
man/dspam_clean.1
-man/dspam_crc.1
+debian/manpages/dspam_crc.1
man/dspam_dump.1
-man/dspam_logrotate.1
+debian/manpages/dspam_logrotate.1
man/dspam_merge.1
man/dspam_stats.1
man/dspam_train.1
Added: branches/experimental/debian/manpages/dspam_admin.1
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/manpages/dspam_admin.1 Tue Jan 12 19:42:35 2010 (r236)
@@ -0,0 +1,130 @@
+.\" $Id: dspam_admin.1,v 1.1 2010/01/03 15:02:55 sbajic Exp $
+.\" -*- nroff -*-
+.\"
+.\" dspam_admin3.9
+.\"
+.\" Authors: Stevan Bajic <stevan at bajic.ch>
+.\"
+.\" Copyright (c) 2002-2010 DSPAM Project
+.\" All rights reserved
+.\"
+.TH dspam_admin 1 "Jan 03, 2010" "DSPAM" "DSPAM"
+
+.SH NAME
+dspam_admin \- Alter DSPAM users preferences
+
+.SH SYNOPSIS
+.na
+.B dspam_admin
+[\c
+.B \--profile\c
+=PROFILE\c
+]
+[\c
+.I function\fR\c
+]
+[\c
+.I argument\fR\c
+]
+
+.ad
+.SH DESCRIPTION
+.LP
+.B dspam_admin
+is used to alter DSPAM user's preferences.
+
+.SH OPTIONS
+.LP
+
+.ne 3
+.TP
+Add a Preference:\c
+.B add\ preference\ \c
+[\c
+.I user\c
+] [\c
+.I attrib\c
+] [\c
+.I value\c
+]\c
+
+.ne 3
+.TP
+Set/change a Preference:\c
+.B change\ preference\ \c
+[\c
+.I user\c
+] [\c
+.I attrib\c
+] [\c
+.I value\c
+]\c
+
+.ne 3
+.TP
+Delete a Preference:\c
+.B delete\ preference\ \c
+[\c
+.I user\c
+] [\c
+.I attrib\c
+] [\c
+.I value\c
+]\c
+
+.ne 3
+.TP
+List Preferences:\c
+.B list\ preference\ \c
+[\c
+.I user\c
+] [\c
+.I attrib\c
+] [\c
+.I value\c
+]\c
+
+.ne 3
+.TP
+Aggregate Preferences:\c
+.B aggregate\ preference\ \c
+[\c
+.I user\c
+]\c
+
+.LP
+Use\ \c
+.B default\ \c
+as username to modify the default (uid 0) user preference.
+
+
+.SH EXIT VALUE
+.LP
+.ne 3
+.PD 0
+.TP
+.B 0
+Operation was successful.
+.ne 3
+.TP
+.B other
+Operation resulted in an error.
+.PD
+
+.SH COPYRIGHT
+Copyright \(co 2002\-2010 DSPAM Project
+.br
+All rights reserved.
+.br
+
+For more information, see http://dspam.sourceforge.net.
+
+.SH SEE ALSO
+.BR dspam (1),
+.BR dspam_clean (1),
+.BR dspam_crc (1),
+.BR dspam_dump (1),
+.BR dspam_logrotate (1),
+.BR dspam_merge (1),
+.BR dspam_stats (1),
+.BR dspam_train (1)
Added: branches/experimental/debian/manpages/dspam_crc.1
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/manpages/dspam_crc.1 Tue Jan 12 19:42:35 2010 (r236)
@@ -0,0 +1,64 @@
+.\" $Id: dspam_crc.1,v 1.1 2010/01/03 15:02:55 sbajic Exp $
+.\" -*- nroff -*-
+.\"
+.\" dspam_crc3.9
+.\"
+.\" Authors: Stevan Bajic <stevan at bajic.ch>
+.\"
+.\" Copyright (c) 2002-2010 DSPAM Project
+.\" All rights reserved
+.\"
+.TH dspam_crc 1 "Jan 03, 2010" "DSPAM" "DSPAM"
+
+.SH NAME
+dspam_crc \- calculate the DSPAM CRC/hash value for a text token
+
+.SH SYNOPSIS
+.na
+.B dspam_crc
+.I [token]\fR\c
+
+.ad
+.SH DESCRIPTION
+.LP
+.B dspam_crc
+is used to calculate the DSPAM CRC/hash value for a text token.
+
+.SH OPTIONS
+.LP
+
+.ne 3
+.TP
+.BI [token]\fR\c
+Data that will be CRC-ized/hashed.
+
+.SH EXIT VALUE
+.LP
+.ne 3
+.PD 0
+.TP
+.B 0
+Operation was successful.
+.ne 3
+.TP
+.B other
+Operation resulted in an error.
+.PD
+
+.SH COPYRIGHT
+Copyright \(co 2002\-2010 DSPAM Project
+.br
+All rights reserved.
+.br
+
+For more information, see http://dspam.sourceforge.net.
+
+.SH SEE ALSO
+.BR dspam (1),
+.BR dspam_admin (1),
+.BR dspam_clean (1),
+.BR dspam_dump (1),
+.BR dspam_logrotate (1),
+.BR dspam_merge (1),
+.BR dspam_stats (1),
+.BR dspam_train (1)
Added: branches/experimental/debian/manpages/dspam_logrotate.1
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/manpages/dspam_logrotate.1 Tue Jan 12 19:42:35 2010 (r236)
@@ -0,0 +1,88 @@
+.\" $Id: dspam_logrotate.1,v 1.1 2010/01/03 15:02:55 sbajic Exp $
+.\" -*- nroff -*-
+.\"
+.\" dspam_logrotate3.9
+.\"
+.\" Authors: Stevan Bajic <stevan at bajic.ch>
+.\"
+.\" Copyright (c) 2002-2010 DSPAM Project
+.\" All rights reserved
+.\"
+.TH dspam_logrotate 1 "Jan 03, 2010" "DSPAM" "DSPAM"
+
+.SH NAME
+dspam_logrotate \- Rotate DSPAM logfiles
+
+.SH SYNOPSIS
+.na
+.B dspam_logrotate
+.B \-a age \c
+[\-v]\ [[\c
+.B \-l \c
+[\c
+.I logfile\c
+]]|[\c
+.B \-d \c
+[\c
+.I dir\c
+]]]
+
+.ad
+.SH DESCRIPTION
+.LP
+.B dspam_logrotate
+can be used to rotate DSPAM system log and/or the user logs.
+
+.SH OPTIONS
+.LP
+
+.ne 3
+.TP
+.BI \-a\ age\c
+All log entries older than 'age' days will be removed.
+
+.ne 3
+.TP
+.BI \-v\c
+Print verbose output.
+
+.n 3
+.TP
+.BI \-l \ logfile\c
+A list of one or more files to process.
+
+.n 3
+.TP
+.BI \-d \ dir\c
+The home directory of DSPAM or the root path where user logs are located.
+
+.SH EXIT VALUE
+.LP
+.ne 3
+.PD 0
+.TP
+.B 0
+Operation was successful.
+.ne 3
+.TP
+.B other
+Operation resulted in an error.
+.PD
+
+.SH COPYRIGHT
+Copyright \(co 2002\-2010 DSPAM Project
+.br
+All rights reserved.
+.br
+
+For more information, see http://dspam.sourceforge.net.
+
+.SH SEE ALSO
+.BR dspam (1),
+.BR dspam_admin (1),
+.BR dspam_clean (1),
+.BR dspam_crc (1),
+.BR dspam_dump (1),
+.BR dspam_merge (1),
+.BR dspam_stats (1),
+.BR dspam_train (1)
Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -4,33 +4,25 @@
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -26,14 +26,14 @@
- #
+@@ -24,7 +24,7 @@
+ require "ctime.pl";
+
# Read configuration parameters common to all CGI scripts
- #
--if (!(-e "configure.pl") || !(-r "configure.pl")) {
-+if (!(-e "/etc/dspam/webfrontend.conf") || !(-r "/etc/dspam/webfrontend.conf")) {
- &htmlheader;
- print "<html><head><title>Error!</title></head><body bgcolor='white' text='black'><center><h1>";
- print "Missing file configure.pl";
- print "</h1></center></body></html>\n";
- exit;
- }
-require "configure.pl";
+require "/etc/dspam/webfrontend.conf";
#
- # The current CGI script
-@@ -76,7 +76,7 @@
+ # Read language file
+@@ -48,7 +48,7 @@
#
do {
my($admin) = 0;
- open(FILE, "<./admins");
-+ open(FILE, "</etc/dspam/admins");
++ open(FILE, "/etc/dspam/admins");
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -167,9 +167,9 @@
+@@ -146,9 +146,9 @@
$DATA{'USERNAME'} = $USER;
@@ -43,7 +35,7 @@
$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. ".
-@@ -263,7 +263,7 @@
+@@ -242,7 +242,7 @@
}
if (! -e $FILE) {
@@ -52,7 +44,7 @@
} else {
%PREFS = GetPrefs($USER, $FILE);
}
-@@ -871,7 +871,7 @@
+@@ -837,7 +837,7 @@
close(PIPE);
} else {
if (! -e $FILE) {
@@ -63,108 +55,54 @@
if (! -e $FILE) {
--- a/webui/cgi-bin/admingraph.cgi
+++ b/webui/cgi-bin/admingraph.cgi
-@@ -26,14 +26,14 @@
- #
+@@ -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
- #
--if (!(-e "configure.pl") || !(-r "configure.pl")) {
-+if (!(-e "/etc/dspam/webfrontend.conf") || !(-r "/etc/dspam/webfrontend.conf")) {
- &htmlheader;
- print "<html><head><title>Error!</title></head><body bgcolor='white' text='black'><center><h1>";
-- print "Missing file configure.pl";
-+ print "Missing file /etc/dspam/webfrontend.conf";
- print "</h1></center></body></html>\n";
- exit;
- }
-require "configure.pl";
+require "/etc/dspam/webfrontend.conf";
#
- # Parse form
-@@ -53,7 +53,7 @@
- $LANGUAGE = $CONFIG{'LANGUAGE_USED'};
- }
+ # 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
-@@ -30,11 +30,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
-@@ -46,13 +46,15 @@
- $CONFIG{'MAX_COL_LEN'} = 50; # Max chars in list columns
- $CONFIG{'SORT_DEFAULT'} = "Rating"; # Show quarantine by "Date" or "Rating"
- $CONFIG{'3D_GRAPHS'} = 1; # 0=graphs in 2D, 1=graphs in 3D
--$CONFIG{'OPTMODE'} = "NONE"; # OUT=OptOut IN=OptIn NONE=not selectable
-+$CONFIG{'OPTMODE'} = "IN"; # OUT=OptOut IN=OptIn NONE=not selectable
-
- # Full path to TTF font(s) used for legend, x and y labels in Graphs. GD must be compiled
- # with TTF support if you want to use this feature.
--#$CONFIG{'GRAPHS_X_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
--#$CONFIG{'GRAPHS_Y_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
--#$CONFIG{'GRAPHS_LEGEND_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf";
-+# On Debian, you need to install libgd-gd2-perl rather than libgd-gd2-noxpm-perl
-+# You will also need some ttf font (eg. DejaVu in the ttf-dejavu-core package)
-+#$CONFIG{'GRAPHS_X_LABEL_FONT'} = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
-+#$CONFIG{'GRAPHS_Y_LABEL_FONT'} = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
-+#$CONFIG{'GRAPHS_LEGEND_FONT'} = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf";
-
- # Add customized settings below
- $CONFIG{'LOCAL_DOMAIN'} = "yourdomain.com";
--- a/webui/cgi-bin/dspam.cgi
+++ b/webui/cgi-bin/dspam.cgi
-@@ -28,14 +28,14 @@
- #
+@@ -25,7 +25,7 @@
+ require "ctime.pl";
+
# Read configuration parameters common to all CGI scripts
- #
--if (!(-e "configure.pl") || !(-r "configure.pl")) {
-+if (!(-e "/etc/dspam/webfrontend.conf") || !(-r "/etc/dspam/webfrontend.conf")) {
- &htmlheader;
- print "<html><head><title>Error!</title></head><body bgcolor='white' text='black'><center><h1>";
-- print "Missing file configure.pl";
-+ print "Missing file /etc/dspam/webfrontend.conf";
- print "</h1></center></body></html>\n";
- exit;
- }
-require "configure.pl";
+require "/etc/dspam/webfrontend.conf";
- if($CONFIG{"DATE_FORMAT"}) {
- use POSIX qw(strftime);
-@@ -77,7 +77,7 @@
+ #
+ # Read language file
+@@ -78,7 +78,7 @@
$CONFIG{'ADMIN'} = 0;
if ($ENV{'REMOTE_USER'} ne "") {
- open(FILE, "<./admins");
-+ open(FILE, "</etc/dspam/admins");
++ open(FILE, "/etc/dspam/admins");
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -90,7 +90,7 @@
- $CONFIG{'SUBADMIN'} = 0;
- $CONFIG{'SUBADMIN_USERS'} = {};
- if ($ENV{'REMOTE_USER'} ne "" && $CONFIG{'ADMIN'} == 0) {
-- open(FILE, "<./subadmins");
-+ open(FILE, "</etc/dspam/subadmins");
- while(<FILE>) {
- chomp;
- if ($_ !~ /^\s*#/) {
-@@ -1814,6 +1814,7 @@
+@@ -644,7 +644,7 @@
+
+ sub DisplayPreferences {
+ my(%PREFS);
+- my($FILE) = "$USER.prefs";
++ my($FILE) = "/etc/dspam/default.prefs";
+
+ my $username = $CURRENT_USER;
+
+@@ -2050,6 +2050,7 @@
my(%PREFS);
my($FILE) = "$USER.prefs";
@@ -172,13 +110,13 @@
if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
my $PREF_USER = $CURRENT_USER;
-@@ -1829,10 +1830,10 @@
+@@ -2065,10 +2066,10 @@
if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
- if (! -e "./default.prefs") {
+ if (! -e "$DEFAULT_PREFS") {
- &error("$CONFIG{'LANG'}->{$LANGUAGE}->{'error_load_default_prefs'}");
+ &error("$LANG{'error_load_default_prefs'}");
}
- open(FILE, "<./default.prefs");
+ open(FILE, "<$DEFAULT_PREFS");
@@ -187,30 +125,61 @@
my($directive, $value) = split(/\=/);
--- a/webui/cgi-bin/graph.cgi
+++ b/webui/cgi-bin/graph.cgi
-@@ -27,14 +27,14 @@
- #
+@@ -25,7 +25,7 @@
+ use vars qw { %CONFIG %FORM %LANG @spam_day @nonspam_day @period @data };
+
# Read configuration parameters common to all CGI scripts
- #
--if (!(-e "configure.pl") || !(-r "configure.pl")) {
-+if (!(-e "/etc/dspam/webfrontend.conf") || !(-r "/etc/dspam/webfrontend.conf")) {
- &htmlheader;
- print "<html><head><title>Error!</title></head><body bgcolor='white' text='black'><center><h1>";
-- print "Missing file configure.pl";
-+ print "Missing file /etc/dspam/webfrontend.conf";
- print "</h1></center></body></html>\n";
- exit;
- }
-require "configure.pl";
+require "/etc/dspam/webfrontend.conf";
#
- # Parse form
-@@ -54,7 +54,7 @@
- $LANGUAGE = $CONFIG{'LANGUAGE_USED'};
- }
+ # 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'});
+--- a/webui/cgi-bin/configure.pl.in
++++ b/webui/cgi-bin/configure.pl.in
+@@ -30,11 +30,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
+@@ -45,11 +45,10 @@
+ $CONFIG{'MAX_COL_LEN'} = 50; # Max chars in list columns
+ $CONFIG{'SORT_DEFAULT'} = "Rating"; # Show quarantine by "Date" or "Rating"
+ $CONFIG{'3D_GRAPHS'} = 1; # 0=graphs in 2D, 1=graphs in 3D
+-$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";
++$CONFIG{'LOCAL_DOMAIN'} = "localhost";
+
+ $ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
+
+@@ -59,7 +58,8 @@
+ # 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{'LARGE_SCALE'} = 0;o
++
+ #$CONFIG{'DOMAIN_SCALE'}= 0;
+ #$CONFIG{'PREFERENCES_EXTENSION'} = 0;
+
Modified: branches/experimental/debian/patches/003_update-dspam.conf.diff
==============================================================================
--- branches/experimental/debian/patches/003_update-dspam.conf.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -4,7 +4,7 @@
--- a/src/dspam.conf.in
+++ b/src/dspam.conf.in
-@@ -143,11 +143,10 @@
+@@ -129,11 +129,10 @@
#
Trust root
Trust dspam
@@ -18,7 +18,7 @@
#Trust nobody
#Trust majordomo
-@@ -286,7 +285,7 @@
+@@ -272,7 +271,7 @@
# defaults.
#
Preference "trainingMode=TEFT" # { TOE | TUM | TEFT | NOTRAIN } -> default:teft
@@ -27,9 +27,9 @@
Preference "spamSubject=[SPAM]" # { string } -> default:[SPAM]
Preference "statisticalSedation=5" # { 0 - 10 } -> default:0
Preference "enableBNR=on" # { on | off } -> default:off
-@@ -340,222 +339,6 @@
+@@ -324,222 +323,6 @@
+ AllowOverride whitelistThreshold
AllowOverride dailyQuarantineSummary
- AllowOverride notifications
-# --- MySQL ---
-
@@ -250,7 +250,7 @@
# -- Profiles --
#
-@@ -714,7 +497,7 @@
+@@ -691,7 +474,7 @@
# users will be filtered unless a .nodspam file is dropped in
# /var/dspam/opt-out/user.nodspam
#
@@ -259,7 +259,7 @@
#
# TrackSources: specify which (if any) source addresses to track and report
-@@ -801,7 +584,7 @@
+@@ -778,7 +561,7 @@
#ServerHost 127.0.0.1
#ServerPort 24
#ServerQueueSize 32
@@ -268,7 +268,7 @@
#
# ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -837,14 +620,14 @@
+@@ -814,14 +597,14 @@
# you are running the client and server on the same machine, as it eliminates
# much of the bandwidth overhead.
#
@@ -285,7 +285,7 @@
#ClientIdent "secret at Relay1"
#
#ClientHost 127.0.0.1
-@@ -891,4 +674,7 @@
+@@ -868,4 +651,7 @@
#
StripRcptDomain off
Modified: branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff
==============================================================================
--- branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -4,7 +4,7 @@
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -169,14 +169,6 @@
+@@ -148,14 +148,6 @@
if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
$FILE = "/etc/dspam/default.prefs";
@@ -21,7 +21,7 @@
}
--- a/src/pref.c
+++ b/src/pref.c
-@@ -181,7 +181,7 @@
+@@ -179,7 +179,7 @@
PTX[0] = NULL;
if (user == NULL) {
@@ -30,8 +30,8 @@
} else {
_ds_userdir_path (filename, home, user, "prefs");
}
-@@ -311,7 +311,7 @@
- ignore = ignore; /* Keep compiler happy */
+@@ -307,7 +307,7 @@
+ FILE *out_file;
if (username == NULL) {
- snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
@@ -39,8 +39,8 @@
} else {
_ds_userdir_path (filename, home, username, "prefs");
}
-@@ -340,7 +340,7 @@
- ignore = ignore; /* Keep compiler happy */
+@@ -334,7 +334,7 @@
+ int nlines;
if (username == NULL) {
- snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
Modified: branches/experimental/debian/patches/005_background-dspam.diff
==============================================================================
--- branches/experimental/debian/patches/005_background-dspam.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/005_background-dspam.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -5,9 +5,9 @@
--- a/src/dspam.c
+++ b/src/dspam.c
-@@ -3971,6 +3971,11 @@
+@@ -3964,6 +3964,11 @@
+ DRIVER_CTX DTX;
char *pidfile;
- ATX = ATX; /* Keep compiler happy */
+ /* Fork dspam into the background */
+ if (fork()) {
Modified: branches/experimental/debian/patches/006_clean-manpages.diff
==============================================================================
--- branches/experimental/debian/patches/006_clean-manpages.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/006_clean-manpages.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -127,27 +127,10 @@
.TP
.BI [username]\c
Specifies the username to query. If no username is provided, all users will be
---- a/man/dspam_logrotate.1
-+++ b/man/dspam_logrotate.1
-@@ -46,12 +46,12 @@
- .BI \-v\c
- Print verbose output.
-
--.n 3
-+.ne 3
- .TP
- .BI \-l \ logfile\c
- A list of one or more files to process.
-
--.n 3
-+.ne 3
- .TP
- .BI \-d \ dir\c
- The home directory of DSPAM or the root path where user logs are located.
--- a/man/libdspam.3
+++ b/man/libdspam.3
@@ -12,8 +12,7 @@
- .TH libdspam 3 "Jan 03, 2010" "libdspam" "libdspam"
+ .TH libdspam 3 "Nov 29, 2009" "libdspam" "libdspam"
.SH NAME
-libdspam, dspam_init, dspam_create, dspam_addattribute, dspam_attach, dspam_process,
Modified: branches/experimental/debian/patches/008_where-to-find-txt-files.diff
==============================================================================
--- branches/experimental/debian/patches/008_where-to-find-txt-files.diff Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/patches/008_where-to-find-txt-files.diff Tue Jan 12 19:42:35 2010 (r236)
@@ -4,7 +4,7 @@
--- a/src/dspam.c
+++ b/src/dspam.c
-@@ -1532,7 +1532,7 @@
+@@ -1530,7 +1530,7 @@
time(&now);
Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules Tue Jan 12 19:31:16 2010 (r235)
+++ branches/experimental/debian/rules Tue Jan 12 19:42:35 2010 (r236)
@@ -72,7 +72,8 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- ./autogen.sh
+ #./autogen.sh
+ autoreconf --install
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIGURE)
touch configure-stamp
More information about the Pkg-dspam-commits
mailing list