Index: head/mail/courier-pythonfilter/Makefile
===================================================================
--- head/mail/courier-pythonfilter/Makefile	(revision 183555)
+++ head/mail/courier-pythonfilter/Makefile	(revision 183556)
@@ -1,105 +1,117 @@
 # New ports collection makefile for:	courier-pythonfilter
 # Date created:				Jun 19, 2006
 # Whom:					Milan Obuch
 #
 # $FreeBSD$
 #
 
 PORTNAME=	courier-pythonfilter
-PORTVERSION=	0.16
+PORTVERSION=	0.18
 CATEGORIES=	mail python
 MASTER_SITES=	http://phantom.dragonsdawn.net/~gordon/courier-patches/courier-pythonfilter/
 
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Framework for courier filter development in python
 
 BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 MAILOWN=	courier
 MAILGRP=	courier
 MAILUID=	465
 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	"whitelist module"		on \
+		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
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR}
 
 .if defined(WITH_CLAMAV)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamav.so:${PORTSDIR}/security/py-clamav
 .endif
 
 post-extract:
 	${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample
 
 post-configure:
-	@${ECHO_MSG} Creating sample config file based on your OPTIONS ...
+	@${ECHO_MSG} Adding your OPTIONS to sample config file...
 .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)
 	@${ECHO_MSG} clamav >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if !defined(WITHOUT_AUTO_WHITELIST)
 	@${ECHO_MSG} auto_whitelist >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if !defined(WITHOUT_WHITELIST)
-	@${ECHO_MSG} whitelist >> ${WRKSRC}/pythonfilter.conf.sample
+.if !defined(WITHOUT_WHITELIST_RELAY)
+	@${ECHO_MSG} whitelist_relayclients >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if !defined(WITHOUT_WHITELIST_AUTH)
 	@${ECHO_MSG} whitelist_auth >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
+.if defined(WHITELIST_BLOCK)
+	@${ECHO_MSG} whitelist_block >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
+.if defined(WHITELIST_DNSWL)
+	@${ECHO_MSG} whitelist_dnswl >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
+.if defined(WHITELIST_SPF)
+	@${ECHO_MSG} whitelist_spf >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
 .if defined(WITH_PRIVATEADDR)
 	@${ECHO_MSG} privateaddr >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_SPFCHECK)
 	@${ECHO_MSG} spfcheck >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_NOSUCCESSDSN)
 	@${ECHO_MSG} nosuccessdsn >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_COMEAGAIN)
 	@${ECHO_MSG} comeagain >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_GREYLIST)
 	@${ECHO_MSG} greylist >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_DIALBACK)
 	@${ECHO_MSG} dialback >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_RATELIMIT)
 	@${ECHO_MSG} ratelimit >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 .if defined(WITH_ATTACHMENTS)
 	@${ECHO_MSG} attachments >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
 
 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 [ ! -e ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/courier-pythonfilter/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/courier-pythonfilter/distinfo
===================================================================
--- head/mail/courier-pythonfilter/distinfo	(revision 183555)
+++ head/mail/courier-pythonfilter/distinfo	(revision 183556)
@@ -1,3 +1,3 @@
-MD5 (courier-pythonfilter-0.16.tar.gz) = 67998e92c107a1a55099c9c038084a32
-SHA256 (courier-pythonfilter-0.16.tar.gz) = d57c675bdcba52dea0fe7b29e8b39902703e05841a315fa2075b2d1ba0f75c14
-SIZE (courier-pythonfilter-0.16.tar.gz) = 33160
+MD5 (courier-pythonfilter-0.18.tar.gz) = dd245fa5e9cf31c4a52f0fc3dbc27342
+SHA256 (courier-pythonfilter-0.18.tar.gz) = d2bf1a355a606ee111895fee3041be5076ad944b5f21a696a5b3515d430552b5
+SIZE (courier-pythonfilter-0.18.tar.gz) = 40135

Property changes on: head/mail/courier-pythonfilter/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/courier-pythonfilter/files/patch-pythonfilter
===================================================================
--- head/mail/courier-pythonfilter/files/patch-pythonfilter	(revision 183555)
+++ head/mail/courier-pythonfilter/files/patch-pythonfilter	(revision 183556)
@@ -1,34 +1,34 @@
---- pythonfilter.orig	Fri Dec  1 19:59:03 2006
-+++ pythonfilter	Thu Dec 28 12:44:19 2006
+--- pythonfilter.orig	Tue Jan 23 17:30:50 2007
++++ pythonfilter	Thu Jan 25 19:34:11 2007
 @@ -71,17 +71,15 @@
  # First, locate and open the configuration file.
  config = None
  try:
 -    configDirs = ('/etc', '/usr/local/etc')
 -    for x in configDirs:
 -        if os.access('%s/pythonfilter.conf' % x, os.R_OK):
 -            config = open('%s/pythonfilter.conf' % x)
 -            break
 +    configDir = ('/usr/local/etc')
 +    if os.access('%s/pythonfilter.conf' % configDir, os.R_OK):
-+        config = open('%s/pythonfilter.conf' % configDir)
++            config = open('%s/pythonfilter.conf' % configDir)
  except IOError:
      sys.stderr.write('Could not open config file for reading.\n')
      sys.exit()
  if not config:
--    sys.stderr.write('Could not locate a configuration file in any of: %s\n',
+-    sys.stderr.write('Could not locate a configuration file in any of: %s\n' %
 -                     configDirs)
-+    sys.stderr.write('Could not locate a configuration file in %s\n',
++    sys.stderr.write('Could not locate a configuration file in %s\n' %
 +                     configDir)
      sys.exit()
  # Read the lines from the configuration file and load any module listed
  # therein.  Ignore lines that begin with a hash character.
 @@ -106,7 +104,7 @@
          sys.stderr.write('Failed to load "doFilter" '
                           'function from %s\n' %
                           moduleName)
 -        sys.stderr.write('Exception : %s:%s\n' %
 +        sys.stderr.write('Exception: %s:%s\n' %
                           (importError[0], importError[1]))
          sys.stderr.write(string.join(traceback.format_tb(importError[2]), ''))
  

Property changes on: head/mail/courier-pythonfilter/files/patch-pythonfilter
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample
===================================================================
--- head/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample	(revision 183555)
+++ head/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample	(revision 183556)
@@ -1,24 +1,24 @@
---- pythonfilter.conf.sample.orig	Tue Dec 12 07:18:58 2006
-+++ pythonfilter.conf.sample	Sun Jan 14 13:48:07 2007
+--- 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.
-@@ -16,10 +16,10 @@
- # auto_whitelist
+@@ -17,10 +17,10 @@
  
- # whitelist: exempts IP addresses for which you relay from further filtering.
--whitelist
-+# whitelist
+ # 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
  
- # privateaddr: restricts addresses to specific senders
- # privateaddr
+ # whitelist_block: exempts IP addresses and networks which have an empty
+ #  BLOCK value in smtpaccess.dat

Property changes on: head/mail/courier-pythonfilter/files/patch-pythonfilter.conf.sample
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/courier-pythonfilter/pkg-plist
===================================================================
--- head/mail/courier-pythonfilter/pkg-plist	(revision 183555)
+++ head/mail/courier-pythonfilter/pkg-plist	(revision 183556)
@@ -1,65 +1,75 @@
 @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
 libexec/filters/pythonfilter
 %%PYTHON_SITELIBDIR%%/courier/__init__.py
 %%PYTHON_SITELIBDIR%%/courier/__init__.pyc
 %%PYTHON_SITELIBDIR%%/courier/__init__.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/xfilter.py
 %%PYTHON_SITELIBDIR%%/courier/xfilter.pyc
 %%PYTHON_SITELIBDIR%%/courier/xfilter.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/__init__.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/TtlDb.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/attachments.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/auto_whitelist.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/auto_whitelist.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/auto_whitelist.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/clamav.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/clamav.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/clamav.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/comeagain.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/comeagain.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/comeagain.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/debug.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/noduplicates.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/noduplicates.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/noduplicates.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/ratelimit.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/ratelimit.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/ratelimit.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/spfcheck.pyo
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_auth.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_auth.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_auth.pyo
-%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist.py
-%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist.pyc
-%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_block.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_block.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_block.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_dnswl.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_dnswl.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_dnswl.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_relayclients.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_relayclients.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_relayclients.pyo
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.py
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyc
+%%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/courier
 @dirrm %%PYTHON_SITELIBDIR%%/pythonfilter

Property changes on: head/mail/courier-pythonfilter/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property