Attachment #49866 for bug #76086

View | Details | Raw Unified | Return to bug 76086
Collapse All | Expand All




#

PORTNAME=	clamav
PORTVERSION=	20050110
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	http://www.clamav.net/snapshot/
PKGNAMESUFFIX=	-devel

PORTDOCS=	NEWS ChangeLog html

DBDIR=		/var/db/clamav
RUNDIR=		/var/run/clamav
PLIST_SUB+=	DBDIR=${DBDIR} RUNDIR=${RUNDIR}

CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
		--with-zlib=/usr \
		--disable-zlib-vcheck \


CLAMAVUSER?=	clamav
CLAMAVGROUP?=	clamav
CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd
CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock

SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
		-e 's|%%DBDIR%%|${DBDIR}|g' \
		-e 's|%%RUNDIR%%|${RUNDIR}|g' \
		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
		-e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \
		-e 's|%%CLAMAV_CLAMD_SOCKET%%|${CLAMAV_CLAMD_SOCKET}|g' \


SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 /var/log/clamav/\3|' \
		-e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 ${RUNDIR}/\2|' \
		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
		-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \

Lines 1-2 Link Here

(-)/usr/ports/security/clamav-devel.new/distinfo (-2 / +2 lines)
1	MD5 (clamav-devel-20041213.tar.gz) = bbd6194cbbc0bd71341e5ecffa5486b7	1	MD5 (clamav-devel-20050110.tar.gz) = 60d394ae8b6533640adbef9306a35c2f
2	SIZE (clamav-devel-20041213.tar.gz) = 1476871	2	SIZE (clamav-devel-20050110.tar.gz) = 1542220




--- configure.in.o	Mon Jan 10 20:13:18 2005
+++ configure.in	Mon Jan 10 20:13:42 2005
@@ -38,7 +38,7 @@
 AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h uio.h)
+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h)
 AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)
 
 AC_TYPE_OFF_T
@@ -360,9 +360,6 @@
     ;;
 freebsd*)

Lines 1-6 Link Here

(-)/usr/ports/security/clamav-devel.new/pkg-plist (-3 / +4 lines)
1	@comment $FreeBSD: ports/security/clamav-devel/pkg-plist,v 1.24 2004/12/22 02:10:12 edwin Exp $	1	@comment $FreeBSD: ports/security/clamav-devel/pkg-plist,v 1.24 2004/12/22 02:10:12 edwin Exp $
2	@unexec [ ! -f /var/run/clamav/clamd.pid ] \|\| %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop \|\| true	2	%%CLAMAV-MILTER%%@unexec [ ! -f %%RUNDIR%%/clamav-milter.pid ] \|\| %%RC_DIR%%/clamav-milter%%RC_SUFX%% stop \|\| true
3	@unexec [ ! -f /var/run/clamav/freshclam.pid ] \|\| %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop \|\| true	3	@unexec [ ! -f %%RUNDIR%%/freshclam.pid ] \|\| %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop \|\| true
		4	@unexec [ ! -f %%RUNDIR%%/clamd.pid ] \|\| %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop \|\| true
4	bin/clamav-config	5	bin/clamav-config
5	bin/clamscan	6	bin/clamscan
6	bin/clamdscan	7	bin/clamdscan
Lines 25-29 Link Here
25	@unexec [ ! -f %%DBDIR%%/daily.cvd ] \|\| rm -f %%DBDIR%%/daily.cvd \|\| true	26	@unexec [ ! -f %%DBDIR%%/daily.cvd ] \|\| rm -f %%DBDIR%%/daily.cvd \|\| true
26	@unexec [ ! -f %%DBDIR%%/main.cvd ] \|\| rm -f %%DBDIR%%/main.cvd \|\| true	27	@unexec [ ! -f %%DBDIR%%/main.cvd ] \|\| rm -f %%DBDIR%%/main.cvd \|\| true
27	@unexec rmdir %%DBDIR%%	28	@unexec rmdir %%DBDIR%%
28	@unexec rmdir /var/run/clamav 2>/dev/null \|\| true	29	@unexec rmdir %%RUNDIR%% 2>/dev/null \|\| true
29	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true	30	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true

Return to bug 76086

Lines 6-13 Link Here

(-)/usr/ports/security/clamav-devel.new/Makefile (-6 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= clamav	8	PORTNAME= clamav
9	PORTVERSION= 20041213	9	PORTVERSION= 20050110
10	PORTREVISION= 1
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://www.clamav.net/snapshot/	11	MASTER_SITES= http://www.clamav.net/snapshot/
13	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
Lines 42-48 Link Here
42	PORTDOCS= NEWS ChangeLog html	41	PORTDOCS= NEWS ChangeLog html
43		42
44	DBDIR= /var/db/clamav	43	DBDIR= /var/db/clamav
45	PLIST_SUB+= DBDIR=${DBDIR}	44	RUNDIR= /var/run/clamav
		45	PLIST_SUB+= DBDIR=${DBDIR} RUNDIR=${RUNDIR}
		46
46	CONFIGURE_ARGS= --with-dbdir=${DBDIR} \	47	CONFIGURE_ARGS= --with-dbdir=${DBDIR} \
47	--with-zlib=/usr \	48	--with-zlib=/usr \
48	--disable-zlib-vcheck \	49	--disable-zlib-vcheck \
Lines 65-75 Link Here
65		66
66	CLAMAVUSER?= clamav	67	CLAMAVUSER?= clamav
67	CLAMAVGROUP?= clamav	68	CLAMAVGROUP?= clamav
68	CLAMAV_CLAMD_SOCKET?= /var/run/clamav/clamd	69	CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd
69	CLAMAV_MILTER_SOCKET?= /var/run/clamav/clmilter.sock	70	CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock
70		71
71	SED_SCRIPT= -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	72	SED_SCRIPT= -e 's\|%%PREFIX%%\|${PREFIX}\|g' \
72	-e 's\|%%DBDIR%%\|${DBDIR}\|g' \	73	-e 's\|%%DBDIR%%\|${DBDIR}\|g' \
		74	-e 's\|%%RUNDIR%%\|${RUNDIR}\|g' \
73	-e 's\|%%CLAMAVUSER%%\|${CLAMAVUSER}\|g' \	75	-e 's\|%%CLAMAVUSER%%\|${CLAMAVUSER}\|g' \
74	-e 's\|%%CLAMAVGROUP%%\|${CLAMAVGROUP}\|g' \	76	-e 's\|%%CLAMAVGROUP%%\|${CLAMAVGROUP}\|g' \
75	-e 's\|%%CLAMAV_CLAMD_SOCKET%%\|${CLAMAV_CLAMD_SOCKET}\|g' \	77	-e 's\|%%CLAMAV_CLAMD_SOCKET%%\|${CLAMAV_CLAMD_SOCKET}\|g' \
Lines 77-83 Link Here
77		79
78	SED_CONF= -E -e 's\|^\#?(Example)$$\|\#\1\|' \	80	SED_CONF= -E -e 's\|^\#?(Example)$$\|\#\1\|' \
79	-e 's\|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$\|\1 /var/log/clamav/\3\|' \	81	-e 's\|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$\|\1 /var/log/clamav/\3\|' \
80	-e 's\|^\#?(PidFile) .*/([a-z]+\.pid)$$\|\1 /var/run/clamav/\2\|' \	82	-e 's\|^\#?(PidFile) .*/([a-z]+\.pid)$$\|\1 ${RUNDIR}/\2\|' \
81	-e 's\|^\#?(LocalSocket) .*$$\|\1 ${CLAMAV_CLAMD_SOCKET}\|' \	83	-e 's\|^\#?(LocalSocket) .*$$\|\1 ${CLAMAV_CLAMD_SOCKET}\|' \
82	-e 's\|^\#?(User) .*$$\|\1 ${CLAMAVUSER}\|' \	84	-e 's\|^\#?(User) .*$$\|\1 ${CLAMAVUSER}\|' \
83	-e 's\|^\#?(AllowSupplementaryGroups)$$\|\1\|' \	85	-e 's\|^\#?(AllowSupplementaryGroups)$$\|\1\|' \

Lines 1-14 Link Here

(-)/usr/ports/security/clamav-devel.new/files/patch-configure.in (-11 / +2 lines)
1	--- configure.in.orig Tue Dec 7 23:46:18 2004	1	--- configure.in.o Mon Jan 10 20:13:18 2005
2	+++ configure.in Mon Dec 13 23:09:50 2004	2	+++ configure.in Mon Jan 10 20:13:42 2005
3	@@ -38,7 +38,7 @@
4	AC_DEFINE(FILEBUFF, 8192, [file i/o buffer size])
5
6	AC_HEADER_STDC
7	-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h uio.h)
8	+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h)
9	AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)
10
11	AC_TYPE_OFF_T
12	@@ -360,9 +360,6 @@	3	@@ -360,9 +360,6 @@
13	;;	4	;;
14	freebsd*)	5	freebsd*)