merge with base/masterHEADmaster

1 files changed, 7 insertions, 26 deletions

diff --git a/defconfig b/defconfig
index 3bbda18..34a1633 100644
--- a/defconfig
+++ b/defconfig
@@ -9,44 +9,25 @@
 # be modified from here. In most cases, these lines should use += in order not
 # to override previous values of the variables.
 
-# backend (select exactly one)
-#  dspam-exec		- direct dspam training by calling dspam executable
-#  signature-log	- signature logging using dovecot's dict API
-#  mailtrain		- send mail to special addresses for training
-#  crm114-exec		- direct crm114 training by calling mailreaver.crm
-#  spool2dir		- spool trained emails to a directory
-#BACKEND=dspam-exec
-#BACKEND=signature-log
-#BACKEND=mailtrain
-#BACKEND=crm114-exec
-#BACKEND=spool2dir
-
 # Dovecot build/header directory
 # Building the plugin requires configured dovecot sources or having
 # configured it with --enable-header-install in which case you can
 # point DOVECOT= to the installed headers too.
+# If unset, it defaults to /usr/include/dovecot which typically is the
+# right place so you don't have to worry about it.
 #DOVECOT=../dovecot-1.0.5
 #DOVECOT=../dovecot-1.1
-DOVECOT=/usr/include/dovecot
+#DOVECOT=/usr/include/dovecot
 
 # install directory for 'make install'
 # NB no need for a final '/'
 INSTALLDIR=/usr/lib/dovecot/modules/imap
-# The user and group for the installed plugin
-USER=root
-GROUP=root
-
-# enable debugging to syslog or stderr
-#DEBUG=stderr
-#DEBUG=syslog
-
-# verbose debugging (lots of output!)
-#DEBUG_VERBOSE=1
 
 # plugin name, change only if you need to rename the plugin
-# (because, for example, you need two instances for different
-# spam filters installed)
-PLUGINNAME=antispam
+# (for backward compatibility reasons, there no longer is a
+# need for this since backends can be configured dynamically).
+# If unset, defaults to "antispam" which is what you want.
+# PLUGINNAME=antispam
 
 # extra CFLAGS
 # CFLAGS += -g3