Attachment #39794 for bug #62653

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




#

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

		arc:${PORTSDIR}/archivers/arc \
		unzip:${PORTSDIR}/archivers/unzip

OPTIONS=	MILTER "Compile the milter interface" off
USE_REINPLACE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

		-e 's|<malloc.h>|<stdlib.h>|' \
		${WRKSRC}/clamav-milter/clamav-milter.c

pre-configure:
	@${REINPLACE_CMD} -e 's|clamav.conf|&.default|' \
		-e 's|freshclam.conf|&.default|' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
		${CONFIGURE_WRKSRC}/etc/Makefile.in

post-build:
	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
		> ${BUILD_WRKSRC}/etc/clamav.conf.default

	@[ -f ${PREFIX}/etc/clamav.conf ] || \
		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
			${PREFIX}/etc/clamav.conf
	@[ -f ${PREFIX}/etc/clamav.conf.default ] || \
		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
			${PREFIX}/etc/clamav.conf.default
	@[ -f ${PREFIX}/etc/freshclam.conf ] || \
		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
			${PREFIX}/etc/freshclam.conf
	@[ -f ${PREFIX}/etc/freshclam.conf.default ] || \
		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
			${PREFIX}/etc/freshclam.conf.default
	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
		${RC_DIR}/clamav-clamd${RC_SUFX}
	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
.if defined(WITH_MILTER)
	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
		${RC_DIR}/clamav-milter${RC_SUFX}

Line 1 Link Here

(-)clamav-devel/distinfo (-1 / +2 lines)
1	MD5 (clamav-devel-20040129.tar.gz) = 8c0a73c2b832195b83edc163079285a4	1	MD5 (clamav-devel-20040210.tar.gz) = 07d8e5f2c57ab6a0e2e35deb81b5f357
		2	SIZE (clamav-devel-20040210.tar.gz) = 1182377




--- configure.bak	Fri Feb  6 14:46:08 2004
+++ configure	Tue Feb 10 17:44:13 2004
@@ -9316,23 +9316,12 @@
 
 
 
-if test ! -r "$cfg_dir/clamav.conf"; then
-  INSTALL_CLAMAV_CONF_TRUE=
-  INSTALL_CLAMAV_CONF_FALSE='#'
-else
   INSTALL_CLAMAV_CONF_TRUE='#'
   INSTALL_CLAMAV_CONF_FALSE=
-fi
 
 
-
-if test ! -r "$cfg_dir/freshclam.conf"; then
-  INSTALL_FRESHCLAM_CONF_TRUE=
-  INSTALL_FRESHCLAM_CONF_FALSE='#'
-else
   INSTALL_FRESHCLAM_CONF_TRUE='#'
   INSTALL_FRESHCLAM_CONF_FALSE=
-fi
 
 
 if test "$test_urandom" = "yes"




--- database/Makefile.in.orig	Tue Feb 10 17:19:06 2004
+++ database/Makefile.in	Tue Feb 10 17:19:38 2004
@@ -248,9 +248,9 @@
 
 install:
 	$(mkinstalldirs) $(DESTDIR)$(DBINST)
-	test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
-	test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
-	test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
+	test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
+	test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
+	test -f $(DESTDIR)$(DBINST)/mirrors.txt || $(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
 	test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
 	test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
 	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

Lines 3-7 Link Here

(-)clamav-devel/pkg-deinstall (-1 / +1 lines)
3	fi	3	fi
4	echo "----------------------------------------------------------"	4	echo "----------------------------------------------------------"
5	echo " If you really want to remove this package, please remove"	5	echo " If you really want to remove this package, please remove"
6	echo " the clamav-user and clean out log files "	6	echo " the clamav-user and clean out log files and database"
7	echo "----------------------------------------------------------"	7	echo "----------------------------------------------------------"

Lines 43-51 Link Here

(-)clamav-devel/pkg-install (-5 lines)
43	chown "${CLAMAVUSER}:${CLAMAVGROUP}" "${CLAMLOG}"	43	chown "${CLAMAVUSER}:${CLAMAVGROUP}" "${CLAMLOG}"
44	fi	44	fi
45		45
46	if [ "$2" = "POST-INSTALL" ]; then
47	echo "===> Updating virus definitions..."
48	freshclam
49	fi
50
51	exit 0	46	exit 0

Lines 23-32 Link Here

(-)clamav-devel/pkg-plist (-3 lines)
23	@owner %%CLAMAVUSER%%	23	@owner %%CLAMAVUSER%%
24	@group %%CLAMAVGROUP%%	24	@group %%CLAMAVGROUP%%
25	%%DATADIR%%/mirrors.txt	25	%%DATADIR%%/mirrors.txt
26	%%DATADIR%%/main.cvd
27	%%DATADIR%%/daily.cvd
28	@exec chown %%CLAMAVUSER%%:%%CLAMAVGROUP%% %B	26	@exec chown %%CLAMAVUSER%%:%%CLAMAVGROUP%% %B
29	@dirrm %%DATADIR%%
30	@unexec rmdir /var/run/clamav 2>/dev/null \|\| true	27	@unexec rmdir /var/run/clamav 2>/dev/null \|\| true
31	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true	28	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true
32	%%PORTDOCS%%@dirrm %%DOCSDIR%%-devel	29	%%PORTDOCS%%@dirrm %%DOCSDIR%%-devel

Return to bug 62653

Lines 6-13 Link Here

(-)clamav-devel/Makefile (-10 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= clamav	8	PORTNAME= clamav
9	PORTVERSION= 20040129	9	PORTVERSION= 20040210
10	PORTREVISION= 1
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://clamav.sourceforge.net/snapshot/	11	MASTER_SITES= http://clamav.sourceforge.net/snapshot/
13	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
Lines 24-30 Link Here
24	arc:${PORTSDIR}/archivers/arc \	23	arc:${PORTSDIR}/archivers/arc \
25	unzip:${PORTSDIR}/archivers/unzip	24	unzip:${PORTSDIR}/archivers/unzip
26		25
27	#OPTIONS= MILTER "Compile the milter interface" off	26	OPTIONS= MILTER "Compile the milter interface" off
28	USE_REINPLACE= yes	27	USE_REINPLACE= yes
29	USE_GMAKE= yes	28	USE_GMAKE= yes
30	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
Lines 100-111 Link Here
100	-e 's\|<malloc.h>\|<stdlib.h>\|' \	99	-e 's\|<malloc.h>\|<stdlib.h>\|' \
101	${WRKSRC}/clamav-milter/clamav-milter.c	100	${WRKSRC}/clamav-milter/clamav-milter.c
102		101
103	pre-configure:
104	@${REINPLACE_CMD} -e 's\|clamav.conf\|&.default\|' \
105	-e 's\|freshclam.conf\|&.default\|' \
106	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
107	${CONFIGURE_WRKSRC}/etc/Makefile.in
108
109	post-build:	102	post-build:
110	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \	103	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
111	> ${BUILD_WRKSRC}/etc/clamav.conf.default	104	> ${BUILD_WRKSRC}/etc/clamav.conf.default
Lines 129-142 Link Here
129	@[ -f ${PREFIX}/etc/clamav.conf ] \|\| \	122	@[ -f ${PREFIX}/etc/clamav.conf ] \|\| \
130	${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \	123	${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
131	${PREFIX}/etc/clamav.conf	124	${PREFIX}/etc/clamav.conf
		125	@[ -f ${PREFIX}/etc/clamav.conf.default ] \|\| \
		126	${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
		127	${PREFIX}/etc/clamav.conf.default
132	@[ -f ${PREFIX}/etc/freshclam.conf ] \|\| \	128	@[ -f ${PREFIX}/etc/freshclam.conf ] \|\| \
133	${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \	129	${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
134	${PREFIX}/etc/freshclam.conf	130	${PREFIX}/etc/freshclam.conf
		131	@[ -f ${PREFIX}/etc/freshclam.conf.default ] \|\| \
		132	${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
		133	${PREFIX}/etc/freshclam.conf.default
135	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}	134	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
136	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \	135	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
137	${RC_DIR}/clamav-clamd${RC_SUFX}	136	${RC_DIR}/clamav-clamd${RC_SUFX}
138	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}	137	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
139	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
140	.if defined(WITH_MILTER)	138	.if defined(WITH_MILTER)
141	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \	139	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
142	${RC_DIR}/clamav-milter${RC_SUFX}	140	${RC_DIR}/clamav-milter${RC_SUFX}

Line 0 Link Here

(-)clamav-devel/files/patch-configure (+26 lines)
	1	--- configure.bak Fri Feb 6 14:46:08 2004
	2	+++ configure Tue Feb 10 17:44:13 2004
	3	@@ -9316,23 +9316,12 @@
	4
	5
	6
	7	-if test ! -r "$cfg_dir/clamav.conf"; then
	8	- INSTALL_CLAMAV_CONF_TRUE=
	9	- INSTALL_CLAMAV_CONF_FALSE='#'
	10	-else
	11	INSTALL_CLAMAV_CONF_TRUE='#'
	12	INSTALL_CLAMAV_CONF_FALSE=
	13	-fi
	14
	15
	16	-
	17	-if test ! -r "$cfg_dir/freshclam.conf"; then
	18	- INSTALL_FRESHCLAM_CONF_TRUE=
	19	- INSTALL_FRESHCLAM_CONF_FALSE='#'
	20	-else
	21	INSTALL_FRESHCLAM_CONF_TRUE='#'
	22	INSTALL_FRESHCLAM_CONF_FALSE=
	23	-fi
	24
	25
	26	if test "$test_urandom" = "yes"

Line 0 Link Here

(-)clamav-devel/files/patch-database_Makefile.in (+15 lines)
	1	--- database/Makefile.in.orig Tue Feb 10 17:19:06 2004
	2	+++ database/Makefile.in Tue Feb 10 17:19:38 2004
	3	@@ -248,9 +248,9 @@
	4
	5	install:
	6	$(mkinstalldirs) $(DESTDIR)$(DBINST)
	7	- test -f $(DESTDIR)$(DBINST)/main.cvd \|\| @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
	8	- test -f $(DESTDIR)$(DBINST)/daily.cvd \|\| @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
	9	- test -f $(DESTDIR)$(DBINST)/mirrors.txt \|\| @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
	10	+ test -f $(DESTDIR)$(DBINST)/main.cvd \|\| $(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
	11	+ test -f $(DESTDIR)$(DBINST)/daily.cvd \|\| $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
	12	+ test -f $(DESTDIR)$(DBINST)/mirrors.txt \|\| $(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
	13	test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db \|\| true
	14	test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 \|\| true
	15	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \