Attachment #172589 for bug #211125




# Created by: Milan Obuch
# $FreeBSD$

PORTNAME=	pyClamd
PORTVERSION=	0.3.17
CATEGORIES=	security python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	bsd@dino.sk
COMMENT=	Python ClamD interface module

LICENSE=	LGPL3+
USE_PYTHON=	distutils autoplist

.include <bsd.port.pre.mk>

NO_ARCH=	yes
USES=	python
USE_PYTHON=	distutils autoplist
	@${MKDIR} ${WRKDIR}/${PKGNAME}
	if ! (cd ${WRKDIR} && ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PKGNAME}/); \
	then \
		exit 1; \
	fi; \

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (pyclamd.py) = 209673f947ce16d53bab43c19bfb8200f8b40cc70b26d4dbc9a0e203c561d16e	1	TIMESTAMP = 1468687659
2	SIZE (pyclamd.py) = 13101	2	SHA256 (pyClamd-0.3.17.tar.gz) = 9921a582c45baa34dabb357c548c5ed331b9a39334881b3a784b593680b07ba0
		3	SIZE (pyClamd-0.3.17.tar.gz) = 10737




--- 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()
@@ -66,7 +66,7 @@
 Test strings :
 ^^^^^^^^^^^^
 >>> try:
-...	 init_unix_socket('/var/run/clamav/clamd.ctl')
+...	 init_unix_socket('/var/run/clamav/clamd.sock')
 ... except ScanError:
 ...	 init_network_socket('localhost', 3310)
 ... 
@@ -110,7 +110,7 @@
 
 # Default values for globals
 use_socket = None
-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 @@
 
 ############################################################################
 
-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 
 	




--- setup.py.orig	2009-01-07 13:42:10.000000000 +0100
+++ setup.py	2009-01-07 13:42:27.000000000 +0100
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+
+import glob
+import os
+import sys
+from distutils.core import setup
+
+setup(name="pyclamd",
+      version="0.2.2",
+      description="Python ClamD module.",
+      author="Alexandre Norman",
+      author_email="norman@xael.org",
+      url="http://xael.org/norman/python/pyclamd/",
+      license="GPL",
+      packages=['']
+     )

Return to bug 211125

Lines 1-27 Link Here

(-)Makefile (-17 / +9 lines)
1	# Created by: Milan Obuch	1	# Created by: Milan Obuch
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pyclamd	4	PORTNAME= pyClamd
5	PORTVERSION= 0.2.2	5	PORTVERSION= 0.3.17
6	CATEGORIES= security python	6	CATEGORIES= security python
7	MASTER_SITES= http://xael.org/norman/python/pyclamd/	7	MASTER_SITES= CHEESESHOP
8	DISTFILES= pyclamd.py	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9
10	MAINTAINER= bsd@dino.sk	10	MAINTAINER= bsd@dino.sk
11	COMMENT= Python ClamD interface module	11	COMMENT= Python ClamD interface module
12		12
13	USES= python	13	LICENSE= LGPL3+
14	USE_PYTHON= distutils autoplist
15
16	.include <bsd.port.pre.mk>
17		14
18	do-extract:	15	NO_ARCH= yes
19	@${RM} -rf ${WRKDIR}	16	USES= python
20	@${MKDIR} ${WRKDIR}	17	USE_PYTHON= distutils autoplist
21	@${MKDIR} ${WRKDIR}/${PKGNAME}
22	if ! (cd ${WRKDIR} && ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PKGNAME}/); \
23	then \
24	exit 1; \
25	fi; \
26		18
27	.include <bsd.port.post.mk>	19	.include <bsd.port.mk>

Lines 1-38 Link Here

(-)files/patch-pyclamd.py (-38 lines)
1	--- pyclamd.py.orig 2011-01-26 20:08:38.000000000 +0100
2	+++ pyclamd.py 2011-01-26 20:14:58.000000000 +0100
3	@@ -51,7 +51,7 @@
4	# Network
5	pyclamd.init_network_socket('localhost', 3310)
6	# Unix local socket
7	- #pyclamd.init_unix_socket('/var/run/clamd')
8	+ #pyclamd.init_unix_socket('/var/run/clamav/clamd.sock')
9
10	# Get Clamscan version
11	print pyclamd.version()
12	@@ -66,7 +66,7 @@
13	Test strings :
14	^^^^^^^^^^^^
15	>>> try:
16	-... init_unix_socket('/var/run/clamav/clamd.ctl')
17	+... init_unix_socket('/var/run/clamav/clamd.sock')
18	... except ScanError:
19	... init_network_socket('localhost', 3310)
20	...
21	@@ -110,7 +110,7 @@
22
23	# Default values for globals
24	use_socket = None
25	-clamd_SOCKET = "/var/run/clamav/clamd.ctl"
26	+clamd_SOCKET = "/var/run/clamav/clamd.sock"
27	clamd_HOST = '127.0.0.1'
28	clamd_PORT = 3310
29	clamd_timeout = None #[PL] default timeout for sockets: None = blocking operations
30	@@ -121,7 +121,7 @@
31
32	############################################################################
33
34	-def init_unix_socket(filename="/var/run/clamav/clamd.ctl"):
35	+def init_unix_socket(filename="/var/run/clamav/clamd.sock"):
36	"""
37	Init pyclamd to use clamd unix local socket
38

Lines 1-19 Link Here

(-)files/patch-setup.py (-19 lines)
1	--- setup.py.orig 2009-01-07 13:42:10.000000000 +0100
2	+++ setup.py 2009-01-07 13:42:27.000000000 +0100
3	@@ -0,0 +1,16 @@
4	+#!/usr/bin/python
5	+
6	+import glob
7	+import os
8	+import sys
9	+from distutils.core import setup
10	+
11	+setup(name="pyclamd",
12	+ version="0.2.2",
13	+ description="Python ClamD module.",
14	+ author="Alexandre Norman",
15	+ author_email="norman@xael.org",
16	+ url="http://xael.org/norman/python/pyclamd/",
17	+ license="GPL",
18	+ packages=['']
19	+ )