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

  (6.22.0.1 -> 6.23.0.1), a current virus definition file (6.23.0.1) and
  and updated antivir.conf adding new options for the new features in the
  current AV engine.
  If you are using the auto-update facility you should already have the
  updated AV engine and VDF. The new options available in antivir.conf are
  only relevant if you are using the update daemon mechanism (i.e. you are
  using `antivir --update-daemon` instead of running antivirupdater via
  cron(8)) or you own a true commercial license (i.e. no private license)
  and want to catch "unwanted files" e.g. dialers in addition to worms and
  viruses.
- Be consistent in how PREFIX gets inserted in the avq script compared to
  the other patched files. The old way previously saved a patch which is
  no longer true. No change in the installed script.

Submitted by:	Marius Strobl <marius@alchemy.franken.de>

4 files changed, 35 insertions, 9 deletions

diff --git a/security/antivir-milter/Makefile b/security/antivir-milter/Makefile
index 34351f3a295c..f754da59c798 100644
--- a/security/antivir-milter/Makefile
+++ b/security/antivir-milter/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	antivir-milter
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security mail
 MASTER_SITES=	ftp://ftp.antivir.de/freebsd/
 DISTNAME=	avfbmlt
@@ -38,11 +38,9 @@ LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 .endif
 
 post-patch:
-.for i in etc/avmilter.conf init/rc.avmilter
+.for i in etc/antivir.conf etc/avmilter.conf init/rc.avmilter script/avq
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
 .endfor
-	@${REINPLACE_CMD} -e 's|\/etc\/avmilter.conf|${PREFIX}&|g' \
-		${WRKSRC}/script/avq
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > \
 		${WRKDIR}/pkg-message
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/antivirupdater.sh > \
diff --git a/security/antivir-milter/distinfo b/security/antivir-milter/distinfo
index a8d131128977..514c64ab7039 100644
--- a/security/antivir-milter/distinfo
+++ b/security/antivir-milter/distinfo
@@ -1 +1 @@
-MD5 (avfbmlt.tgz) = 32a758293baaebc3716742c734ad161a
+MD5 (avfbmlt.tgz) = 8a1e7eb3afb4b9fdb3fadd95669ed37b
diff --git a/security/antivir-milter/files/patch-etc::antivir.conf b/security/antivir-milter/files/patch-etc::antivir.conf
new file mode 100644
index 000000000000..2da8e0068381
--- /dev/null
+++ b/security/antivir-milter/files/patch-etc::antivir.conf
@@ -0,0 +1,19 @@
+--- etc/antivir.conf.orig	Mon Dec  8 17:09:11 2003
++++ etc/antivir.conf	Mon Dec  8 17:11:16 2003
+@@ -52,7 +52,7 @@
+ # advantage of GnuPG, be aware that all updates will fail
+ # until the AntiVir public key (antivir.gpg) has been
+ # added to your keyring and signed.
+-#GnuPGBinary /usr/local/bin/gpg
++#GnuPGBinary %%PREFIX%%/bin/gpg
+ 
+ # If you are utilizing GnuPG, you may also specify
+ # options that your particular setup might need.
+@@ -63,6 +63,7 @@
+ # of software which are not viruses but might not be wanted.
+ # By default all these tests are turned off. They can be enabled
+ # by uncommenting the following keywords.
++# These options are only available in commercial mode.
+ #DetectDialer
+ #DetectJoke
+ #DetectGame
diff --git a/security/antivir-milter/files/patch-script::avq b/security/antivir-milter/files/patch-script::avq
index dd9fb97281c3..a2f97faa1c3e 100644
--- a/security/antivir-milter/files/patch-script::avq
+++ b/security/antivir-milter/files/patch-script::avq
@@ -1,16 +1,25 @@
 --- script/avq.orig	Sat Oct 11 13:26:02 2003
 +++ script/avq	Sat Oct 11 13:31:54 2003
-@@ -49,6 +49,13 @@
+@@ -38,7 +38,7 @@
+ #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #******************************************************************************
+ 
+-configuration=/etc/avmilter.conf
++configuration=%%PREFIX%%/etc/avmilter.conf
+ queue="`egrep -i '^[Ss][Pp][Oo][Oo][Ll][Dd][Ii][Rr]' ${configuration} | awk '{print $2;}'`"
+ queue_set=0
+ pname="`basename $0`"
+@@ -48,6 +48,13 @@
+ data=
  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] "