[pkg-dspam-commits] r50 - in trunk/debian: . config patches
Matthijs Mohlmann
active2-guest at costa.debian.org
Fri Nov 11 10:25:17 UTC 2005
Author: active2-guest
Date: Fri Nov 11 10:25:16 2005
New Revision: 50
Added:
trunk/debian/config/
trunk/debian/config/mysql.conf
trunk/debian/config/pgsql.conf
trunk/debian/patches/add-config-dir.dpatch (contents, props changed)
Modified:
trunk/debian/control
trunk/debian/dspam.dirs
trunk/debian/libdspam7-drv-mysql.install
trunk/debian/libdspam7-drv-mysql.postinst
trunk/debian/libdspam7-drv-mysql.postrm
trunk/debian/libdspam7-drv-pgsql.install
trunk/debian/libdspam7-drv-pgsql.postinst
trunk/debian/libdspam7-drv-pgsql.postrm
trunk/debian/patches/update-dspam.conf.dpatch
Log:
* mysql and postgresql backend should depend on ucf and respectively
mysql-client and postgresql-client
* Update patch update-dspam.conf.dpatch so that it splits out the configuration
into 3 different configuration files: dspam.conf, mysql.conf and pgsql.conf
* Add patch to add an Include directive which can include a file or a
directory with files containing parameters.
* Update the postinst, prerm and postrm script so that dbconfig-common can
work with it.
* Scaring you with some nice sed expressions.
Added: trunk/debian/config/mysql.conf
==============================================================================
--- (empty file)
+++ trunk/debian/config/mysql.conf Fri Nov 11 10:25:16 2005
@@ -0,0 +1,41 @@
+# --- MySQL ---
+
+#
+# Storage driver settings: Specific to a particular storage driver. Uncomment
+# the configuration specific to your installation, if applicable.
+#
+#MySQLServer /var/run/mysqld/mysqld.sock
+#MySQLPort
+#MySQLUser dspam
+#MySQLPass changeme
+#MySQLDb dspam
+#MySQLCompress false
+
+# 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
+
Added: trunk/debian/config/pgsql.conf
==============================================================================
--- (empty file)
+++ trunk/debian/config/pgsql.conf Fri Nov 11 10:25:16 2005
@@ -0,0 +1,29 @@
+# --- 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
+
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Fri Nov 11 10:25:16 2005
@@ -69,8 +69,8 @@
Package: libdspam7-drv-pgsql
Architecture: any
-Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0
-Recommends: postgresql-8.0
+Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0, ucf, postgresql-client-8.1
+Recommends: postgresql-8.1
Provides: libdspam7-drv
Description: DSPAM is a scalable and statistical anti-spam filter
DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -85,8 +85,8 @@
Package: libdspam7-drv-mysql
Architecture: any
-Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0
-Recommends: mysql-server-5.0
+Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0, ucf, mysql-client
+Recommends: mysql-server
Provides: libdspam7-drv
Description: DSPAM is a scalable and statistical anti-spam filter
DSPAM is a dedicated statistical filter with minimal resources. It includes
Modified: trunk/debian/dspam.dirs
==============================================================================
--- trunk/debian/dspam.dirs (original)
+++ trunk/debian/dspam.dirs Fri Nov 11 10:25:16 2005
@@ -1,4 +1,4 @@
usr/bin
var/spool/dspam/data
-etc/dspam
+etc/dspam/dspam.d
var/log/dspam
Modified: trunk/debian/libdspam7-drv-mysql.install
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.install (original)
+++ trunk/debian/libdspam7-drv-mysql.install Fri Nov 11 10:25:16 2005
@@ -9,3 +9,4 @@
src/tools.mysql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-mysql/
src/tools.mysql_drv/purge-4.1.sql usr/share/doc/libdspam7-drv-mysql/
src/tools.mysql_drv/purge.sql usr/share/doc/libdspam7-drv-mysql/
+debian/config/mysql.conf usr/share/doc/libdspam7-drv-mysql/
Modified: trunk/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postinst (original)
+++ trunk/debian/libdspam7-drv-mysql.postinst Fri Nov 11 10:25:16 2005
@@ -13,6 +13,48 @@
# Run dbconfig
dbc_go libdspam7-drv-mysql $@
+case "$1" in
+ configure)
+ # Create default config.
+ MYSQLCONFTEMP=`mktemp`
+ cat /usr/share/doc/libdspam7-drv-mysql/mysql.conf > $MYSQLCONFTEMP
+
+ # Load config coming from dbconfig-common
+ . /etc/dbconfig-common/libdspam7-drv-mysql.conf
+
+ # Edit default config with parameters from dbconfig-common if
+ # dbconfig-common was used to create databases.
+ if [ "$dbc_install" = "true" ]; then
+ if [ ! -z "$dbc_dbserver" ]; then
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLServer.*$|MySQLServer $dbc_dbserver|" $MYSQLCONFTEMP
+ else
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLServer|MySQLServer|" $MYSQLCONFTEMP
+ fi
+
+ # If not set, use default.
+ if [ ! -z "$dbc_dbport" ]; then
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLPort.*$|MySQLPort $dbc_dbport|" $MYSQLCONFTEMP
+ fi
+ # dbc_dbuser, dbc_dbpass, dbc_dbname should be set otherwise
+ # dbconfig-common isn't able to do anything.
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLUser.*$|MySQLUser $dbc_dbuser|" $MYSQLCONFTEMP
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLPass.*$|MySQLPass $dbc_dbpass|" $MYSQLCONFTEMP
+ sed -i -e "s|^\(#\)\?\(# \)\?MySQLDb.*$|MySQLDb $dbc_dbname|" $MYSQLCONFTEMP
+ fi
+
+ # Install the configuration file
+ ucf $MYSQLCONFTEMP /etc/dspam/dspam.d/mysql.conf
+
+ # Clean up temp files.
+ rm -f $MYSQLCONFTEMP
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ ;;
+esac
+
#DEBHELPER#
exit 0
Modified: trunk/debian/libdspam7-drv-mysql.postrm
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postrm (original)
+++ trunk/debian/libdspam7-drv-mysql.postrm Fri Nov 11 10:25:16 2005
@@ -13,6 +13,25 @@
# Run dbconfig
dbc_go libdspam7-drv-mysql $@
+case "$1" in
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ purge)
+ # Remove files registered with ucf.
+ for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
+ rm -f /etc/dspam/dspam.d/mysql.conf$ext
+ done
+ rm -f /etc/dspam/dspam.d/mysql.conf
+ ucf --purge /etc/dspam/dspam.d/mysql.conf
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
#DEBHELPER#
exit 0
Modified: trunk/debian/libdspam7-drv-pgsql.install
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.install (original)
+++ trunk/debian/libdspam7-drv-pgsql.install Fri Nov 11 10:25:16 2005
@@ -5,3 +5,4 @@
src/tools.pgsql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-pgsql/
src/tools.pgsql_drv/purge.sql usr/share/doc/libdspam7-drv-pgsql/
debian/tmp/usr/bin/dspam_pg2int8 usr/bin/
+debian/config/pgsql.conf usr/share/doc/libdspam7-drv-pgsql/
Modified: trunk/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postinst (original)
+++ trunk/debian/libdspam7-drv-pgsql.postinst Fri Nov 11 10:25:16 2005
@@ -13,6 +13,48 @@
# Run dbconfig
dbc_go libdspam7-drv-pgsql $@
+case "$1" in
+ configure)
+ # Create default config.
+ PGSQLCONFTEMP=`mktemp`
+ cat /usr/share/doc/libdspam7-drv-pgsql/pgsql.conf > $PGSQLCONFTEMP
+
+ # Load config coming from dbconfig-common
+ . /etc/dbconfig-common/libdspam7-drv-pgsql.conf
+
+ # Edit default config with parameters from dbconfig-common if
+ # dbconfig-common was used to create databases.
+ if [ "$dbc_install" = "true" ]; then
+ if [ ! -z "$dbc_dbserver" ]; then
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLServer.*$|PgSQLServer $dbc_dbserver|" $PGSQLCONFTEMP
+ else
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLServer|PgSQLServer|" $PGSQLCONFTEMP
+ fi
+
+ # If not set, use default.
+ if [ ! -z "$dbc_dbport" ]; then
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLPort.*$|PgSQLPort $dbc_dbport|" $PGSQLCONFTEMP
+ fi
+ # dbc_dbuser, dbc_dbpass, dbc_dbname should be set otherwise
+ # dbconfig-common isn't able to do anything.
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLUser.*$|PgSQLUser $dbc_dbuser|" $PGSQLCONFTEMP
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLPass.*$|PgSQLPass $dbc_dbpass|" $PGSQLCONFTEMP
+ sed -i -e "s|^\(#\)\?\(# \)\?PgSQLDb.*$|PgSQLDb $dbc_dbname|" $PGSQLCONFTEMP
+ fi
+
+ # Install the configuration file
+ ucf $PGSQLCONFTEMP /etc/dspam/dspam.d/pgsql.conf
+
+ # Clean up temp files.
+ rm -f $PGSQLCONFTEMP
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ ;;
+esac
+
#DEBHELPER#
exit 0
Modified: trunk/debian/libdspam7-drv-pgsql.postrm
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postrm (original)
+++ trunk/debian/libdspam7-drv-pgsql.postrm Fri Nov 11 10:25:16 2005
@@ -13,6 +13,25 @@
# Run dbconfig
dbc_go libdspam7-drv-pgsql $@
+case "$1" in
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ purge)
+ # Remove files registered with ucf.
+ for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
+ rm -f /etc/dspam/dspam.d/pgsql.conf$ext
+ done
+ rm -f /etc/dspam/dspam.d/pgsql.conf
+ ucf --purge /etc/dspam/dspam.d/pgsql.conf
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
#DEBHELPER#
exit 0
Added: trunk/debian/patches/add-config-dir.dpatch
==============================================================================
--- (empty file)
+++ trunk/debian/patches/add-config-dir.dpatch Fri Nov 11 10:25:16 2005
@@ -0,0 +1,169 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add-config-dir.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add config item include that include directories.
+
+ at DPATCH@
+diff -urNad dspam-3.6.0~/src/read_config.c dspam-3.6.0/src/read_config.c
+--- dspam-3.6.0~/src/read_config.c 2005-11-10 14:52:01.000000000 +0100
++++ dspam-3.6.0/src/read_config.c 2005-11-10 14:52:51.420078750 +0100
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <dirent.h>
+ #ifdef HAVE_STRINGS_H
+ #include <strings.h>
+ #endif
+@@ -41,6 +42,9 @@
+ #include "pref.h"
+ #include "util.h"
+
++long dirread(const char *path, config_t **attrib, long num_root);
++long fileread(const char *path, config_t **attrib, long num_root);
++
+ static char *next_normal_token(char **p)
+ {
+ char *start = *p;
+@@ -93,19 +97,53 @@
+ return NULL;
+ }
+
+-config_t read_config(const char *path) {
+- config_t attrib, ptr;
++// Read the files in the directory and pass it to fileread
++// or if it is a file, pass it to fileread.
++long dirread(const char *path, config_t **attrib, long num_root) {
++ DIR *dir_p;
++ char *fulldir;
++ struct dirent *dir_entry_p;
++ int n, m;
++
++ // Strip "\n"
++ char *ptr = strrchr(path, '\n');
++ if (ptr)
++ *ptr = '\0';
++
++ if ((dir_p = opendir(path))) {
++ while((dir_entry_p = readdir(dir_p)))
++ {
++ // We don't need the . and ..
++ if (strcmp(dir_entry_p->d_name, ".") == 0 ||
++ strcmp(dir_entry_p->d_name, "..") == 0)
++ continue;
++
++ n = strlen(dir_entry_p->d_name);
++ m = strlen(path);
++ fulldir = (char *)malloc(n+m+2);
++ strcpy(fulldir, (char *)path);
++ strcat(fulldir, "/");
++ strcat(fulldir, dir_entry_p->d_name);
++ num_root = fileread((const char *)fulldir, attrib, num_root);
++ }
++ closedir(dir_p);
++ } else {
++ // Could be a file.
++ return fileread((const char *)path, attrib, num_root);
++ }
++
++ return num_root;
++}
++
++// Read the file and check if there is an Include directive, if so then pass
++// it to dirread.
++long fileread(const char *path, config_t **attrib, long num_root) {
++ config_t ptr;
+ FILE *file;
+- long attrib_size = 128, num_root = 0;
++ long attrib_size = 128;
+ char buffer[1024];
+ char *a, *c, *v, *bufptr = buffer;
+
+- attrib = calloc(1, attrib_size*sizeof(attribute_t));
+- if (attrib == NULL) {
+- LOG(LOG_CRIT, ERR_MEM_ALLOC);
+- return NULL;
+- }
+-
+ if (path == NULL)
+ file = fopen(CONFIG_DEFAULT, "r");
+ else
+@@ -113,8 +151,8 @@
+
+ if (file == NULL) {
+ LOG(LOG_ERR, ERR_IO_FILE_OPEN, CONFIG_DEFAULT, strerror(errno));
+- free(attrib);
+- return NULL;
++ free(*attrib);
++ return num_root;
+ }
+
+ while(fgets(buffer, sizeof(buffer), file)!=NULL) {
+@@ -130,30 +168,48 @@
+ continue; /* Ignore whitespace-only lines */
+
+ while ((v = tokenize(NULL, &bufptr)) != NULL) {
+- if (_ds_find_attribute(attrib, a)!=NULL) {
+- _ds_add_attribute(attrib, a, v);
+- }
+- else {
+- num_root++;
+- if (num_root >= attrib_size) {
+- attrib_size *=2;
+- ptr = realloc(attrib, attrib_size*sizeof(attribute_t));
+- if (ptr)
+- attrib = ptr;
+- else
+- LOG(LOG_CRIT, ERR_MEM_ALLOC);
+- }
+- _ds_add_attribute(attrib, a, v);
++ // Check for include directive
++ if (strcmp(a, "Include") == 0) {
++ // Give v (value) to dirraed
++ num_root = dirread(v, attrib, num_root);
++ } else {
++ if (_ds_find_attribute((*attrib), a)!=NULL) {
++ _ds_add_attribute((*attrib), a, v);
++ }
++ else {
++ num_root++;
++ if (num_root >= attrib_size) {
++ attrib_size *=2;
++ ptr = realloc((*attrib), attrib_size*sizeof(attribute_t));
++ if (ptr)
++ *attrib = &ptr;
++ else
++ LOG(LOG_CRIT, ERR_MEM_ALLOC);
++ }
++ _ds_add_attribute((*attrib), a, v);
++ }
+ }
+ }
+ }
+
+ fclose(file);
+
+- ptr = realloc(attrib, ((num_root+1)*sizeof(attribute_t))+1);
+- if (ptr)
+- return ptr;
+- LOG(LOG_CRIT, ERR_MEM_ALLOC);
++ return num_root;
++}
++
++config_t read_config(const char *path) {
++ config_t *attrib;
++ long attrib_size = 128, num_root = 0;
++
++ attrib = calloc(1, attrib_size*sizeof(attribute_t));
++ if (attrib == NULL) {
++ LOG(LOG_CRIT, ERR_MEM_ALLOC);
++ return NULL;
++ }
++
++ if (fileread(path, &attrib, num_root) == 0)
++ return NULL;
++
+ return attrib;
+ }
+
Modified: trunk/debian/patches/update-dspam.conf.dpatch
==============================================================================
--- trunk/debian/patches/update-dspam.conf.dpatch (original)
+++ trunk/debian/patches/update-dspam.conf.dpatch Fri Nov 11 10:25:16 2005
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad dspam-3.6.0~/src/dspam.conf.in dspam-3.6.0/src/dspam.conf.in
---- dspam-3.6.0~/src/dspam.conf.in 2005-10-10 15:52:21.000000000 +0200
-+++ dspam-3.6.0/src/dspam.conf.in 2005-11-02 14:18:22.000000000 +0100
+--- dspam-3.6.0~/src/dspam.conf.in 2005-11-10 15:53:06.914293500 +0100
++++ dspam-3.6.0/src/dspam.conf.in 2005-11-10 15:53:27.015549750 +0100
@@ -222,7 +222,7 @@
# If user or default.prefs are found, the user's preferences will override any
# defaults.
@@ -18,22 +18,84 @@
Preference "signatureLocation=message" # 'message' or 'headers'
Preference "showFactors=on"
#Preference "spamAction=tag"
-@@ -249,12 +249,12 @@
- # Storage driver settings: Specific to a particular storage driver. Uncomment
- # the configuration specific to your installation, if applicable.
- #
+@@ -243,76 +243,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
-+#MySQLServer /var/run/mysqld/mysqld.sock
- #MySQLPort
- #MySQLUser dspam
- #MySQLPass changeme
- #MySQLDb dspam
+-#MySQLPort
+-#MySQLUser dspam
+-#MySQLPass changeme
+-#MySQLDb dspam
-#MySQLCompress true
-+#MySQLCompress false
+-
+-# 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
+-
+ # --- Oracle ---
- # Use this if you have the 4.1 quote bug (see doc/mysql.txt)
- #MySQLSupressQuote on
-@@ -511,7 +511,7 @@
+ #OraServer "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
+@@ -511,7 +441,7 @@
# users will be filtered unless a .nodspam file is dropped in
# /var/dspam/opt-out/user.nodspam
#
@@ -42,3 +104,11 @@
#
# TrackSources: specify which (if any) source addresses to track and report
+@@ -669,4 +599,7 @@
+ #
+ ProcessorBias on
+
++# Include a directory with configuration items.
++Include /etc/dspam/dspam.d/
++
+ ## EOF
More information about the Pkg-dspam-commits
mailing list