[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-55-gd3f32ab
Julien Valroff
julien at kirya.net
Tue Aug 2 18:16:00 UTC 2011
The following commit has been merged in the master branch:
commit 02772984a118dd93161865fd211443115683eebd
Author: Julien Valroff <julien at kirya.net>
Date: Tue Aug 2 20:01:57 2011 +0200
Refresh patches
diff --git a/debian/patches/001_dspam-webfrontend-config-debian.diff b/debian/patches/001_dspam-webfrontend-config-debian.diff
index f426902..4ef0abd 100644
--- a/debian/patches/001_dspam-webfrontend-config-debian.diff
+++ b/debian/patches/001_dspam-webfrontend-config-debian.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -26,14 +26,14 @@
+@@ -25,14 +25,14 @@
#
# Read configuration parameters common to all CGI scripts
#
@@ -21,7 +21,7 @@ Forwarded: not-needed
#
# The current CGI script
-@@ -76,7 +76,7 @@
+@@ -75,7 +75,7 @@
#
do {
my($admin) = 0;
@@ -30,7 +30,7 @@ Forwarded: not-needed
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -167,9 +167,9 @@
+@@ -166,9 +166,9 @@
$DATA{'USERNAME'} = $USER;
@@ -43,7 +43,7 @@ Forwarded: not-needed
$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 @@
+@@ -262,7 +262,7 @@
}
if (! -e $FILE) {
@@ -52,7 +52,7 @@ Forwarded: not-needed
} else {
%PREFS = GetPrefs($USER, $FILE);
}
-@@ -871,7 +871,7 @@
+@@ -870,7 +870,7 @@
close(PIPE);
} else {
if (! -e $FILE) {
@@ -63,7 +63,7 @@ Forwarded: not-needed
if (! -e $FILE) {
--- a/webui/cgi-bin/admingraph.cgi
+++ b/webui/cgi-bin/admingraph.cgi
-@@ -26,14 +26,14 @@
+@@ -25,14 +25,14 @@
#
# Read configuration parameters common to all CGI scripts
#
@@ -81,7 +81,7 @@ Forwarded: not-needed
#
# Parse form
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
$LANGUAGE = $CONFIG{'LANGUAGE_USED'};
}
@@ -92,7 +92,7 @@ Forwarded: not-needed
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 @@
+@@ -28,11 +28,11 @@
$CONFIG{'DSPAM_STATS'} = $CONFIG{'DSPAM_BIN'} . "/dspam_stats";
$CONFIG{'DSPAM_ARGS'} = "--deliver=innocent --class=innocent " .
"--source=error --user %CURRENT_USER% -d %u";
@@ -106,7 +106,7 @@ Forwarded: not-needed
# Default DSPAM display
#$CONFIG{'DATE_FORMAT'} = "%d.%m.%Y %H:%M"; # Date format in strftime style
-@@ -46,13 +46,15 @@
+@@ -45,13 +45,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
@@ -128,7 +128,7 @@ Forwarded: not-needed
$CONFIG{'LOCAL_DOMAIN'} = "yourdomain.com";
--- a/webui/cgi-bin/dspam.cgi
+++ b/webui/cgi-bin/dspam.cgi
-@@ -28,14 +28,14 @@
+@@ -27,14 +27,14 @@
#
# Read configuration parameters common to all CGI scripts
#
@@ -146,7 +146,7 @@ Forwarded: not-needed
if($CONFIG{"DATE_FORMAT"}) {
use POSIX qw(strftime);
-@@ -77,7 +77,7 @@
+@@ -76,7 +76,7 @@
$CONFIG{'ADMIN'} = 0;
if ($ENV{'REMOTE_USER'} ne "") {
@@ -155,7 +155,7 @@ Forwarded: not-needed
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
$CONFIG{'SUBADMIN'} = 0;
$CONFIG{'SUBADMIN_USERS'} = {};
if ($ENV{'REMOTE_USER'} ne "" && $CONFIG{'ADMIN'} == 0) {
@@ -164,7 +164,7 @@ Forwarded: not-needed
while(<FILE>) {
chomp;
if ($_ !~ /^\s*#/) {
-@@ -1817,6 +1817,7 @@
+@@ -1834,6 +1834,7 @@
my(%PREFS);
my($FILE) = "$USER.prefs";
@@ -172,7 +172,7 @@ Forwarded: not-needed
if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
my $PREF_USER = $CURRENT_USER;
-@@ -1832,10 +1833,10 @@
+@@ -1849,10 +1850,10 @@
if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
@@ -187,7 +187,7 @@ Forwarded: not-needed
my($directive, $value) = split(/\=/);
--- a/webui/cgi-bin/graph.cgi
+++ b/webui/cgi-bin/graph.cgi
-@@ -27,14 +27,14 @@
+@@ -26,14 +26,14 @@
#
# Read configuration parameters common to all CGI scripts
#
@@ -205,7 +205,7 @@ Forwarded: not-needed
#
# Parse form
-@@ -54,7 +54,7 @@
+@@ -53,7 +53,7 @@
$LANGUAGE = $CONFIG{'LANGUAGE_USED'};
}
diff --git a/debian/patches/002_update-dspam.conf.diff b/debian/patches/002_update-dspam.conf.diff
index b240fdf..4c515fd 100644
--- a/debian/patches/002_update-dspam.conf.diff
+++ b/debian/patches/002_update-dspam.conf.diff
@@ -27,7 +27,7 @@ Forwarded: not-needed
#Trust nobody
#Trust majordomo
-@@ -286,7 +285,7 @@
+@@ -290,7 +289,7 @@
# defaults.
#
Preference "trainingMode=TEFT" # { TOE | TUM | TEFT | NOTRAIN } -> default:teft
@@ -36,7 +36,7 @@ Forwarded: not-needed
Preference "spamSubject=[SPAM]" # { string } -> default:[SPAM]
Preference "statisticalSedation=5" # { 0 - 10 } -> default:0
Preference "enableBNR=on" # { on | off } -> default:off
-@@ -346,19 +345,19 @@
+@@ -350,19 +349,19 @@
# Storage driver settings: Specific to a particular storage driver. Uncomment
# the configuration specific to your installation, if applicable.
#
@@ -65,7 +65,7 @@ Forwarded: not-needed
#MySQLWriteUser dspam
#MySQLWritePass changeme
#MySQLWriteDb dspam_write
-@@ -405,11 +404,11 @@
+@@ -406,11 +405,11 @@
# in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
# resits (without .s.PGSQL.5432).
@@ -82,7 +82,7 @@ Forwarded: not-needed
# If you're running DSPAM in client/server (daemon) mode, uncomment the
# setting below to override the default connection cache size (the number
-@@ -803,7 +802,7 @@
+@@ -804,7 +803,7 @@
#ServerHost 127.0.0.1
#ServerPort 24
#ServerQueueSize 32
@@ -91,7 +91,7 @@ Forwarded: not-needed
#
# ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -839,14 +838,14 @@
+@@ -840,14 +839,14 @@
# you are running the client and server on the same machine, as it eliminates
# much of the bandwidth overhead.
#
@@ -108,7 +108,7 @@ Forwarded: not-needed
#ClientIdent "secret at Relay1"
#
#ClientHost 127.0.0.1
-@@ -900,7 +899,7 @@
+@@ -901,7 +900,7 @@
# --- Split Configuration File Support ---
# Include a directory with configuration items.
diff --git a/debian/patches/003_dspam-default.prefs-in_etc.diff b/debian/patches/003_dspam-default.prefs-in_etc.diff
index a4fcecb..f9c08cf 100644
--- a/debian/patches/003_dspam-default.prefs-in_etc.diff
+++ b/debian/patches/003_dspam-default.prefs-in_etc.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/webui/cgi-bin/admin.cgi
+++ b/webui/cgi-bin/admin.cgi
-@@ -169,14 +169,6 @@
+@@ -168,14 +168,6 @@
if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
$FILE = "/etc/dspam/default.prefs";
@@ -21,7 +21,7 @@ Forwarded: not-needed
}
--- a/src/pref.c
+++ b/src/pref.c
-@@ -181,7 +181,7 @@
+@@ -180,7 +180,7 @@
PTX[0] = NULL;
if (user == NULL) {
@@ -30,7 +30,7 @@ Forwarded: not-needed
} else {
_ds_userdir_path (filename, home, user, "prefs");
}
-@@ -311,7 +311,7 @@
+@@ -310,7 +310,7 @@
ignore = ignore; /* Keep compiler happy */
if (username == NULL) {
@@ -39,7 +39,7 @@ Forwarded: not-needed
} else {
_ds_userdir_path (filename, home, username, "prefs");
}
-@@ -340,7 +340,7 @@
+@@ -339,7 +339,7 @@
ignore = ignore; /* Keep compiler happy */
if (username == NULL) {
diff --git a/debian/patches/004_where-to-find-txt-files.diff b/debian/patches/004_where-to-find-txt-files.diff
index 52cd2ae..fa04918 100644
--- a/debian/patches/004_where-to-find-txt-files.diff
+++ b/debian/patches/004_where-to-find-txt-files.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/src/dspam.c
+++ b/src/dspam.c
-@@ -1538,7 +1538,7 @@
+@@ -1537,7 +1537,7 @@
time(&now);
diff --git a/debian/patches/006_default-daemon-port.diff b/debian/patches/006_default-daemon-port.diff
index d59720f..d813556 100644
--- a/debian/patches/006_default-daemon-port.diff
+++ b/debian/patches/006_default-daemon-port.diff
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/src/daemon.c
+++ b/src/daemon.c
-@@ -98,7 +98,7 @@
+@@ -97,7 +97,7 @@
int domain = 0; /* listening on domain socket? */
int listener; /* listener fd */
int i;
@@ -25,7 +25,7 @@ Forwarded: not-needed
#DeliveryIdent localhost
#DeliveryProto LMTP
-@@ -799,8 +799,12 @@
+@@ -800,8 +800,12 @@
# ServerHost: Not enabling ServerHost will bind DSPAM server to all available
# interfaces.
#
@@ -39,7 +39,7 @@ Forwarded: not-needed
#ServerQueueSize 32
#ServerPID /var/run/dspam/dspam.pid
-@@ -849,7 +853,7 @@
+@@ -850,7 +854,7 @@
#ClientIdent "secret at Relay1"
#
#ClientHost 127.0.0.1
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list