ports/57451: Upgrade security/clamav-devel

Rob Evers rob at debank.tv
Wed Oct 1 12:31:03 UTC 2003 

>Number:         57451
>Category:       ports
>Synopsis:       Upgrade security/clamav-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 01 05:30:34 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Rob Evers
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD haha.debank.tv 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #0: Thu Sep 18 16:37:14 CEST 2003 rob at haha.debank.tv:/usr/obj/usr/src/sys/HAHA i386


	
>Description:
Upgrade security/clamav-devel
 -newer snapshot ;-)
 -added RC-ng scripts
 -The milter script could use some testing
>How-To-Repeat:
>Fix:


--- clamav-devel.patch begins here ---
diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile
--- clamav-devel.orig/Makefile	Wed Oct  1 12:45:11 2003
+++ clamav-devel/Makefile	Wed Oct  1 14:11:14 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20030930
+PORTVERSION=	20031001
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -41,12 +41,14 @@
 
 CLAMAVUSER?=	clamav
 CLAMAVGROUP?=	clamav
+CLAMD_SOCKET?=	/var/run/clamav/clamd
 
 PLIST_SUB+=	CLAMAVUSER="${CLAMAVUSER}"
 PLIST_SUB+=	CLAMAVGROUP="${CLAMAVGROUP}"
 
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g'
+		-e 's|%%DATADIR%%|${DATADIR}|g' \
+		-e 's|%%CLAMD_SOCKET%%|${CLAMD_SOCKET}|g'
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(LogFile) .*$$|\1 /var/log/clamav/clamd.log|' \
@@ -57,6 +59,15 @@
 
 .include <bsd.port.pre.mk>
 
+USE_RC_SUBR=	yes
+RC_DIR=		${PREFIX}/etc/rc.d
+RC_SUFX=	.sh
+SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
+		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
+		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
+PLIST_SUB+=	RC_DIR=${RC_DIR} \
+		RC_SUFX=${RC_SUFX}
+
 .if ${OSVERSION} < 501001
 # compiles only with optimizer
 CFLAGS+=	-O
@@ -70,12 +81,6 @@
 PLIST_SUB+=	CLAMAV-MILTER:="@comment "
 .endif
 
-post-extract:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \
-		> ${WRKSRC}/clamav-milter.sh
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \
-		> ${WRKSRC}/clamav-clamd.sh
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
@@ -88,7 +93,11 @@
 
 post-build:
 	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
-		>${BUILD_WRKSRC}/etc/clamav.conf.default
+		> ${BUILD_WRKSRC}/etc/clamav.conf.default
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \
+		> ${WRKDIR}/clamav-clamd.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \
+		> ${WRKDIR}/clamav-milter.sh
 
 pre-install:
 	 ${SETENV} PKG_PREFIX=${PREFIX} \
@@ -96,13 +105,14 @@
 
 post-install:
 	@[ -f ${PREFIX}/etc/clamav.conf ] || \
-		${CP} ${PREFIX}/etc/clamav.conf.default ${PREFIX}/etc/clamav.conf
+		${CP} ${PREFIX}/etc/clamav.conf.default \
+			${PREFIX}/etc/clamav.conf
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/clamav-clamd.sh \
-		${LOCALBASE}/etc/rc.d/clamav-clamd.sh.sample
+	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
+		${RC_DIR}/clamav-clamd${RC_SUFX}
 .if defined(WITH_MILTER)
-	${INSTALL_SCRIPT} ${WRKSRC}/clamav-milter.sh \
-		${LOCALBASE}/etc/rc.d/clamav-milter.sh.sample
+	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
+		${RC_DIR}/clamav-milter${RC_SUFX}
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo
--- clamav-devel.orig/distinfo	Wed Oct  1 12:45:11 2003
+++ clamav-devel/distinfo	Wed Oct  1 14:11:37 2003
@@ -1 +1 @@
-MD5 (clamav-devel-20030930.tar.gz) = 7c15623dc0750f64431ee692a0046d6e
+MD5 (clamav-devel-20031001.tar.gz) = cb4e13698fbe2d68b7c5e5f624e66737
diff -ruN clamav-devel.orig/files/clamav-clamd.sh clamav-devel/files/clamav-clamd.sh
--- clamav-devel.orig/files/clamav-clamd.sh	Wed Oct  1 12:45:11 2003
+++ clamav-devel/files/clamav-clamd.sh	Wed Oct  1 13:50:13 2003
@@ -1,18 +1,53 @@
 #!/bin/sh
-PREFIX=%%PREFIX%%
+#
+# $FreeBSD: ports/security/clamav/files/clamd.sh,v 1.1 2003/09/28 13:29:28 dinoex Exp $
+#
 
-case "$1" in
-start)
-	# remove old socket
-	rm -f /tmp/clamd
-	[ -x ${PREFIX}/sbin/clamd ] && ${PREFIX}/sbin/clamd > /dev/null && echo -n ' clamd'
-	;;
-stop)
-	killall 'clamd' && echo -n ' clamd'
-	;;
-*)
-	echo "Usage: ${0##*/} { start | stop }" >&2
-	;;
-esac
+# PROVIDE: clamd
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: FreeBSD shutdown
 
-exit 0
+#
+# Add the following lines to /etc/rc.conf to enable clamd:
+#
+#clamav_clamd_enable="YES"
+#
+# See clamd(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=clamav_clamd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/clamd
+pidfile=/var/run/clamav/clamd.pid
+required_dirs=%%DATADIR%%
+required_files=%%PREFIX%%/etc/clamav.conf
+
+start_precmd=start_precmd
+
+start_precmd()
+{
+	if [ -S "$clamd_socket" ]; then
+	warn "Stale socket $clamd_socket removed."
+	rm "$clamd_socket"
+	fi
+}
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+clamav_clamd_enable=${clamav_clamd_enable:-"NO"}
+clamav_clamd_flags=${clamav_clamd_flags:-""}
+clamd_socket=${clamd_socket:-"%%CLAMD_SOCKET%%"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN clamav-devel.orig/files/clamav-milter.sh clamav-devel/files/clamav-milter.sh
--- clamav-devel.orig/files/clamav-milter.sh	Wed Oct  1 12:45:11 2003
+++ clamav-devel/files/clamav-milter.sh	Wed Oct  1 13:48:52 2003
@@ -1,28 +1,53 @@
 #!/bin/sh
 #
-#	runs clamd and clamav-milter
+# $FreeBSD: ports/security/clamav/files/clamd.sh,v 1.1 2003/09/28 13:29:28 dinoex Exp $
 #
 
-case "$1" in
-'start')
-	rm -f /tmp/clamd /var/run/clmilter.sock
-	%%PREFIX%%/sbin/clamd && echo -n " clamd"
-	%%PREFIX%%/sbin/clamav-milter \
-		--local \
-		--outgoing \
-		--max-children=50 \
-		/var/run/clmilter.sock &
-	echo -n " clamav-milter"
-	;;
-'stop')
-	killall 'clamav-milter'
-	echo -n " clamav-milter"
-	killall 'clamd'
-	echo -n " clamad"
-	;;
-*)
-	echo "Usage: ${0##*/} { start | stop }"
-	;;
-esac
+# PROVIDE: clamav-milter
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: FreeBSD shutdown
 
-exit 0
+#
+# Add the following lines to /etc/rc.conf to enable clamd:
+#
+#clamav_milter="YES"
+#
+# See clamav-milter(1) for flags
+#
+
+. %%RC_SUBR%%
+
+name=clamav_milter
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/clamd && %%PREFIX%%/sbin/clamav-milter
+pidfile=/var/run/clamav/clamd.pid
+required_dirs=%%DATADIR%%
+required_files=%%PREFIX%%/etc/clamav.conf
+
+start_precmd=start_precmd
+
+start_precmd()
+{
+	if [ -S "$clamd_socket" ]; then
+	warn "Stale socket $clamd_socket removed."
+	rm "$clamd_socket"
+	fi
+}
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+clamav_milter=${clamav_milter_enable:-"NO"}
+clamav_milter=${clamav_milter_flags:-""}
+clamd_socket=${clamd_socket:-"%%CLAMD_SOCKET%%"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN clamav-devel.orig/pkg-deinstall clamav-devel/pkg-deinstall
--- clamav-devel.orig/pkg-deinstall	Thu Jan  1 01:00:00 1970
+++ clamav-devel/pkg-deinstall	Wed Oct  1 14:04:48 2003
@@ -0,0 +1,4 @@
+echo "----------------------------------------------------------"
+echo "  If you really want to remove this package, please remove"
+echo " the clamav-user and clean out log files "
+echo "----------------------------------------------------------"
diff -ruN clamav-devel.orig/pkg-plist clamav-devel/pkg-plist
--- clamav-devel.orig/pkg-plist	Wed Oct  1 12:45:11 2003
+++ clamav-devel/pkg-plist	Wed Oct  1 14:02:26 2003
@@ -3,8 +3,8 @@
 bin/clamdscan
 bin/freshclam
 bin/sigtool
-etc/rc.d/clamav-clamd.sh.sample
-%%CLAMAV-MILTER:%%etc/rc.d/clamav-milter.sh.sample
+etc/rc.d/clamav-clamd%%RC_SUFX%%
+%%CLAMAV-MILTER:%%etc/rc.d/clamav-milter%%RC_SUFX%%
 %%CLAMAV-MILTER:%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h
@@ -21,10 +21,3 @@
 @dirrm %%DATADIR%%
 @unexec rmdir /var/run/clamav 2>/dev/null || true
 @unexec rmdir /var/log/clamav 2>/dev/null || true
- at unexec echo ""
- at unexec echo "========================================================="
- at unexec echo " If you want to deinstall this package permanently then"
- at unexec echo "               \"rmuser -y %%CLAMAVUSER%%\" "
- at unexec echo " This will remove clamav's spool-directory and user "
- at unexec echo "========================================================="
- at unexec echo ""
--- clamav-devel.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list