[Pkg-dspam-commits] [pkg-dspam-commits] r219 - in branches/experimental/debian: . config patches
Julien Valroff
julien-guest at alioth.debian.org
Sat Dec 19 11:30:47 UTC 2009
Author: julien-guest
Date: Sat Dec 19 11:30:46 2009
New Revision: 219
Log:
Added explicit syslog support, move extlookup conf stuff to separate file
Added:
branches/experimental/debian/config/extlookup.conf
Modified:
branches/experimental/debian/changelog
branches/experimental/debian/dspam.install
branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
branches/experimental/debian/patches/003_update-dspam.conf.diff
branches/experimental/debian/patches/006_clean-manpages.diff
branches/experimental/debian/rules
Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/changelog Sat Dec 19 11:30:46 2009 (r219)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2-1) experimental; urgency=low
+dspam (3.9.0~rc2-1) experimtental; urgency=low
[ Kurt B. Kaiser ]
* debian/rules: don't use --build config option if host equals target.
Added: branches/experimental/debian/config/extlookup.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/debian/config/extlookup.conf Sat Dec 19 11:30:46 2009 (r219)
@@ -0,0 +1,40 @@
+# -- ExtLookup --
+
+# ExtLookup: Prefrom various external lookup functions depending on user-
+# defined variables. ExtLookup can either be set to 'on' or 'off'. The
+# behavior of such lookups are defined by the use of ExtLookupMode, which
+# can be set to 'verify', 'map' and 'strict'.
+#
+# verify Will cause dspam to validate the user, prior to
+# creating the user entry in the system.
+#
+# map Will cause dspam to try to map the user address
+# to a certain unique identifier.
+#
+# strict Will cause dspam to enforce both 'verify' and 'map'.
+#
+# ExtLookupDriver will set the engine behind the lookups. For now the only
+# supported mechanisms are 'ldap' and 'program'. The first will make dspam
+# talk directly to the configured LDAP server. The second will prefrom the
+# various lookup functions by running a certain binary program or executable
+# script. The program MUST be a binary executable or a script with a well
+# defined interperter in its first line ( #!/path/to/interperter ). There
+# are plans to support TLS/SSL connections to backend databases.
+#
+#ExtLookup on # Turns on/off external lookup
+#ExtLookupMode strict # available modes are 'verify', 'map' and 'strict'.
+ # 'strict' enforces both verify and map
+#ExtLookupDriver ldap # Currently only ldap and program are supported.
+ # There are plans to support both MySQL and Postgres.
+#ExtLookupServer ldap.domain.com # Can either be a database hostname or the full path to
+ # an executable lookup program and its arguments.
+#ExtLookupPort 389 # Desired port when connecting to the lookup database.
+#ExtLookupDB "ou=Users,dc=domain,dc=com" # Can either be an LDAP search base or a database name (TODO).
+#ExtLookupQuery "(&(objectClass=qmailUser)(|(mail=%u)(mailAlternateAddress=%u)))" # Can either be an LDAP search filter or an SQL query (TODO)
+#ExtLookupLDAPAttribute "mail" # Attribute to be used when ExtLookupDriver is 'ldap'
+ # and ExtLookupMode 'map' or 'strict'
+#ExtLookupLDAPScope sub # Can be set to 'base', 'sub' or 'one'. Only used when ExtLookupDriver is 'ldap'.
+#ExtLookupLDAPVersion 3 # Sets the LDAP protocol version (1, 2 or 3)
+#ExtLookupLogin "cn=admin,dc=domain,dc=com" # Login to be used when connecting to any direct database backend.
+#ExtLookupPassword itsasecret # Password to use with ExtLookupLogin.
+#ExtLookupCrypto tls # Sets the use of TLS on backend communication (only compatible with LDAPv3)
Modified: branches/experimental/debian/dspam.install
==============================================================================
--- branches/experimental/debian/dspam.install Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/dspam.install Sat Dec 19 11:30:46 2009 (r219)
@@ -2,6 +2,7 @@
debian/tmp/etc/dspam/* etc/dspam/
webui/cgi-bin/default.prefs etc/dspam/
debian/config/hash.conf etc/dspam/dspam.d/
+debian/config/extlookup.conf etc/dspam/dspam.d/
debian/tmp/usr/bin/dspam_2sql usr/bin/
debian/tmp/usr/bin/dspamc usr/bin/
debian/tmp/usr/bin/dspam_train usr/bin/
Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff Sat Dec 19 11:30:46 2009 (r219)
@@ -159,7 +159,7 @@
# Default DSPAM display
#$CONFIG{'DATE_FORMAT'} = "%d.%m.%Y %H:%M"; # Date format in strftime style
-@@ -45,7 +45,7 @@
+@@ -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
@@ -167,18 +167,9 @@
+$CONFIG{'OPTMODE'} = "IN"; # OUT=OptOut IN=OptIn NONE=not selectable
$CONFIG{'LOCAL_DOMAIN'} = "localhost";
- # Add customized settings below
-@@ -54,11 +54,11 @@
+-# Add customized settings below
+-$CONFIG{'LOCAL_DOMAIN'} = "yourdomain.com";
+-
$ENV{'PATH'} = "$ENV{'PATH'}:$CONFIG{'DSPAM_BIN'}";
# Autodetect filesystem layout and preference options
--$CONFIG{'AUTODETECT'} = 1;
-+$CONFIG{'AUTODETECT'} = 0;
-
- # 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{'AUTODETECT'} = 1;
- #$CONFIG{'LARGE_SCALE'} = 0;
- #$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 Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/patches/003_update-dspam.conf.diff Sat Dec 19 11:30:46 2009 (r219)
@@ -27,7 +27,7 @@
Preference "spamSubject=[SPAM]" # { string } -> default:[SPAM]
Preference "statisticalSedation=5" # { 0 - 10 } -> default:0
Preference "enableBNR=on" # { on | off } -> default:off
-@@ -324,180 +323,6 @@
+@@ -324,222 +323,6 @@
AllowOverride whitelistThreshold
AllowOverride dailyQuarantineSummary
@@ -205,10 +205,52 @@
-HashConnectionCache 10
-
-
- # -- ExtLookup --
+-# -- ExtLookup --
+-
+-# ExtLookup: Prefrom various external lookup functions depending on user-
+-# defined variables. ExtLookup can either be set to 'on' or 'off'. The
+-# behavior of such lookups are defined by the use of ExtLookupMode, which
+-# can be set to 'verify', 'map' and 'strict'.
+-#
+-# verify Will cause dspam to validate the user, prior to
+-# creating the user entry in the system.
+-#
+-# map Will cause dspam to try to map the user address
+-# to a certain unique identifier.
+-#
+-# strict Will cause dspam to enforce both 'verify' and 'map'.
+-#
+-# ExtLookupDriver will set the engine behind the lookups. For now the only
+-# supported mechanisms are 'ldap' and 'program'. The first will make dspam
+-# talk directly to the configured LDAP server. The second will prefrom the
+-# various lookup functions by running a certain binary program or executable
+-# script. The program MUST be a binary executable or a script with a well
+-# defined interperter in its first line ( #!/path/to/interperter ). There
+-# are plans to support TLS/SSL connections to backend databases.
+-#
+-#ExtLookup on # Turns on/off external lookup
+-#ExtLookupMode strict # available modes are 'verify', 'map' and 'strict'.
+- # 'strict' enforces both verify and map
+-#ExtLookupDriver ldap # Currently only ldap and program are supported.
+- # There are plans to support both MySQL and Postgres.
+-#ExtLookupServer ldap.domain.com # Can either be a database hostname or the full path to
+- # an executable lookup program and its arguments.
+-#ExtLookupPort 389 # Desired port when connecting to the lookup database.
+-#ExtLookupDB "ou=Users,dc=domain,dc=com" # Can either be an LDAP search base or a database name (TODO).
+-#ExtLookupQuery "(&(objectClass=qmailUser)(|(mail=%u)(mailAlternateAddress=%u)))" # Can either be an LDAP search filter or an SQL query (TODO)
+-#ExtLookupLDAPAttribute "mail" # Attribute to be used when ExtLookupDriver is 'ldap'
+- # and ExtLookupMode 'map' or 'strict'
+-#ExtLookupLDAPScope sub # Can be set to 'base', 'sub' or 'one'. Only used when ExtLookupDriver is 'ldap'.
+-#ExtLookupLDAPVersion 3 # Sets the LDAP protocol version (1, 2 or 3)
+-#ExtLookupLogin "cn=admin,dc=domain,dc=com" # Login to be used when connecting to any direct database backend.
+-#ExtLookupPassword itsasecret # Password to use with ExtLookupLogin.
+-#ExtLookupCrypto tls # Sets the use of TLS on backend communication (only compatible with LDAPv3)
+-
+-
+ # -- Profiles --
- # ExtLookup: Prefrom various external lookup functions depending on user-
-@@ -691,7 +516,7 @@
+ #
+@@ -691,7 +474,7 @@
# users will be filtered unless a .nodspam file is dropped in
# /var/dspam/opt-out/user.nodspam
#
@@ -217,7 +259,7 @@
#
# TrackSources: specify which (if any) source addresses to track and report
-@@ -778,7 +603,7 @@
+@@ -778,7 +561,7 @@
#ServerHost 127.0.0.1
#ServerPort 24
#ServerQueueSize 32
@@ -226,7 +268,7 @@
#
# ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -814,14 +639,14 @@
+@@ -814,14 +597,14 @@
# you are running the client and server on the same machine, as it eliminates
# much of the bandwidth overhead.
#
@@ -243,7 +285,7 @@
#ClientIdent "secret at Relay1"
#
#ClientHost 127.0.0.1
-@@ -868,4 +693,7 @@
+@@ -868,4 +651,7 @@
#
StripRcptDomain off
Modified: branches/experimental/debian/patches/006_clean-manpages.diff
==============================================================================
--- branches/experimental/debian/patches/006_clean-manpages.diff Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/patches/006_clean-manpages.diff Sat Dec 19 11:30:46 2009 (r219)
@@ -22,6 +22,15 @@
in the message, and will use the signature to recall the original training metadata.
If the signature is not present, the message will be rejected. In this source mode,
DSPAM will also decrement each token's previous classification's count as well as
+@@ -349,7 +349,7 @@
+ will be configured to deliver via LMTP or SMTP, this flag may be used to define the
+ RCPT TOs which will be used for the delivery of each user specified with
+ .B \--user
+-. If no recipients are provided, the RCPT TOs will match the username.
++If no recipients are provided, the RCPT TOs will match the username.
+
+ .B NOTE
+ : The recipient list should always be balanced with the user list, or empty.
--- a/man/dspam_clean.1
+++ b/man/dspam_clean.1
@@ -57,7 +57,7 @@
@@ -42,6 +51,15 @@
.TP
.BI \-u\fR\c
Deletes all unused tokens from a user's dataset. Four different life values
+@@ -89,7 +89,7 @@
+ where each number represents the respective life. Specifying a life of zero
+ will delete all unused tokens in the category.
+
+-.n 3
++.ne 3
+ .TP
+ .BI \ user1\ user2\ ...\ userN\fR\c
+ Specify the username(s) to perform the selected maintenance operations on. If
--- a/man/dspam_train.1
+++ b/man/dspam_train.1
@@ -49,12 +49,12 @@
Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules Fri Dec 18 18:59:32 2009 (r218)
+++ branches/experimental/debian/rules Sat Dec 19 11:30:46 2009 (r219)
@@ -31,6 +31,7 @@
--enable-split-configuration \
--enable-static \
--enable-external-lookup \
+ --enable-syslog \
--with-logdir=/var/log/dspam/ \
--localstatedir=/var \
--libexecdir=/usr/lib/dspam \
More information about the Pkg-dspam-commits
mailing list