- Update to 1.6

PR:		ports/131694
Submitted by:	Milan Obuch <bsd@dino.sk> (maintainer)

13 files changed, 169 insertions, 166 deletions

diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index b90e097eb161..61504d37ae27 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-pythonfilter
-PORTVERSION=	0.18
+PORTVERSION=	1.6
 CATEGORIES=	mail python
 MASTER_SITES=	http://phantom.dragonsdawn.net/~gordon/courier-patches/courier-pythonfilter/
 
@@ -26,47 +26,65 @@ MAILGID=	465
 LOCALSTATEDIR=	/var/spool/courier
 SCRIPTSDIR=	${PREFIX}/libexec/filters
 
-OPTIONS=	DEBUG		"debug module"			on \
-		NODUPLICATES	"noduplicates module"		off \
-		CLAMAV		"clamav module"			off \
-		AUTO_WHITELIST	"auto_whitelist module"		off \
-		WHITELIST_RELAY	"whitelist_relayclients module"	on \
-		WHITELIST_AUTH	"whitelist_auth module"		on \
-		WHITELIST_BLOCK	"whitelist_block module"	off \
-		WHITELIST_DNSWL	"whitelist_dnswl module"	off \
-		WHITELIST_SPF	"whitelist_spf module"		off \
-		PRIVATEADDR	"privateaddr module"		off \
-		SPFCHECK	"spfcheck module"		off \
-		NOSUCCESSDSN	"nosuccessdsn module"		off \
-		COMEAGAIN	"comeagain module"		off \
-		GREYLIST	"greylist module"		off \
-		DIALBACK	"dialback module"		off \
-		RATELIMIT	"ratelimit module"		off \
-		ATTACHMENTS	"attachments module"		off
+OPTIONS=	DEBUG		"debug module"					on \
+		NODUPLICATES	"noduplicates module"				off \
+		CLAMAV_CLAMD	"clamav filter with py-pyclamd \ mutually"	off \
+		CLAMAV_LIB	"clamav filter with py-clamav  / exclusive"	off \
+		SPAMASSASSIN	"spamassassin module"				off \
+		AUTO_WHITELIST	"auto_whitelist module"				off \
+		WHITELIST_RELAY	"whitelist_relayclients module"			on \
+		WHITELIST_AUTH	"whitelist_auth module"				on \
+		WHITELIST_BLOCK	"whitelist_block module"			off \
+		WHITELIST_DNSWL	"whitelist_dnswl module"			off \
+		WHITELIST_SPF	"whitelist_spf module"				off \
+		DELIVEREDTO	"deliveredto module"				off \
+		PRIVATEADDR	"privateaddr module"				off \
+		SPFCHECK	"spfcheck module"				off \
+		NOSUCCESSDSN	"nosuccessdsn module"				off \
+		LOCALSENDERS	"localsenders module"				off \
+		COMEAGAIN	"comeagain module"				off \
+		GREYLIST	"greylist module"				off \
+		DIALBACK	"dialback module"				off \
+		RATELIMIT	"ratelimit module"				off \
+		ATTACHMENTS	"attachments module"				off \
+		QUOTA		"quota module"					off
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR}
 
-.if defined(WITH_CLAMAV)
+.if defined(WITH_CLAMAV_CLAMD) && !defined(WITH_CLAMAV_LIB)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd
+.endif
+
+.if defined(WITH_CLAMAV_LIB) && !defined(WITH_CLAMAV_CLAMD)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamav.so:${PORTSDIR}/security/py-clamav
 .endif
 
+.if defined(WITH_CLAMAV_CLAMD) && defined(WITH_CLAMAV_LIB)
+BROKEN= py-pyclamd and py-clamav dependencies are mutually exclusive. Run 'make config' to (re)configure ${PKGNAME}
+.endif
+
 post-extract:
 	${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample
+	${MV} ${WRKSRC}/pythonfilter-modules.conf ${WRKSRC}/pythonfilter-modules.conf.sample
 
 post-configure:
 	@${ECHO_MSG} Adding your OPTIONS to sample config file...
+	@${ECHO_MSG} >> ${WRKSRC}/pythonfilter.conf.sample
 .if !defined(WITHOUT_DEBUG)
 	@${ECHO_MSG} debug >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_NODUPLICATES)
 	@${ECHO_MSG} noduplicate >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if defined(WITH_CLAMAV)
+.if defined(WITH_CLAMAV_CLAMD) || defined(WITH_CLAMAV_LIB)
 	@${ECHO_MSG} clamav >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if !defined(WITHOUT_AUTO_WHITELIST)
+.if defined(WITH_SPAMASSASSIN)
+	@${ECHO_MSG} spamassassin >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
+.if defined(WITH_AUTO_WHITELIST)
 	@${ECHO_MSG} auto_whitelist >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if !defined(WITHOUT_WHITELIST_RELAY)
@@ -75,15 +93,18 @@ post-configure:
 .if !defined(WITHOUT_WHITELIST_AUTH)
 	@${ECHO_MSG} whitelist_auth >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if defined(WHITELIST_BLOCK)
+.if defined(WITH_WHITELIST_BLOCK)
 	@${ECHO_MSG} whitelist_block >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if defined(WHITELIST_DNSWL)
+.if defined(WITH_WHITELIST_DNSWL)
 	@${ECHO_MSG} whitelist_dnswl >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if defined(WHITELIST_SPF)
+.if defined(WITH_WHITELIST_SPF)
 	@${ECHO_MSG} whitelist_spf >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
+.if defined(WITH_DELIVEREDTO)
+	@${ECHO_MSG} deliveredto >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
 .if defined(WITH_PRIVATEADDR)
 	@${ECHO_MSG} privateaddr >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
@@ -93,6 +114,9 @@ post-configure:
 .if defined(WITH_NOSUCCESSDSN)
 	@${ECHO_MSG} nosuccessdsn >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
+.if defined(WITH_LOCALSENDERS)
+	@${ECHO_MSG} localsenders >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
 .if defined(WITH_COMEAGAIN)
 	@${ECHO_MSG} comeagain >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
@@ -112,6 +136,7 @@ post-configure:
 post-install:
 	${MKDIR} ${LOCALSTATEDIR}/pythonfilter
 	${CHOWN} ${MAILOWN}:${MAILGRP} ${LOCALSTATEDIR}/pythonfilter
-	if [ ! -e ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi
+	@if [ ! -f ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi
+	@if [ ! -f ${PREFIX}/etc/pythonfilter-modules.conf ]; then cp -p ${PREFIX}/etc/pythonfilter-modules.conf.sample ${PREFIX}/etc/pythonfilter-modules.conf; fi
 
 .include <bsd.port.post.mk>
diff --git a/mail/courier-pythonfilter/distinfo b/mail/courier-pythonfilter/distinfo
index d46f184f9419..20a97667c7b9 100644
--- a/mail/courier-pythonfilter/distinfo
+++ b/mail/courier-pythonfilter/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-pythonfilter-0.18.tar.gz) = dd245fa5e9cf31c4a52f0fc3dbc27342
-SHA256 (courier-pythonfilter-0.18.tar.gz) = d2bf1a355a606ee111895fee3041be5076ad944b5f21a696a5b3515d430552b5
-SIZE (courier-pythonfilter-0.18.tar.gz) = 40135
+MD5 (courier-pythonfilter-1.6.tar.gz) = 893204b430fef5621267fc6b23e728e4
+SHA256 (courier-pythonfilter-1.6.tar.gz) = 101bcbe8343eebdba3114808271919973169150688ea2d07778b5326b9d00f0c
+SIZE (courier-pythonfilter-1.6.tar.gz) = 70509
diff --git a/mail/courier-pythonfilter/files/patch-courier__authdaemon.py b/mail/courier-pythonfilter/files/patch-courier__authdaemon.py
new file mode 100644
index 000000000000..db914d2c0d47
--- /dev/null
+++ b/mail/courier-pythonfilter/files/patch-courier__authdaemon.py
@@ -0,0 +1,11 @@
+--- courier/authdaemon.py.orig	2008-12-30 11:49:35.000000000 +0100
++++ courier/authdaemon.py	2008-12-30 11:49:10.000000000 +0100
+@@ -23,7 +23,7 @@
+ import courier.config
+ 
+ 
+-socketPath = '/var/spool/authdaemon/socket'
++socketPath = '/var/run/authdaemond/socket'
+ _timeoutSock = 10
+ _timeoutWrite = 10
+ _timeoutRead = 30
diff --git a/mail/courier-pythonfilter/files/patch-courier__config.py b/mail/courier-pythonfilter/files/patch-courier__config.py
deleted file mode 100644
index ffba6426a7e4..000000000000
--- a/mail/courier-pythonfilter/files/patch-courier__config.py
+++ /dev/null
@@ -1,45 +0,0 @@
---- courier/config.py.orig	Fri Dec  1 18:59:03 2006
-+++ courier/config.py	Wed Dec 20 23:36:38 2006
-@@ -23,32 +23,11 @@
- import socket
- 
- 
--sysconf = '/etc/courier'
--prefix  = '/usr/lib/courier'
-+sysconf = '/usr/local/etc/courier'
-+prefix  = '/usr/local'
- spool   = '/var/spool/courier'
- 
- 
--def _setup():
--    sysconfs = ['/etc/courier', '/usr/lib/courier/etc']
--    prefixes = ['/usr/lib/courier']
--    spools = ['/var/lib/courier', '/var/spool/courier', '/usr/lib/courier/var/spool/courier']
--    global sysconf
--    global prefix
--    global spool
--    for x in sysconfs:
--        if os.path.isdir(x):
--            sysconf = x
--            break
--    for x in prefixes:
--        if os.path.isdir(x):
--            prefix = x
--            break
--    for x in spools:
--        if os.path.isdir(x):
--            spool = x
--            break
--
--
- def read1line(file):
-     try:
-         cfile = open(sysconf + '/' + file, 'r')
-@@ -283,7 +263,3 @@
- 
-     """
-     return getSmtpaccessVal('BLOCK', ip)
--
--
--# Call _setup to correct the module path values
--_setup()
diff --git a/mail/courier-pythonfilter/files/patch-courier__quarantine.py b/mail/courier-pythonfilter/files/patch-courier__quarantine.py
new file mode 100644
index 000000000000..521ef786b2dd
--- /dev/null
+++ b/mail/courier-pythonfilter/files/patch-courier__quarantine.py
@@ -0,0 +1,11 @@
+--- courier/quarantine.py.orig	2008-07-14 08:47:05.000000000 +0200
++++ courier/quarantine.py	2008-12-30 13:24:22.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ # Defaults:
+ config = {'siteid': 'local',
+-          'dir': '/var/lib/pythonfilter/quarantine',
++          'dir': '/var/spool/courier/pythonfilter/quarantine',
+           'days': 14,
+           'default': 1}
+ 
diff --git a/mail/courier-pythonfilter/files/patch-filters__TtlDb.py b/mail/courier-pythonfilter/files/patch-filters__TtlDb.py
deleted file mode 100644
index 0bbc50041dae..000000000000
--- a/mail/courier-pythonfilter/files/patch-filters__TtlDb.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- filters/TtlDb.py.orig	Tue Dec 19 21:12:26 2006
-+++ filters/TtlDb.py	Wed Dec 20 22:30:21 2006
-@@ -22,7 +22,7 @@
- import time
- 
- 
--_dbmDir = '/var/state/pythonfilter'
-+_dbmDir = '/var/spool/courier/pythonfilter'
- 
- 
- class TtlDbError(Exception):
diff --git a/mail/courier-pythonfilter/files/patch-filters__clamav.py b/mail/courier-pythonfilter/files/patch-filters__clamav.py
index 4603bea32ba3..87f95f66a314 100644
--- a/mail/courier-pythonfilter/files/patch-filters__clamav.py
+++ b/mail/courier-pythonfilter/files/patch-filters__clamav.py
@@ -1,18 +1,11 @@
---- filters/clamav.py.orig	Sat Dec 16 03:11:51 2006
-+++ filters/clamav.py	Sun Jan  7 10:56:30 2007
-@@ -31,13 +31,13 @@
-     except Exception, e:
-         return "554 " + str(e)
-     if avresult[0]:
--        return "554 %s was detected. Abort!" % avresult[1]
-+        return "554 Virus found - Signature is %s" % avresult[1]
-     return ''
+--- filters/clamav.py.orig	2008-03-23 09:06:04.000000000 +0100
++++ filters/clamav.py	2008-12-30 14:45:03.000000000 +0100
+@@ -22,7 +22,7 @@
+ import courier.config
+ import courier.quarantine
  
+-localSocket = ''
++localSocket = '/var/run/clamav/clamd.sock'
+ action = 'reject'
  
- if __name__ == '__main__':
-     # we only work with 1 parameter
-     if len(sys.argv) != 2:
--        print "Usage: attachment.py <message_body_file>"
-+        print "Usage: clamav.py <message_body_file>"
-         sys.exit(0)
-     print doFilter(sys.argv[1], "")
+ try:
diff --git a/mail/courier-pythonfilter/files/patch-filters__comeagain.py b/mail/courier-pythonfilter/files/patch-filters__comeagain.py
deleted file mode 100644
index f7b30e19d030..000000000000
--- a/mail/courier-pythonfilter/files/patch-filters__comeagain.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- filters/comeagain.py.orig	Tue Jan  2 22:02:12 2007
-+++ filters/comeagain.py	Sun Jan  7 12:35:20 2007
-@@ -89,11 +89,7 @@
-     if foundAll:
-         return ''
-     else:
--        return('421-Please send the message again.\n'
--               '421-This is not an indication of a problem:  We require\n'
--               '421-that any new sender retry their delivery as proof that\n'
--               '421-they are not spamware or virusware.\n'
--               '421 Thank you.')
-+        return('421 Please send the message again to proof you are not spamware or virusware.')
- 
- 
- if __name__ == '__main__':
-@@ -103,6 +99,6 @@
-     # recipient.  Run this script with the name of that file as an
-     # argument, and it'll validate that email address.
-     if not sys.argv[1:]:
--        print 'Use:  comeagain.py <control file>'
-+        print 'Use: comeagain.py <control file>'
-         sys.exit(1)
-     print doFilter('', sys.argv[1:])
diff --git a/mail/courier-pythonfilter/files/patch-filters__greylist.py b/mail/courier-pythonfilter/files/patch-filters__greylist.py
deleted file mode 100644
index 35c68ddc9900..000000000000
--- a/mail/courier-pythonfilter/files/patch-filters__greylist.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- filters/greylist.py.orig	Mon Dec 11 23:58:12 2006
-+++ filters/greylist.py	Mon Jan  1 21:00:42 2007
-@@ -51,7 +51,7 @@
-     sys.stderr.write(e.message)
-     sys.exit(1)
- 
--_whitelistDir = '/var/state/pythonfilter'
-+_whitelistDir = '/var/spool/courier/pythonfilter'
- try:
-     # messages which include these mail addresses either as sender or recipient
-     # should not be greylisted (could be your customer database)
diff --git a/mail/courier-pythonfilter/files/patch-pythonfilter-modules.conf.sample b/mail/courier-pythonfilter/files/patch-pythonfilter-modules.conf.sample
new file mode 100644
index 000000000000..bd34fa579c04
--- /dev/null
+++ b/mail/courier-pythonfilter/files/patch-pythonfilter-modules.conf.sample
@@ -0,0 +1,44 @@
+--- pythonfilter-modules.conf.sample.orig	2009-02-15 11:58:07.000000000 +0100
++++ pythonfilter-modules.conf.sample	2009-02-15 11:55:36.000000000 +0100
+@@ -1,5 +1,5 @@
+ # [add_signature.py]
+-# domains = {'': '/etc/courier/signatures/default'}
++# domains = {'': '/usr/local/etc/courier/signatures/default'}
+ 
+ # [attachments.py]
+ # blockedPattern = r'^.*\.(scr|exe|com|bat|pif|lnk|sys|mid|vb|js|ws|shs|ceo|cmd|cpl|hta|vbs)$'
+@@ -9,7 +9,7 @@
+ # whitelistPurgeInterval = 60 * 60 * 12
+ 
+ # [clamav.py]
+-# localSocket = '/tmp/clamd'
++# localSocket = '/var/run/clamav/clamd'
+ # action = 'quarantine'
+ 
+ # [comeagain.py]
+@@ -58,14 +58,14 @@
+ # dnswlZone = ['list.dnswl.org']
+ 
+ # [authdaemon.py]
+-# socketPath = '/var/spool/authdaemon/socket'
++# socketPath = '/var/run/authdaemond/socket'
+ 
+ [TtlDb]
+ # dbmType can be dbm (dbm file), psycopg2 (postgresql database),
+ # or mysql (mysql database)
+ type = 'dbm'
+ # The 'dbm' db type requires a dmbDir
+-dir = '/var/lib/pythonfilter'
++dir = '/var/spool/courier/pythonfilter'
+ # SQL db types require host, port, database name, username, and password
+ # host = 'localhost'
+ # port = '5432'
+@@ -75,7 +75,7 @@
+ 
+ [Quarantine]
+ siteid = '7d35f0b0-4a07-40a6-b513-f28bd50476d3'
+-dir = '/var/lib/pythonfilter/quarantine'
++dir = '/var/spool/courier/pythonfilter/quarantine'
+ days = 14
+ # notifyRecipient = 1
+ # alsoNotify = 'quarantinemgr@example.com'
diff --git a/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample b/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample
deleted file mode 100644
index 710811c3e4c8..000000000000
--- a/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample
+++ /dev/null
@@ -1,24 +0,0 @@
---- pythonfilter.conf.sample.orig	Thu Jan 18 01:49:55 2007
-+++ pythonfilter.conf.sample	Mon Jan 22 12:57:00 2007
-@@ -2,7 +2,7 @@
- # in this file.
- 
- # debug: prints debugging information to the mail log.
--debug
-+# debug
- 
- # noduplicates: checks for duplicate recipients which may occur due to alias
- #	expansion, and removes the duplicates.
-@@ -17,10 +17,10 @@
- 
- # whitelist_relayclients: exempts IP addresses for which you relay from
- #   further filtering.
--whitelist_relayclients
-+# whitelist_relayclients
- 
- # whitelist_auth: exempts users who authenticate from further filtering.
--whitelist_auth
-+# whitelist_auth
- 
- # whitelist_block: exempts IP addresses and networks which have an empty
- #  BLOCK value in smtpaccess.dat
diff --git a/mail/courier-pythonfilter/files/patch-setup.py b/mail/courier-pythonfilter/files/patch-setup.py
index b3d8cf26ec41..73bea13cfe78 100644
--- a/mail/courier-pythonfilter/files/patch-setup.py
+++ b/mail/courier-pythonfilter/files/patch-setup.py
@@ -1,9 +1,11 @@
---- setup.py.orig      Mon Mar 13 20:44:45 2006
-+++ setup.py   Wed Jul 26 21:21:34 2006
-@@ -15,5 +15,5 @@
-       scripts=['pythonfilter'],
+--- setup.py.orig	2009-01-03 06:18:54.000000000 +0100
++++ setup.py	2009-01-03 09:35:47.000000000 +0100
+@@ -15,6 +15,6 @@
+       scripts=['pythonfilter', 'pythonfilter-quarantine'],
        packages=['courier', 'pythonfilter'],
-       package_dir = {'pythonfilter': 'filters'},
--      data_files=[('/etc/', ['pythonfilter.conf'])]
-+      data_files=[('/usr/local/etc/', ['pythonfilter.conf.sample'])]
+       package_dir={'pythonfilter': 'filters'},
+-      data_files=[('/etc/', ['pythonfilter.conf',
+-                             'pythonfilter-modules.conf'])]
++      data_files=[('/usr/local/etc/', ['pythonfilter.conf.sample',
++                                       'pythonfilter-modules.conf.sample'])]
       )
diff --git a/mail/courier-pythonfilter/pkg-plist b/mail/courier-pythonfilter/pkg-plist
index dd6a6d803612..a6039fa290a5 100644
--- a/mail/courier-pythonfilter/pkg-plist
+++ b/mail/courier-pythonfilter/pkg-plist
@@ -1,16 +1,26 @@
 @unexec if cmp -s %D/etc/pythonfilter.conf %D/etc/pythonfilter.conf.sample; then rm -f %D/etc/pythonfilter.conf; fi
 etc/pythonfilter.conf.sample
-@exec if [ ! -e %D/etc/pythonfilter.conf ]; then cp -p %D/etc/pythonfilter.conf.sample %D/etc/pythonfilter.conf; fi
+@exec if [ ! -f %D/etc/pythonfilter.conf ]; then cp -p %D/etc/pythonfilter.conf.sample %D/etc/pythonfilter.conf; fi
+@unexec if cmp -s %D/etc/pythonfilter-modules.conf %D/etc/pythonfilter-modules.conf.sample; then rm -f %D/etc/pythonfilter-modules.conf; fi
+etc/pythonfilter-modules.conf.sample
+@exec if [ ! -f %D/etc/pythonfilter-modules.conf ]; then cp -p %D/etc/pythonfilter-modules.conf.sample %D/etc/pythonfilter-modules.conf; fi
 libexec/filters/pythonfilter
+libexec/filters/pythonfilter-quarantine
 %%PYTHON_SITELIBDIR%%/courier/__init__.py
 %%PYTHON_SITELIBDIR%%/courier/__init__.pyc
 %%PYTHON_SITELIBDIR%%/courier/__init__.pyo
+%%PYTHON_SITELIBDIR%%/courier/authdaemon.py
+%%PYTHON_SITELIBDIR%%/courier/authdaemon.pyc
+%%PYTHON_SITELIBDIR%%/courier/authdaemon.pyo
 %%PYTHON_SITELIBDIR%%/courier/config.py
 %%PYTHON_SITELIBDIR%%/courier/config.pyc
 %%PYTHON_SITELIBDIR%%/courier/config.pyo
 %%PYTHON_SITELIBDIR%%/courier/control.py
 %%PYTHON_SITELIBDIR%%/courier/control.pyc
 %%PYTHON_SITELIBDIR%%/courier/control.pyo
+%%PYTHON_SITELIBDIR%%/courier/quarantine.py
+%%PYTHON_SITELIBDIR%%/courier/quarantine.pyc
+%%PYTHON_SITELIBDIR%%/courier/quarantine.pyo
 %%PYTHON_SITELIBDIR%%/courier/xfilter.py
 %%PYTHON_SITELIBDIR%%/courier/xfilter.pyc
 %%PYTHON_SITELIBDIR%%/courier/xfilter.pyo
@@ -20,6 +30,9 @@ libexec/filters/pythonfilter
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/add_signature.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/add_signature.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/add_signature.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.pyo
@@ -35,24 +48,42 @@ libexec/filters/pythonfilter
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/deliveredto.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/deliveredto.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/deliveredto.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/dialback.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/dialback.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/dialback.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/greylist.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/greylist.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/greylist.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/localsenders.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/localsenders.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/localsenders.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/log_aliases.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/log_aliases.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/log_aliases.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/noduplicates.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/noduplicates.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/noduplicates.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/noreceivedheaders.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/noreceivedheaders.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/noreceivedheaders.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/nosuccessdsn.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/nosuccessdsn.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/nosuccessdsn.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/privateaddr.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/privateaddr.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/privateaddr.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/quota.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/quota.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/quota.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/ratelimit.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/ratelimit.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/ratelimit.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/spamassassin.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/spamassassin.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/spamassassin.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.pyo