[pkg-dspam-commits] r92 - in trunk/debian: config patches
Matthijs Mohlmann
active2-guest at costa.debian.org
Sun May 21 09:23:27 UTC 2006
Author: active2-guest
Date: Sun May 21 09:23:26 2006
New Revision: 92
Removed:
trunk/debian/patches/configure-ac.dpatch
Modified:
trunk/debian/changelog
trunk/debian/config/mysql.conf
trunk/debian/control
trunk/debian/dspam.install
trunk/debian/dspam.manpages
trunk/debian/libdspam7-drv-pgsql.override
trunk/debian/patches/00list
trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
trunk/debian/patches/update-dspam.conf.dpatch
trunk/debian/rules
Log:
* New upstream release.
* Removed patch for sqlite3 backend to link properly.
* Updated the patches so they work again.
* Removed some binaries that are not build / used anymore they are replaced
by other tools
* Updated the mysql config.
* Updated Standards-Version.
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Sun May 21 09:23:26 2006
@@ -1,3 +1,17 @@
+dspam (3.6.6-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #361249)
+ * Include dspam_train and the manpage into the dspam package
+ (Closes: #366464)
+ * Added --list-missing to dh_install, to see if there are files that are not
+ placed in an install directory.
+ * Removed obsolete patch configure-ac, upstream fixed the typo.
+ * Updated patch dspam-webfrontend-config-debian. (default config for debian)
+ * Updated patch update-dspam.conf (default config for debian)
+ * Updated Standards-Version to 3.7.2.0
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Fri, 19 May 2006 22:44:50 +0200
+
dspam (3.6.4-4) unstable; urgency=low
* Remove previous fix for #359944 this introduced two grave bugs.
Modified: trunk/debian/config/mysql.conf
==============================================================================
--- trunk/debian/config/mysql.conf (original)
+++ trunk/debian/config/mysql.conf Sun May 21 09:23:26 2006
@@ -11,6 +11,22 @@
MySQLDb _DBC_DBNAME_
#MySQLCompress false
+# 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
+
+# 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)
# mysql-server-4.1 version => 4.1.15-1 doesn't have this bug.
# This bug doesn't apply to debian mysql server, it is already fixed in the
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Sun May 21 09:23:26 2006
@@ -4,7 +4,7 @@
Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
Uploaders: Matthijs Mohlmann <matthijs at cacholong.nl>, Christoph Haas <haas at debian.org>, Kurt B. Kaiser <kbk at shore.net>, Jesus Climent <mooch at debian.org>, Rudolf Weber <rudolf at faveve.uni-stuttgart.de>, Aurelien Labrosse <aurelien.labrosse at free.fr>
Build-Depends: debhelper (>= 4.0), libpq-dev | postgresql-dev, dpatch (>= 2.0.0), libtool, automake1.9, autotools-dev, libmysqlclient15-dev, libdb4.2-dev, libsqlite3-dev, libldap2-dev
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2.0
Package: dspam
Architecture: any
Modified: trunk/debian/dspam.install
==============================================================================
--- trunk/debian/dspam.install (original)
+++ trunk/debian/dspam.install Sun May 21 09:23:26 2006
@@ -2,17 +2,17 @@
webui/cgi-bin/default.prefs etc/dspam/
debian/tmp/usr/bin/dspam_2sql usr/bin/
debian/tmp/usr/bin/dspamc usr/bin/
-debian/tmp/usr/bin/dspam_corpus usr/bin/
+debian/tmp/usr/bin/dspam_train usr/bin/
debian/tmp/usr/bin/dspam_dump usr/bin/
debian/tmp/usr/bin/dspam_logrotate usr/bin/
debian/tmp/usr/bin/dspam usr/bin/
debian/tmp/usr/bin/dspam_admin usr/bin/
debian/tmp/usr/bin/dspam_clean usr/bin/
debian/tmp/usr/bin/dspam_crc usr/bin/
-debian/tmp/usr/bin/dspam_genaliases usr/bin/
debian/tmp/usr/bin/dspam_merge usr/bin/
debian/tmp/usr/bin/dspam_stats usr/bin/
debian/tmp/usr/lib/libhash_drv.so* usr/lib/dspam
debian/tmp/usr/bin/cssclean usr/bin
debian/tmp/usr/bin/cssstat usr/bin
debian/tmp/usr/bin/csscompress usr/bin
+debian/tmp/usr/bin/cssconvert usr/bin
Modified: trunk/debian/dspam.manpages
==============================================================================
--- trunk/debian/dspam.manpages (original)
+++ trunk/debian/dspam.manpages Sun May 21 09:23:26 2006
@@ -1,6 +1,5 @@
debian/manpages/dspam_admin.1
debian/manpages/dspam_crc.1
-debian/manpages/dspam_genaliases.1
debian/manpages/dspam_2sql.1
debian/manpages/dspam_logrotate.1
debian/manpages/dspamc.1
@@ -9,7 +8,7 @@
debian/manpages/cssstat.1
man/dspam.1
man/dspam_clean.1
-man/dspam_corpus.1
+man/dspam_train.1
man/dspam_dump.1
man/dspam_merge.1
man/dspam_stats.1
Modified: trunk/debian/libdspam7-drv-pgsql.override
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.override (original)
+++ trunk/debian/libdspam7-drv-pgsql.override Sun May 21 09:23:26 2006
@@ -1,2 +1,2 @@
libdspam7-drv-pgsql: no-debconf-templates
-libdspam7-drv-pgsql: package-has-a-duplicate-relation depends: libdspam7, libdspam7 (= 3.6.4-3)
+libdspam7-drv-pgsql: package-has-a-duplicate-relation depends: libdspam7, libdspam7 (= 3.6.6-1)
Modified: trunk/debian/patches/00list
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Sun May 21 09:23:26 2006
@@ -11,6 +11,5 @@
autogen-sh.dpatch
default-server-pidfile.dpatch
background-dspam.dpatch
-configure-ac.dpatch
pos-neg-switched.dpatch
fix-nav-performance.dpatch
Modified: trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
==============================================================================
--- trunk/debian/patches/dspam-webfrontend-config-debian.dpatch (original)
+++ trunk/debian/patches/dspam-webfrontend-config-debian.dpatch Sun May 21 09:23:26 2006
@@ -6,9 +6,9 @@
## DP: to make the scripts usable on a Debian system out-of-the-box
@DPATCH@
-diff -urNad dspam-3.6.0/webui/cgi-bin/admin.cgi /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/admin.cgi
---- dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-11-04 13:26:27.187521072 +0000
-+++ /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/admin.cgi 2005-11-04 13:27:16.809977312 +0000
+diff -urNad dspam-3.6.6~/webui/cgi-bin/admin.cgi dspam-3.6.6/webui/cgi-bin/admin.cgi
+--- dspam-3.6.6~/webui/cgi-bin/admin.cgi 2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/webui/cgi-bin/admin.cgi 2006-05-19 19:11:22.046834208 +0200
@@ -24,7 +24,7 @@
require "ctime.pl";
@@ -47,7 +47,7 @@
} else {
%PREFS = GetPrefs($USER, $FILE);
}
-@@ -669,6 +669,7 @@
+@@ -671,6 +671,7 @@
if ($CONFIG{'DOMAIN_SCALE'} == 1) {
$VPOPUSERNAME = (split(/@/, $UN))[0];
$VPOPDOMAIN = (split(/@/, $UN))[1];
@@ -55,7 +55,7 @@
$USER = "$CONFIG{'DSPAM_HOME'}/data/$VPOPDOMAIN/$VPOPUSERNAME/$VPOPUSERNAME";
# Normal scale
-@@ -702,7 +703,7 @@
+@@ -704,7 +705,7 @@
close(PIPE);
} else {
if (! -e $FILE) {
@@ -64,9 +64,9 @@
}
if (! -e $FILE) {
-diff -urNad dspam-3.6.0/webui/cgi-bin/admingraph.cgi /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/admingraph.cgi
---- dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-11-04 13:26:27.188520920 +0000
-+++ /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/admingraph.cgi 2005-11-04 13:26:28.186369224 +0000
+diff -urNad dspam-3.6.6~/webui/cgi-bin/admingraph.cgi dspam-3.6.6/webui/cgi-bin/admingraph.cgi
+--- dspam-3.6.6~/webui/cgi-bin/admingraph.cgi 2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/webui/cgi-bin/admingraph.cgi 2006-05-19 19:11:22.046834208 +0200
@@ -24,11 +24,11 @@
use vars qw { %CONFIG %FORM @spam @nonspam @period @data @inoc @sm @fp @wh };
@@ -81,9 +81,9 @@
do {
my($spam, $nonspam, $sm, $fp, $inoc, $wh, $period) = split(/\_/, $FORM{'data'});
-diff -urNad dspam-3.6.0/webui/cgi-bin/configure.pl.in /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/configure.pl.in
---- dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-11-04 13:26:27.188520920 +0000
-+++ /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/configure.pl.in 2005-11-04 13:26:47.389449912 +0000
+diff -urNad dspam-3.6.6~/webui/cgi-bin/configure.pl.in dspam-3.6.6/webui/cgi-bin/configure.pl.in
+--- dspam-3.6.6~/webui/cgi-bin/configure.pl.in 2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/webui/cgi-bin/configure.pl.in 2006-05-19 19:12:46.702964520 +0200
@@ -29,11 +29,11 @@
$CONFIG{'DSPAM_STATS'} = $CONFIG{'DSPAM_BIN'} . "/dspam_stats";
$CONFIG{'DSPAM_ARGS'} = "--deliver=innocent --class=innocent " .
@@ -93,12 +93,12 @@
$CONFIG{'ALL_PROCS'} = "ps auxw"; # use ps -deaf for Solaris
$CONFIG{'MAIL_QUEUE'} = "mailq | grep '^[0-9,A-F]' | wc -l";
--$CONFIG{'WEB_ROOT'} = "/"; # URL location of included htdocs/ files
+-$CONFIG{'WEB_ROOT'} = ""; # URL location of included htdocs/ files
+$CONFIG{'WEB_ROOT'} = "./"; # URL location of included htdocs/ files
# Default DSPAM display
- $CONFIG{'HISTORY_SIZE'} = 799; # Number of items in history
-@@ -49,14 +49,14 @@
+ #$CONFIG{'DATE_FORMAT'} = "%d.%m.%Y %H:%M"; # Date format in strftime style
+@@ -53,14 +53,14 @@
$ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
# Autodetect filesystem layout and preference options
@@ -117,9 +117,9 @@
$CONFIG{'DSPAM_CGI'} = "dspam.cgi";
-diff -urNad dspam-3.6.0/webui/cgi-bin/dspam.cgi /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/dspam.cgi
---- dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-11-04 13:26:27.189520768 +0000
-+++ /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/dspam.cgi 2005-11-04 13:26:28.187369072 +0000
+diff -urNad dspam-3.6.6~/webui/cgi-bin/dspam.cgi dspam-3.6.6/webui/cgi-bin/dspam.cgi
+--- dspam-3.6.6~/webui/cgi-bin/dspam.cgi 2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/webui/cgi-bin/dspam.cgi 2006-05-19 22:11:03.926197736 +0200
@@ -25,7 +25,7 @@
require "ctime.pl";
@@ -127,9 +127,9 @@
-require "configure.pl";
+require "/etc/dspam/webfrontend.conf";
- #
- # The current CGI script
-@@ -63,7 +63,7 @@
+ if($CONFIG{"DATE_FORMAT"}) {
+ use POSIX qw(strftime);
+@@ -67,7 +67,7 @@
$CONFIG{'ADMIN'} = 0;
if ($ENV{'REMOTE_USER'} ne "") {
@@ -138,18 +138,24 @@
while(<FILE>) {
chomp;
if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -1418,7 +1418,7 @@
+@@ -1575,11 +1575,12 @@
+ }
if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
- if (! -e $FILE) {
-- $FILE = "./default.prefs";
-+ $FILE = "/etc/dspam/default.prefs";
- }
++ $DEFAULT_PREFS = "/etc/dspam/default.prefs";
- if (! -e $FILE) {
-diff -urNad dspam-3.6.0/webui/cgi-bin/graph.cgi /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/graph.cgi
---- dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-11-04 13:26:27.189520768 +0000
-+++ /tmp/dpep.earVua/dspam-3.6.0/webui/cgi-bin/graph.cgi 2005-11-04 13:26:28.188368920 +0000
+- if (! -e "./default.prefs") {
++ if (! -e $DEFAULT_PREFS) {
+ &error("Unable to load default preferences");
+ }
+- open(FILE, "<./default.prefs");
++ open(FILE, "<$DEFAULT_PREFS");
+ while(<FILE>) {
+ chomp;
+ my($directive, $value) = split(/\=/);
+diff -urNad dspam-3.6.6~/webui/cgi-bin/graph.cgi dspam-3.6.6/webui/cgi-bin/graph.cgi
+--- dspam-3.6.6~/webui/cgi-bin/graph.cgi 2006-05-13 14:17:31.000000000 +0200
++++ dspam-3.6.6/webui/cgi-bin/graph.cgi 2006-05-19 19:11:22.052833296 +0200
@@ -25,11 +25,11 @@
use vars qw { %CONFIG %FORM @spam_day @nonspam_day @period @data };
Modified: trunk/debian/patches/update-dspam.conf.dpatch
==============================================================================
--- trunk/debian/patches/update-dspam.conf.dpatch (original)
+++ trunk/debian/patches/update-dspam.conf.dpatch Sun May 21 09:23:26 2006
@@ -6,10 +6,10 @@
@DPATCH@
-diff -urNad dspam-3.6.2~/src/dspam.conf.in dspam-3.6.2/src/dspam.conf.in
---- dspam-3.6.2~/src/dspam.conf.in 2006-01-03 12:14:46.613186250 +0100
-+++ dspam-3.6.2/src/dspam.conf.in 2006-01-03 12:15:15.178971500 +0100
-@@ -115,6 +115,7 @@
+diff -urNad dspam-3.6.6~/src/dspam.conf.in dspam-3.6.6/src/dspam.conf.in
+--- dspam-3.6.6~/src/dspam.conf.in 2006-05-19 22:14:13.202423376 +0200
++++ dspam-3.6.6/src/dspam.conf.in 2006-05-19 22:20:03.904108616 +0200
+@@ -127,6 +127,7 @@
# able to specify delivery agent privileges or use tools.
#
Trust root
@@ -17,7 +17,7 @@
Trust mail
Trust mailnull
Trust smmsp
-@@ -222,7 +223,7 @@
+@@ -246,7 +247,7 @@
# If user or default.prefs are found, the user's preferences will override any
# defaults.
#
@@ -26,7 +26,7 @@
Preference "signatureLocation=message" # 'message' or 'headers'
Preference "showFactors=on"
#Preference "spamAction=tag"
-@@ -243,76 +244,6 @@
+@@ -267,92 +268,6 @@
AllowOverride optIn optOut
AllowOverride whitelistThreshold
@@ -43,6 +43,22 @@
-#MySQLDb dspam
-#MySQLCompress 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
+-
+-# 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
-
@@ -103,7 +119,7 @@
# --- Oracle ---
#OraServer "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-@@ -517,7 +448,7 @@
+@@ -563,7 +478,7 @@
# users will be filtered unless a .nodspam file is dropped in
# /var/dspam/opt-out/user.nodspam
#
@@ -112,7 +128,7 @@
#
# TrackSources: specify which (if any) source addresses to track and report
-@@ -675,4 +606,7 @@
+@@ -721,4 +636,7 @@
#
ProcessorBias on
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Sun May 21 09:23:26 2006
@@ -110,7 +110,7 @@
dh_clean -k
dh_installdirs
(cd build--tmp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
- dh_install
+ dh_install --list-missing
# Install override for conffiles into /usr/share
cp debian/dspam-webfrontend.override $(CURDIR)/debian/dspam-webfrontend/usr/share/lintian/overrides/dspam-webfrontend
More information about the Pkg-dspam-commits
mailing list