ports/67125: Update security/clamav-devel and secure socket

[Rob Evers]

>Number:         67125
>Category:       ports
>Synopsis:       Update security/clamav-devel and secure socket
>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:   Mon May 24 06:30:14 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rob Evers
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob at flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386


>Description:
Update security/clamav-devel to 20040524 snapshot
Changed startup script freshclam.sh -> clamav-freshclam.sh
	!!!!!!Beware if you use the freshclam daemon change rc.conf!!!!!!!!
Chmod 770 the socket directory
Rearange some things to be more in line with security/clamav port
 
>How-To-Repeat:
>Fix:

Added file: files/clamav-freshclam.sh
Removed file: files/freshclam.sh

--- clamav-devel.patch begins here ---
diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile
--- clamav-devel.orig/Makefile	Mon May 24 14:05:20 2004
+++ clamav-devel/Makefile	Mon May 24 15:13:04 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040521
+PORTVERSION=	20040524
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -55,9 +55,6 @@
 CLAMAV_MILTER_SOCKET?=	/var/run/clamav/clmilter.sock
 DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-PLIST_SUB+=	CLAMAVUSER="${CLAMAVUSER}"
-PLIST_SUB+=	CLAMAVGROUP="${CLAMAVGROUP}"
-
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%DATADIR%%|${DATADIR}|g' \
 		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
@@ -78,6 +75,9 @@
 		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
 
+PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
+		CLAMAVGROUP=${CLAMAVGROUP}
+
 RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
 SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
@@ -105,7 +105,6 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
-		-e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/clamav-milter/clamav-milter.c
 
 post-build:
diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo
--- clamav-devel.orig/distinfo	Mon May 24 14:05:20 2004
+++ clamav-devel/distinfo	Mon May 24 14:23:14 2004
@@ -1,2 +1,2 @@
-MD5 (clamav-devel-20040521.tar.gz) = 2a6101b4af51addd1a615c203c57b6f2
-SIZE (clamav-devel-20040521.tar.gz) = 1522094
+MD5 (clamav-devel-20040524.tar.gz) = 755e50b289c3a8bc7d629c2cc1493359
+SIZE (clamav-devel-20040524.tar.gz) = 1522132
diff -ruN clamav-devel.orig/files/clamav-freshclam.sh clamav-devel/files/clamav-freshclam.sh
--- clamav-devel.orig/files/clamav-freshclam.sh	Thu Jan  1 01:00:00 1970
+++ clamav-devel/files/clamav-freshclam.sh	Mon May 24 15:04:19 2004
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/security/clamav-devel/files/freshclam.sh
+#
+
+# PROVIDE: freshclam
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable freshclam daemon:
+#
+#clamav_freshclam_enable="YES"
+#
+# See freshclam(1) for flags
+#
+
+. %%RC_SUBR%%
+
+name=clamav_freshclam
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/freshclam
+required_dirs=%%DATADIR%%
+required_files=%%PREFIX%%/etc/freshclam.conf
+
+# set defaults
+
+clamav_freshclam_enable=${clamav_freshclam_enable:-"NO"}
+clamav_freshclam_flags=${clamav_freshclam_flags:-"--daemon-notify=%%PREFIX%%/etc/clamav.conf"}
+
+load_rc_config $name
+
+# add --daemon to any given arguments
+clamav_freshclam_flags="${clamav_freshclam_flags} --daemon"
+run_rc_command "$1"
diff -ruN clamav-devel.orig/files/freshclam.sh clamav-devel/files/freshclam.sh
--- clamav-devel.orig/files/freshclam.sh	Mon May 24 14:05:20 2004
+++ clamav-devel/files/freshclam.sh	Thu Jan  1 01:00:00 1970
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/clamav-devel/files/freshclam.sh
-#
-
-# PROVIDE: freshclam
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable freshclam daemon:
-#
-#freshclam_enable"YES"
-#
-# See freshclam(1) for flags
-#
-
-. %%RC_SUBR%%
-
-name=freshclam
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/bin/freshclam
-required_dirs=%%DATADIR%%
-required_files=%%PREFIX%%/etc/freshclam.conf
-
-
-# set defaults
-
-freshclam_enable=${freshclam_enable:-"NO"}
-freshclam_flags=${freshclam_flags:-"--daemon"}
-
-load_rc_config $name
-run_rc_command "$1"
diff -ruN clamav-devel.orig/pkg-install clamav-devel/pkg-install
--- clamav-devel.orig/pkg-install	Mon May 24 14:05:20 2004
+++ clamav-devel/pkg-install	Mon May 24 14:06:16 2004
@@ -38,6 +38,7 @@
 
 echo "===> Setting permissions..."
 mkdir -p "${CLAMRUN}"
+chmod 770 "${CLAMRUN}"
 chown "${CLAMAVUSER}:${CLAMAVGROUP}" "${CLAMRUN}"
 
 mkdir -p "${CLAMLOG}"
diff -ruN clamav-devel.orig/pkg-plist clamav-devel/pkg-plist
--- clamav-devel.orig/pkg-plist	Mon May 24 14:05:20 2004
+++ clamav-devel/pkg-plist	Mon May 24 14:23:14 2004
@@ -4,7 +4,7 @@
 bin/freshclam
 bin/sigtool
 etc/rc.d/clamav-clamd%%RC_SUFX%%
-etc/rc.d/freshclam%%RC_SUFX%%
+etc/rc.d/clamav-freshclam%%RC_SUFX%%
 %%CLAMAV-MILTER%%etc/rc.d/clamav-milter%%RC_SUFX%%
 %%CLAMAV-MILTER%%sbin/clamav-milter
 sbin/clamd
--- clamav-devel.patch ends here ---


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