[Pkg-dspam-commits] [pkg-dspam-commits] r223 - in branches/experimental/debian: . manpages patches
Julien Valroff
julien-guest at alioth.debian.org
Wed Dec 30 15:14:11 UTC 2009
Author: julien-guest
Date: Wed Dec 30 15:14:09 2009
New Revision: 223
Log:
Updated for current git
Deleted:
branches/experimental/debian/dspam.examples
branches/experimental/debian/manpages/dspam_admin.1
branches/experimental/debian/manpages/dspam_crc.1
branches/experimental/debian/manpages/dspam_logrotate.1
branches/experimental/debian/patches/007_path-to-dspam_for-training-script.diff
branches/experimental/debian/patches/009_remove-double-virus-warning.diff
Modified:
branches/experimental/debian/changelog
branches/experimental/debian/dspam-webfrontend.install
branches/experimental/debian/dspam.manpages
branches/experimental/debian/libdspam7-dev.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/patches/series
branches/experimental/debian/rules
Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/changelog Wed Dec 30 15:14:09 2009 (r223)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2-1) experimental; urgency=low
+dspam (3.9.0~rc2+git20091228-1) experimental; urgency=low
[ Kurt B. Kaiser ]
* debian/rules: don't use --build config option if host equals target.
Modified: branches/experimental/debian/dspam-webfrontend.install
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.install Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/dspam-webfrontend.install Wed Dec 30 15:14:09 2009 (r223)
@@ -12,5 +12,6 @@
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/rgb.txt etc/dspam/
debian/dspam-apache2.conf etc/dspam/
Modified: branches/experimental/debian/dspam.manpages
==============================================================================
--- branches/experimental/debian/dspam.manpages Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/dspam.manpages Wed Dec 30 15:14:09 2009 (r223)
@@ -1,15 +1,15 @@
-debian/manpages/dspam_admin.1
-debian/manpages/dspam_crc.1
debian/manpages/dspam_2sql.1
-debian/manpages/dspam_logrotate.1
debian/manpages/dspamc.1
-debian/manpages/cssclean.1
+debian/manpages/cssclean.1
debian/manpages/csscompress.1
debian/manpages/cssconvert.1
-debian/manpages/cssstat.1
+debian/manpages/cssstat.1
man/dspam.1
-man/dspam_clean.1
+man/dspam_admin.1
+man/dspam_clean.1
+man/dspam_crc.1
+man/dspam_dump.1
+man/dspam_logrotate.1
+man/dspam_merge.1
+man/dspam_stats.1
man/dspam_train.1
-man/dspam_dump.1
-man/dspam_merge.1
-man/dspam_stats.1
Modified: branches/experimental/debian/libdspam7-dev.manpages
==============================================================================
--- branches/experimental/debian/libdspam7-dev.manpages Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/libdspam7-dev.manpages Wed Dec 30 15:14:09 2009 (r223)
@@ -1,4 +1,3 @@
-debian/tmp/usr/share/man/man3/libdspam.3
debian/manpages/dspam_addattribute.3
debian/manpages/dspam_attach.3
debian/manpages/dspam_create.3
@@ -6,3 +5,4 @@
debian/manpages/dspam_detach.3
debian/manpages/dspam_getsource.3
debian/manpages/dspam_process.3
+man/libdspam.3
Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -4,25 +4,34 @@
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -24,7 +24,7 @@
- require "ctime.pl";
-
+@@ -26,14 +26,14 @@
+ #
# 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";
#
- # Read language file
-@@ -48,7 +48,7 @@
+ # The current CGI script
+@@ -76,7 +76,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'}) {
-@@ -146,9 +146,9 @@
+@@ -167,9 +167,9 @@
$DATA{'USERNAME'} = $USER;
@@ -35,7 +44,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. ".
-@@ -242,7 +242,7 @@
+@@ -263,7 +263,7 @@
}
if (! -e $FILE) {
@@ -44,7 +53,7 @@
} else {
%PREFS = GetPrefs($USER, $FILE);
}
-@@ -837,7 +837,7 @@
+@@ -871,7 +871,7 @@
close(PIPE);
} else {
if (! -e $FILE) {
@@ -55,36 +64,79 @@
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 };
-
+@@ -26,14 +26,14 @@
+ #
# 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";
#
- # Read language file
-@@ -39,7 +39,7 @@
-
- %FORM = &ReadParse();
+ # Parse form
+@@ -53,7 +53,7 @@
+ $LANGUAGE = $CONFIG{'LANGUAGE_USED'};
+ }
-GD::Graph::colour::read_rgb("rgb.txt");
-+GD::Graph::colour::read_rgb("/etc/dspam/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,7 +46,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; # 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
+
+ # Add customized settings below
+ $CONFIG{'LOCAL_DOMAIN'} = "yourdomain.com";
--- a/webui/cgi-bin/dspam.cgi
+++ b/webui/cgi-bin/dspam.cgi
-@@ -25,7 +25,7 @@
- require "ctime.pl";
-
+@@ -28,14 +28,14 @@
+ #
# 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";
- #
- # Read language file
-@@ -78,7 +78,7 @@
+ if($CONFIG{"DATE_FORMAT"}) {
+ use POSIX qw(strftime);
+@@ -77,7 +77,7 @@
$CONFIG{'ADMIN'} = 0;
if ($ENV{'REMOTE_USER'} ne "") {
@@ -93,16 +145,16 @@
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -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 @@
+@@ -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 @@
my(%PREFS);
my($FILE) = "$USER.prefs";
@@ -110,13 +162,13 @@
if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
my $PREF_USER = $CURRENT_USER;
-@@ -2065,10 +2066,10 @@
+@@ -1829,10 +1830,10 @@
if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
- if (! -e "./default.prefs") {
+ if (! -e "$DEFAULT_PREFS") {
- &error("$LANG{'error_load_default_prefs'}");
+ &error("$CONFIG{'LANG'}->{$LANGUAGE}->{'error_load_default_prefs'}");
}
- open(FILE, "<./default.prefs");
+ open(FILE, "<$DEFAULT_PREFS");
@@ -125,51 +177,30 @@
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 };
-
+@@ -27,14 +27,14 @@
+ #
# 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";
#
- # Read language file
-@@ -40,7 +40,7 @@
-
- %FORM = &ReadParse();
+ # Parse form
+@@ -54,7 +54,7 @@
+ $LANGUAGE = $CONFIG{'LANGUAGE_USED'};
+ }
-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,12 +45,9 @@
- $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
- $CONFIG{'LOCAL_DOMAIN'} = "localhost";
-
--# Add customized settings below
--$CONFIG{'LOCAL_DOMAIN'} = "yourdomain.com";
--
- $ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
-
- # Autodetect filesystem layout and preference options
Modified: branches/experimental/debian/patches/003_update-dspam.conf.diff
==============================================================================
--- branches/experimental/debian/patches/003_update-dspam.conf.diff Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -4,7 +4,7 @@
--- a/src/dspam.conf.in
+++ b/src/dspam.conf.in
-@@ -129,11 +129,10 @@
+@@ -143,11 +143,10 @@
#
Trust root
Trust dspam
@@ -18,7 +18,7 @@
#Trust nobody
#Trust majordomo
-@@ -272,7 +271,7 @@
+@@ -286,7 +285,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
-@@ -324,222 +323,6 @@
- AllowOverride whitelistThreshold
+@@ -340,222 +339,6 @@
AllowOverride dailyQuarantineSummary
+ AllowOverride notifications
-# --- MySQL ---
-
@@ -250,7 +250,7 @@
# -- Profiles --
#
-@@ -691,7 +474,7 @@
+@@ -714,7 +497,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
-@@ -778,7 +561,7 @@
+@@ -801,7 +584,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:
-@@ -814,14 +597,14 @@
+@@ -837,14 +620,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
-@@ -868,4 +651,7 @@
+@@ -891,4 +674,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 Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -33,7 +33,7 @@
}
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -147,14 +147,6 @@
+@@ -169,14 +169,6 @@
if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
$FILE = "/etc/dspam/default.prefs";
Modified: branches/experimental/debian/patches/005_background-dspam.diff
==============================================================================
--- branches/experimental/debian/patches/005_background-dspam.diff Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/005_background-dspam.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -5,7 +5,7 @@
--- a/src/dspam.c
+++ b/src/dspam.c
-@@ -3944,6 +3944,11 @@
+@@ -3969,6 +3969,11 @@
DRIVER_CTX DTX;
char *pidfile;
Modified: branches/experimental/debian/patches/006_clean-manpages.diff
==============================================================================
--- branches/experimental/debian/patches/006_clean-manpages.diff Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/006_clean-manpages.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -97,7 +97,7 @@
--- a/man/libdspam.3
+++ b/man/libdspam.3
@@ -12,8 +12,7 @@
- .TH libdspam 3 "Nov 29, 2009" "libdspam" "libdspam"
+ .TH libdspam 3 "Dec 19, 2009" "libdspam" "libdspam"
.SH NAME
-libdspam, dspam_init, dspam_create, dspam_addattribute, dspam_attach, dspam_process,
@@ -139,3 +139,20 @@
.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.
Modified: branches/experimental/debian/patches/008_where-to-find-txt-files.diff
==============================================================================
--- branches/experimental/debian/patches/008_where-to-find-txt-files.diff Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/008_where-to-find-txt-files.diff Wed Dec 30 15:14:09 2009 (r223)
@@ -4,7 +4,7 @@
--- a/src/dspam.c
+++ b/src/dspam.c
-@@ -1530,7 +1530,7 @@
+@@ -1532,7 +1532,7 @@
time(&now);
Modified: branches/experimental/debian/patches/series
==============================================================================
--- branches/experimental/debian/patches/series Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/patches/series Wed Dec 30 15:14:09 2009 (r223)
@@ -4,6 +4,4 @@
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
-009_remove-double-virus-warning.diff
Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules Mon Dec 28 17:21:38 2009 (r222)
+++ branches/experimental/debian/rules Wed Dec 30 15:14:09 2009 (r223)
@@ -72,6 +72,7 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+ ./autogen.sh
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIGURE)
touch configure-stamp
More information about the Pkg-dspam-commits
mailing list