From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 26 10:30:30 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D51D416A406 for ; Fri, 26 Jan 2007 10:30:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id B90CE13C48C for ; Fri, 26 Jan 2007 10:30:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0QAUUPT029029 for ; Fri, 26 Jan 2007 10:30:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0QAUUnd029019; Fri, 26 Jan 2007 10:30:30 GMT (envelope-from gnats) Resent-Date: Fri, 26 Jan 2007 10:30:30 GMT Resent-Message-Id: <200701261030.l0QAUUnd029019@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Milan Obuch Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B204716A401 for ; Fri, 26 Jan 2007 10:21:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 98AA813C48A for ; Fri, 26 Jan 2007 10:21:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l0QALVDa080838 for ; Fri, 26 Jan 2007 10:21:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l0QALUKJ080837; Fri, 26 Jan 2007 10:21:31 GMT (envelope-from nobody) Message-Id: <200701261021.l0QALUKJ080837@www.freebsd.org> Date: Fri, 26 Jan 2007 10:21:31 GMT From: Milan Obuch To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/108370: [maintainer upgrade] mail/courier-pythonfilter 0.18 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2007 10:30:30 -0000 >Number: 108370 >Category: ports >Synopsis: [maintainer upgrade] mail/courier-pythonfilter 0.18 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 26 10:30:29 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Milan Obuch >Release: 6.2-STABLE or 6.2-PRERELEASE, mostly >Organization: >Environment: FreeBSD mail.netlab.sk 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Mon Jan 15 15:56:07 CET 2007 root@test.netlab.sk:/usr/obj/usr/src/sys/GENERIC amd64 >Description: New versions are coming fast Small pkg-plist fix New OPTIONS for new modules >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN courier-pythonfilter.old/Makefile courier-pythonfilter/Makefile --- courier-pythonfilter.old/Makefile Tue Jan 16 11:28:15 2007 +++ courier-pythonfilter/Makefile Thu Jan 25 19:02:14 2007 @@ -2,11 +2,11 @@ # Date created: Jun 19, 2006 # Whom: Milan Obuch # -# $FreeBSD: ports/mail/courier-pythonfilter/Makefile,v 1.2 2007/01/16 10:28:15 itetcu Exp $ +# $FreeBSD: ports/mail/courier-pythonfilter/Makefile,v 1.1 2006/10/04 23:28:42 alepulver Exp $ # PORTNAME= courier-pythonfilter -PORTVERSION= 0.16 +PORTVERSION= 0.18 CATEGORIES= mail python MASTER_SITES= http://phantom.dragonsdawn.net/~gordon/courier-patches/courier-pythonfilter/ @@ -30,8 +30,11 @@ 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 \ @@ -53,7 +56,7 @@ ${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 @@ -66,12 +69,21 @@ .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 @@ -100,6 +112,6 @@ 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 diff -urN courier-pythonfilter.old/distinfo courier-pythonfilter/distinfo --- courier-pythonfilter.old/distinfo Fri Jan 5 23:37:27 2007 +++ courier-pythonfilter/distinfo Thu Jan 25 19:02:30 2007 @@ -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 diff -urN courier-pythonfilter.old/files/patch-pythonfilter courier-pythonfilter/files/patch-pythonfilter --- courier-pythonfilter.old/files/patch-pythonfilter Mon Jan 1 18:40:17 2007 +++ courier-pythonfilter/files/patch-pythonfilter Thu Jan 25 19:34:28 2007 @@ -1,5 +1,5 @@ ---- 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 @@ -11,14 +11,14 @@ - 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 diff -urN courier-pythonfilter.old/files/patch-pythonfilter.conf.sample courier-pythonfilter/files/patch-pythonfilter.conf.sample --- courier-pythonfilter.old/files/patch-pythonfilter.conf.sample Tue Jan 16 11:28:15 2007 +++ courier-pythonfilter/files/patch-pythonfilter.conf.sample Mon Jan 22 12:58:03 2007 @@ -1,5 +1,5 @@ ---- 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. @@ -9,16 +9,16 @@ # 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 diff -urN courier-pythonfilter.old/files/patch-setup.py.orig courier-pythonfilter/files/patch-setup.py.orig --- courier-pythonfilter.old/files/patch-setup.py.orig Thu Jan 1 01:00:00 1970 +++ courier-pythonfilter/files/patch-setup.py.orig Thu Oct 5 01:28:43 2006 @@ -0,0 +1,9 @@ +--- 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'], + packages=['courier', 'pythonfilter'], + package_dir = {'pythonfilter': 'filters'}, +- data_files=[('/etc/', ['pythonfilter.conf'])] ++ data_files=[('/usr/local/etc/', ['pythonfilter.conf'])] + ) diff -urN courier-pythonfilter.old/pkg-plist courier-pythonfilter/pkg-plist --- courier-pythonfilter.old/pkg-plist Tue Jan 16 11:28:15 2007 +++ courier-pythonfilter/pkg-plist Mon Jan 22 13:08:11 2007 @@ -1,5 +1,6 @@ @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 @@ -58,8 +59,17 @@ %%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 >Release-Note: >Audit-Trail: >Unformatted: