ports/157744: security/py-pyclamd maintainer update

[Milan Obuch]

On Fri, 10 Jun 2011 19:40:08 GMT
FreeBSD-gnats-submit at FreeBSD.org wrote:

> Thank you very much for your problem report.
> It has the internal identification `ports/157744'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs. 
> 
> You can access the state of your problem report at any time
> via this link:
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=157744
> 
> >Category:       ports
> >Responsible:    freebsd-ports-bugs
> >Synopsis:       security/py-pyclamd maintainer update
> >Arrival-Date:   Fri Jun 10 19:40:08 UTC 2011

There is small error in patch, please use fixed one (attached).

Milan
-------------- next part --------------
diff -urN py-pyclamd.old/Makefile py-pyclamd/Makefile
--- py-pyclamd.old/Makefile	2009-02-15 00:32:14.000000000 +0100
+++ py-pyclamd/Makefile	2011-01-26 20:23:31.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pyclamd
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.2
 CATEGORIES=	security python
 MASTER_SITES=	http://xael.org/norman/python/pyclamd/
 DISTFILES=	pyclamd.py
diff -urN py-pyclamd.old/distinfo py-pyclamd/distinfo
--- py-pyclamd.old/distinfo	2009-02-15 00:29:44.000000000 +0100
+++ py-pyclamd/distinfo	2011-01-26 11:54:50.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (pyclamd.py) = fcdc195401e8c78a0d19ee6b8c23fdcb
-SHA256 (pyclamd.py) = 3542cc2271c8365a4205c563705a9f3090dca3f6242524119cb6560b7bbfcbaf
-SIZE (pyclamd.py) = 10498
+SHA256 (pyclamd.py) = 209673f947ce16d53bab43c19bfb8200f8b40cc70b26d4dbc9a0e203c561d16e
+SIZE (pyclamd.py) = 13101
diff -urN py-pyclamd.old/files/patch-pyclamd.py py-pyclamd/files/patch-pyclamd.py
--- py-pyclamd.old/files/patch-pyclamd.py	2009-01-10 00:24:06.000000000 +0100
+++ py-pyclamd/files/patch-pyclamd.py	2011-01-26 20:15:04.000000000 +0100
@@ -1,38 +1,38 @@
---- pyclamd.py.orig	2007-04-11 18:10:26.000000000 +0200
-+++ pyclamd.py	2007-08-28 11:28:48.000000000 +0200
-@@ -14,7 +14,7 @@
-     # Network
-     pyclamd.init_network_socket('localhost', 3310)
-     # Unix local socket 
--    #pyclamd.init_unix_socket('/var/run/clamd')
-+    #pyclamd.init_unix_socket('/var/run/clamav/clamd')
+--- pyclamd.py.orig	2011-01-26 20:08:38.000000000 +0100
++++ pyclamd.py	2011-01-26 20:14:58.000000000 +0100
+@@ -51,7 +51,7 @@
+ 	# Network
+ 	pyclamd.init_network_socket('localhost', 3310)
+ 	# Unix local socket 
+-	#pyclamd.init_unix_socket('/var/run/clamd')
++	#pyclamd.init_unix_socket('/var/run/clamav/clamd.sock')
  
-     # Get Clamscan version
-     print pyclamd.version()
-@@ -29,7 +29,7 @@
+ 	# Get Clamscan version
+ 	print pyclamd.version()
+@@ -66,7 +66,7 @@
  Test strings :
  ^^^^^^^^^^^^
  >>> try:
--...     init_unix_socket('/var/run/clamd')
-+...     init_unix_socket('/var/run/clamav/clamd')
+-...	 init_unix_socket('/var/run/clamav/clamd.ctl')
++...	 init_unix_socket('/var/run/clamav/clamd.sock')
  ... except ScanError:
- ...     init_network_socket('localhost', 3310)
+ ...	 init_network_socket('localhost', 3310)
  ... 
-@@ -68,7 +68,7 @@
+@@ -110,7 +110,7 @@
  
  # Default values for globals
  use_socket = None
--clamd_SOCKET = "/var/run/clamd"
-+clamd_SOCKET = "/var/run/clamav/clamd"
- clamd_HOST='127.0.0.1'
- clamd_PORT=3310
+-clamd_SOCKET = "/var/run/clamav/clamd.ctl"
++clamd_SOCKET = "/var/run/clamav/clamd.sock"
+ clamd_HOST = '127.0.0.1'
+ clamd_PORT = 3310
+ clamd_timeout = None	#[PL] default timeout for sockets: None = blocking operations
+@@ -121,7 +121,7 @@
  
-@@ -85,7 +85,7 @@
-             
  ############################################################################
  
--def init_unix_socket(filename="/var/run/clamd"):
-+def init_unix_socket(filename="/var/run/clamav/clamd"):
-     """
-     Init pyclamd to use clamd unix local socket 
-     
+-def init_unix_socket(filename="/var/run/clamav/clamd.ctl"):
++def init_unix_socket(filename="/var/run/clamav/clamd.sock"):
+ 	"""
+ 	Init pyclamd to use clamd unix local socket 
+ 	
diff -urN py-pyclamd.old/files/patch-setup.py py-pyclamd/files/patch-setup.py
--- py-pyclamd.old/files/patch-setup.py	2009-01-10 00:24:06.000000000 +0100
+++ py-pyclamd/files/patch-setup.py	2011-06-10 23:19:01.000000000 +0200
@@ -9,7 +9,7 @@
 +from distutils.core import setup
 +
 +setup(name="pyclamd",
-+      version="0.1.1",
++      version="0.2.2",
 +      description="Python ClamD module.",
 +      author="Alexandre Norman",
 +      author_email="norman at xael.org",