- Update to 20080708

- Align clamav-milter startup script with security/clamav version, that waits
  for milter sock before chmod it

3 files changed, 20 insertions, 5 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index eff5a8213301..e6b54465ed86 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20080520
-PORTREVISION=	2
+PORTVERSION=	20080708
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		${MASTER_SITE_LOCAL}
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index e0be9c1a34ab..b1e3c49d7f57 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20080520.tar.gz) = 6146ebaa53ad525e4b7b3e55844d255e
-SHA256 (clamav-devel-20080520.tar.gz) = 69e34ca54097ea7d8343f090ee0c9de8cbf30cf87fe7cccb3d34a9cfcba7d633
-SIZE (clamav-devel-20080520.tar.gz) = 2691654
+MD5 (clamav-devel-20080708.tar.gz) = b07f99f8aa6c676f37f3a7b58e40b159
+SHA256 (clamav-devel-20080708.tar.gz) = dd999142aeaf7c986bfa95ead20191a2fe180c6186767f55d1ef44c1479141cd
+SIZE (clamav-devel-20080708.tar.gz) = 2718651
diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in
index 509d05e3d42c..1ea17d90eb0d 100644
--- a/security/clamav-devel/files/clamav-milter.in
+++ b/security/clamav-devel/files/clamav-milter.in
@@ -59,6 +59,22 @@ start_precmd()
 
 start_postcmd()
 {
+	echo -n "Waiting for clamav-milter socket.. "
+	i=${clamav_milter_socktimeout}
+	while [ $i -ne 0 ]
+	do
+		[ -S "$clamav_milter_socket" ] && break
+		if [ `expr $i % 10` -eq 0 ]; then
+			echo -n "${i}.. "
+		fi
+		sleep 1
+		i=$(($i-1))
+	done
+	echo
+	if [ $i -eq 0 ]; then
+		echo "There is no clamav-milter socket (${clamav_clamd_socket})!"
+		exit 1
+	fi
 	/bin/chmod ${clamav_milter_socket_mode} ${clamav_milter_socket}
 }