Hi,
This diff updates pyzor to the latest release 0.5.0.
Tested on amd64/sparc64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===
RCS file: /cvs/openbsd/ports/mail/pyzor/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile25 Mar 2009 13:39:40 - 1.4
+++ Makefile30 Sep 2009 21:18:05 -
@@ -2,12 +2,14 @@
COMMENT= collaborative, networked system to detect and block spam
-DISTNAME= pyzor-0.4.0
-PKGNAME= ${DISTNAME}p1
+MODPY_EGG_VERSION= 0.5.0
+DISTNAME= pyzor-${MODPY_EGG_VERSION}
CATEGORIES=mail net
HOMEPAGE= http://pyzor.sourceforge.net/
+MAINTAINER=Benoit Lecocq ben...@openbsd.org
+
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
@@ -18,6 +20,8 @@
EXTRACT_SUFX= .tar.bz2
MODULES= lang/python
+
+BUILD_DEPENDS += :python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm
NO_REGRESS=Yes
Index: distinfo
===
RCS file: /cvs/openbsd/ports/mail/pyzor/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo2 Sep 2008 12:33:17 - 1.1.1.1
+++ distinfo30 Sep 2009 21:18:05 -
@@ -1,5 +1,5 @@
-MD5 (pyzor-0.4.0.tar.bz2) = 7nr+TMnUGbzl8pJQoBxDdA==
-RMD160 (pyzor-0.4.0.tar.bz2) = 7cA8CEaVEohQ94jFdVS5Z9vO/Y4=
-SHA1 (pyzor-0.4.0.tar.bz2) = BXfSkSQKemZJLCtsu/Sf1e2vAv0=
-SHA256 (pyzor-0.4.0.tar.bz2) = J7V/SF7pSpizb12Fz38qYb3/NfxABZRv5TZ87QNb1DA=
-SIZE (pyzor-0.4.0.tar.bz2) = 41764
+MD5 (pyzor-0.5.0.tar.bz2) = IfXtkkcKsSp2WMxGv1mj6Q==
+RMD160 (pyzor-0.5.0.tar.bz2) = bwYT5Zzs/jkMxGAnFqxLe7QsjUU=
+SHA1 (pyzor-0.5.0.tar.bz2) = zrilfdOygcBuu2IRUSOmKdNI0/E=
+SHA256 (pyzor-0.5.0.tar.bz2) = K/PfnpFoYQY6c/e0bLiye6xvZh/OE2KAPennkh/BVbo=
+SIZE (pyzor-0.5.0.tar.bz2) = 40654
Index: patches/patch-lib_pyzor_client_py
===
RCS file: /cvs/openbsd/ports/mail/pyzor/patches/patch-lib_pyzor_client_py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-lib_pyzor_client_py
--- patches/patch-lib_pyzor_client_py 2 Sep 2008 12:33:17 - 1.1.1.1
+++ patches/patch-lib_pyzor_client_py 30 Sep 2009 21:18:05 -
@@ -1,477 +0,0 @@
-$OpenBSD: patch-lib_pyzor_client_py,v 1.1.1.1 2008/09/02 12:33:17 jasper Exp $
-
-- Allow pyzor to scan mailboxes. From Debian.
-- Handle unknown encodings. Even binary parts are handled now.
- Treat empty type as 'text'. From FreeBSD.
-
lib/pyzor/client.py.orig Tue Sep 2 12:48:16 2008
-+++ lib/pyzor/client.pyTue Sep 2 12:52:33 2008
-@@ -8,6 +8,7 @@ import cStringIO
- import getopt
- import tempfile
- import mimetools
-+import multifile
- import sha
-
- import pyzor
-@@ -58,11 +59,6 @@ class Client(object):
- self.send(msg, address)
- return self.read_response(msg.get_thread())
-
--def shutdown(self, address):
--msg = ShutdownRequest()
--self.send(msg, address)
--return self.read_response(msg.get_thread())
--
- def build_socket(self):
- self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-
-@@ -132,39 +128,50 @@ class ExecCall(object):
-
- def run(self):
- debug = 0
--(options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir='])
--if len(args) 1:
-- self.usage()
--
- specified_homedir = None
-+options = None
-+log = None
-+
-+try:
-+(options, args) = getopt.getopt(sys.argv[1:], 'd', ['homedir=',
'log'])
-+except getopt.GetoptError:
-+self.usage()
-
-+if len(args) 1:
-+self.usage()
-+
- for (o, v) in options:
- if o == '-d':
- debug = 1
--elif o == '-h':
-- self.usage()
- elif o == '--homedir':
- specified_homedir = v
-+elif o == '--log':
-+log = 1
-
- self.output = Output(debug=debug)
--
- homedir = pyzor.get_homedir(specified_homedir)
--
-+
-+if log:
-+sys.stderr = open(homedir + /pyzor.log, 'a')
-+sys.stderr.write(\npyzor[ + repr (os.getpid()) + ]:\n)
-+
- config = pyzor.Config(homedir)
- config.add_section('client')
-
--defaults = {'ServersFile': 'servers',
-+defaults = {'ServersFile':'servers',
- 'DiscoverServersURL': ServerList.inform_url,
--'AccountsFile' : 'accounts',
-+'AccountsFile': 'accounts',
-+'Timeout':str(Client.timeout),
- }
-
- for k, v in defaults.items():
- config.set('client', k, v)
--
-+
- config.read(os.path.join(homedir, 'config'))
-
-
