- H+BEDV GmbH released a new tarball shipping an updated anti-virus engine

  (6.21.0.1 -> 6.22.0.1) and a current virus definition file (6.22.0.0).
  If you are using the auto-update functionality you should already have
  these updated versions.
- Mention the AntiVir Bulletin Board (support) in the DESCR.
- Make the antivirupdater script behave like described in the documentation
  (pass command line arguments to antivir).
- Make the avq script check for uid == 0, the avmilter spool directory can't
  be read without sufficient permissions.

Submitted by:	maintainer

6 files changed, 24 insertions, 4 deletions

diff --git a/security/antivir-milter/Makefile b/security/antivir-milter/Makefile
index c77e682766e4..57797c2d51bc 100644
--- a/security/antivir-milter/Makefile
+++ b/security/antivir-milter/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	antivir-milter
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	security mail
 MASTER_SITES=	ftp://ftp.antivir.de/freebsd/
 DISTNAME=	avfbmlt
@@ -21,6 +22,8 @@ NO_CDROM=	${RESTRICTED}
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 USE_REINPLACE=	yes
+# Auto re-fetch sucks!
+FETCH_CMD=	/usr/bin/fetch -A
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/security/antivir-milter/distinfo b/security/antivir-milter/distinfo
index 1e3182cfe988..a8d131128977 100644
--- a/security/antivir-milter/distinfo
+++ b/security/antivir-milter/distinfo
@@ -1 +1 @@
-MD5 (avfbmlt.tgz) = ba2855ce964808ce2a2046bae05dbce7
+MD5 (avfbmlt.tgz) = 32a758293baaebc3716742c734ad161a
diff --git a/security/antivir-milter/files/antivirupdater.sh b/security/antivir-milter/files/antivirupdater.sh
index 79d2ed7a66c7..40d90fd52416 100644
--- a/security/antivir-milter/files/antivirupdater.sh
+++ b/security/antivir-milter/files/antivirupdater.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-%%PREFIX%%/AntiVir/antivir -C %%PREFIX%%/etc/antivir.conf --home-dir=%%PREFIX%%/AntiVir --update
+%%PREFIX%%/AntiVir/antivir -C %%PREFIX%%/etc/antivir.conf --home-dir=%%PREFIX%%/AntiVir --update $1
diff --git a/security/antivir-milter/files/patch-script::avq b/security/antivir-milter/files/patch-script::avq
new file mode 100644
index 000000000000..dd9fb97281c3
--- /dev/null
+++ b/security/antivir-milter/files/patch-script::avq
@@ -0,0 +1,16 @@
+--- script/avq.orig	Sat Oct 11 13:26:02 2003
++++ script/avq	Sat Oct 11 13:31:54 2003
+@@ -49,6 +49,13 @@
+ systeme="`uname`"
+ date_param="-d"
+ 
++# Make sure the user running this program is root.
++procowner=${procowner:-`/usr/bin/id -u`}
++if [ "$procowner" != "0" ]; then
++	echo "${pname}: you must be the super-user (uid 0) to use this utility."
++	exit 2
++fi
++
+ usage() {
+     echo "${pname} usage:"
+     echo "    ${pname} [--queue=DIR] "
diff --git a/security/antivir-milter/pkg-descr b/security/antivir-milter/pkg-descr
index 48487d2b3977..d57e810e1057 100644
--- a/security/antivir-milter/pkg-descr
+++ b/security/antivir-milter/pkg-descr
@@ -22,5 +22,6 @@ Functions:
 
 AntiVir Milter is free of charge for private (individual, non-commercial) use.
 
-http://www.antivir.de/
+http://www.free-av.de/cgi-bin/ubb/ultimatebb.cgi (Support English/German)
+http://www.antivir.de/ (German)
 WWW: http://www.hbedv.com/
diff --git a/security/antivir-milter/pkg-message b/security/antivir-milter/pkg-message
index 972f5a8a2e10..49d986ef8a3f 100644
--- a/security/antivir-milter/pkg-message
+++ b/security/antivir-milter/pkg-message
@@ -12,7 +12,7 @@ Don't forget to rebuild sendmail.cf and to restart Sendmail afterwards.
 
 For automated updates of the virus definition file add the following
 line to your /etc/crontab:
-25 0 * * * root %%PREFIX%%/sbin/antivirupdater >/dev/null
+25 0 * * * root %%PREFIX%%/sbin/antivirupdater -q
 
 For full functionality of AntiVir Milter you need to obtain a license
 key from H+BEDV Datentechnik GmbH. To install it, execute the following