- Update to 1.1.1-9. For a list of changes since 1.1.0-7 please see the

  installed ChangeLog.
- Remove the references to the no longer available free license key for
  private use from pkg-descr and pkg-message.

Approved by:	netchild

8 files changed, 34 insertions, 61 deletions

diff --git a/security/antivir-milter/Makefile b/security/antivir-milter/Makefile
index 929a5cda8e72..55de295a334e 100644
--- a/security/antivir-milter/Makefile
+++ b/security/antivir-milter/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	antivir-milter
-PORTVERSION=	1.1.0p7
+PORTVERSION=	1.1.1p9
 DISTVERSIONPREFIX=	prof-
 DISTVERSION=	${PORTVERSION:C/p/-/}
 CATEGORIES=	security mail
@@ -48,14 +48,10 @@ BINSRC=		${WRKSRC}/bin/freebsd
 
 post-extract:
 	@${CP} ${FILESDIR}/avq.sh ${WRKSRC}/script/avq
-	@${MV} ${WRKSRC}/templates/en/patho-admnistrator\
-		${WRKSRC}/templates/en/patho-administrator
-	@${MV} ${WRKSRC}/templates/en/virus-admnistrator\
-		${WRKSRC}/templates/en/virus-administrator
 
 post-patch:
-.for i in doc/MANUAL etc/antivir.conf etc/avmilter.conf init/rc.avmilter \
-	pgp/README script/avq script/avupdater
+.for i in doc/MANUAL etc/antivir.conf etc/avmilter.conf script/avq \
+	script/avupdater script/rc.avmilter
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
 .endfor
@@ -94,14 +90,14 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/etc/antivir.conf ${PREFIX}/etc
 .endif
 	@${LN} -sf ${PREFIX}/etc/antivir.conf /etc
-	@${INSTALL_PROGRAM} ${BINSRC}/avmilter ${PREFIX}/sbin
+	@${INSTALL_PROGRAM} ${BINSRC}/avmilter.bin ${PREFIX}/sbin
 	@${INSTALL_SCRIPT} ${WRKDIR}/antivirupdater.sh \
 		${PREFIX}/sbin/antivirupdater
 	@${INSTALL_SCRIPT} ${WRKDIR}/avqrm.sh ${PREFIX}/bin/avqrm
-	@${INSTALL_SCRIPT} ${WRKSRC}/init/rc.avmilter \
-		${PREFIX}/etc/rc.d/avmilter.sh
 	@${INSTALL_SCRIPT} ${WRKSRC}/script/avupdater \
 		${PREFIX}/etc/rc.d/avupdater.sh-dist_avmilter
+	@${INSTALL_SCRIPT} ${WRKSRC}/script/rc.avmilter \
+		${PREFIX}/etc/rc.d/avmilter.sh
 	@${INSTALL} -d -o smmsp -g smmsp -m 700 /var/spool/avmilter
 .for i in incoming outgoing rejected
 	@${INSTALL} -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/${i}
@@ -120,11 +116,9 @@ do-install:
 .for i in ChangeLog LICENSE LICENSE.DE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in MANUAL avmilter_de.pdf avmilter_en.pdf
+.for i in MANUAL RELEASE_NOTES avmilter_de.pdf avmilter_en.pdf
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/pgp/README ${DOCSDIR}/README.gpg
-	@${INSTALL_DATA} ${WRKSRC}/pgp/antivir.gpg ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/security/antivir-milter/distinfo b/security/antivir-milter/distinfo
index c3475aa429ee..bff27c0070e1 100644
--- a/security/antivir-milter/distinfo
+++ b/security/antivir-milter/distinfo
@@ -1,2 +1,2 @@
-MD5 (antivir-milter-prof-1.1.0-7.tar.gz) = 38bd037c7f5dff6223718d13eebc7166
-SIZE (antivir-milter-prof-1.1.0-7.tar.gz) = 9455812
+MD5 (antivir-milter-prof-1.1.1-9.tar.gz) = 7373ee9d2b6ca808c4ca6fe629ae612e
+SIZE (antivir-milter-prof-1.1.1-9.tar.gz) = 11219085
diff --git a/security/antivir-milter/files/patch-doc::MANUAL b/security/antivir-milter/files/patch-doc::MANUAL
index cf25022a015f..9164c03c168b 100644
--- a/security/antivir-milter/files/patch-doc::MANUAL
+++ b/security/antivir-milter/files/patch-doc::MANUAL
@@ -1,6 +1,6 @@
 --- doc/MANUAL.orig	Wed Jan 28 11:48:04 2004
 +++ doc/MANUAL	Mon Mar  1 01:08:06 2004
-@@ -39,37 +39,38 @@
+@@ -40,37 +40,38 @@
  
  To start, stop, restart AntiVir Milter:
  
@@ -51,7 +51,7 @@
  # MaxNestingLevel		same as ArchiveMaxRecursion
  # MaxAttachments		100
  # BlockSuspiciousMime		NO
-@@ -77,7 +78,7 @@
+@@ -78,7 +79,7 @@
  # ExposeRecipientAlerts		NO
  # ExposeSenderAlerts		NO
  # ExposePostmasterAlerts	YES
@@ -60,7 +60,7 @@
  # RejectAlertMail		NO
  # QuarantineAlert		YES
  # ScanInArchive			YES
-@@ -115,13 +116,13 @@
+@@ -118,13 +119,13 @@
  -------------------------------
  
  Add the following line for a daily update at e.g. 0:25 a.m.:
@@ -77,7 +77,7 @@
  are provided:
  
  # EmailTo            	root@localhost
-@@ -135,7 +136,7 @@
+@@ -138,7 +139,7 @@
  # HTTPProxyPassword  	password
  # SyslogFacility     	user
  # SyslogPriority     	notice
@@ -86,7 +86,7 @@
  # GnuPGOptions
  # DetectDialer
  # DetectJoke
-@@ -155,7 +156,7 @@
+@@ -158,7 +159,7 @@
  you have the possibility to define your own text in alert and
  pathological notification mails.
  
@@ -95,7 +95,7 @@
  following files:
  
  	patho-administrator
-@@ -213,14 +214,15 @@
+@@ -216,14 +217,15 @@
  will be printed to syslog:
  (avmilter[1234]: Mail from foo@bar.tld to john@doe.tld will be scanned!)
  
@@ -113,7 +113,7 @@
  The i is an option for the regexp and it means ignore case.
  
  #The following matches exactly the *recipient* address "foo@bar.tld"
-@@ -325,8 +327,8 @@
+@@ -328,8 +330,8 @@
  no notice mail will be sent to the recipient(s) and the sender!
  This behaviour cannot be changed.
  
@@ -124,3 +124,12 @@
  The definition there is used instead of the definition in the
  avmilter.conf (Expose*Alerts).
  
+@@ -464,7 +466,7 @@
+ mail. If set to a full path with filename, the text in that file will be
+ added to the mail.
+ 
+-AddStatusInBody /usr/lib/AntiVir/templates/my_banner
++AddStatusInBody %%PREFIX%%/AntiVir/templates/my_banner
+ or
+ AddStatusInBody yes
+ 
diff --git a/security/antivir-milter/files/patch-pgp::README b/security/antivir-milter/files/patch-pgp::README
deleted file mode 100644
index 8922c938286d..000000000000
--- a/security/antivir-milter/files/patch-pgp::README
+++ /dev/null
@@ -1,16 +0,0 @@
---- pgp/README.orig	Fri Oct  1 11:25:22 2004
-+++ pgp/README	Tue Oct 12 17:50:07 2004
-@@ -58,10 +58,10 @@
- 
- 
- 7. Activate GnuPG in AntiVir by adding the GnuPGBinary directive to the
--   /etc/antivir.conf file. This directive takes as argument the full path
--   to your GnuPG binary. Typically it would look like this:
-+   %%PREFIX%%/etc/antivir.conf file. This directive takes as argument the
-+   full path to your GnuPG binary. Typically it would look like this:
- 
--   GnuPGBinary /usr/local/bin/gpg
-+   GnuPGBinary %%LOCALBASE%%/bin/gpg
- 
- 
- Note: Currently only engine or program updates utilize GnuPG. VDF file
diff --git a/security/antivir-milter/files/patch-init::rc.avmilter b/security/antivir-milter/files/patch-script::rc.avmilter
index 7070466fbf13..a01c1ce0b99d 100644
--- a/security/antivir-milter/files/patch-init::rc.avmilter
+++ b/security/antivir-milter/files/patch-script::rc.avmilter
@@ -1,15 +1,15 @@
---- init/rc.avmilter.orig	Sun Sep 21 19:51:22 2003
-+++ init/rc.avmilter	Sun Sep 21 20:22:38 2003
+--- script/rc.avmilter.orig	Sun Sep 21 19:51:22 2003
++++ script/rc.avmilter	Sun Sep 21 20:22:38 2003
 @@ -13,13 +13,19 @@
  
  case "$1" in
      start)
 -		echo "Starting AntiVir Milter."
 -		/usr/lib/AntiVir/avmilter.bin
-+		if [ -x %%PREFIX%%/sbin/avmilter ]; then
++		if [ -x %%PREFIX%%/sbin/avmilter.bin ]; then
 +			umask 0077
 +			/bin/rm -f /var/spool/avmilter/avmilter.sock
-+			/usr/sbin/daemon -f %%PREFIX%%/sbin/avmilter \
++			/usr/sbin/daemon -f %%PREFIX%%/sbin/avmilter.bin \
 +				-P %%PREFIX%%/etc/avmilter \
 +				-p local:/var/spool/avmilter/avmilter.sock &
 +			umask 0022
@@ -20,7 +20,7 @@
 -		echo -n "Shutting down AntiVir Milter."
 -		killall -TERM /usr/lib/AntiVir/avmilter.bin > /dev/null 2>&1
 -		echo
-+		killall -TERM avmilter > /dev/null 2>&1
++		killall -TERM avmilter.bin > /dev/null 2>&1
 +		echo -n " avmilter"
  		;;
      restart)
@@ -30,7 +30,7 @@
          	;;
      status)
 -		if [ -z "$(ps axw | grep "/usr/lib/AntiVir/avmilter.bin" | grep -v grep)" ]
-+		if [ -z "$(ps axw | grep "avmilter" | grep -v grep)" ]
++		if [ -z "$(ps axw | grep "avmilter.bin" | grep -v grep)" ]
                  then
                          echo "FAILED avmilter is not running!"
                  else        
diff --git a/security/antivir-milter/pkg-descr b/security/antivir-milter/pkg-descr
index a7c13602fddc..c817dcee204b 100644
--- a/security/antivir-milter/pkg-descr
+++ b/security/antivir-milter/pkg-descr
@@ -18,9 +18,7 @@ Functions:
 - Immediate activation, if new virus definition file (.VDF) is available
 - Heuristic macro-virus detection
 - Modifiable templates to create own alert messages
-- Scanning in archives (27 formats are supported)
-
-AntiVir Milter is free of charge for private (individual, non-commercial) use.
+- Scanning in archives (28 formats are supported)
 
 http://www.free-av.de/cgi-bin/ubb/ultimatebb.cgi (Support English/German)
 http://www.antivir.de/ (German)
diff --git a/security/antivir-milter/pkg-message b/security/antivir-milter/pkg-message
index ed87bf2ea145..59d9fcfb91b4 100644
--- a/security/antivir-milter/pkg-message
+++ b/security/antivir-milter/pkg-message
@@ -25,15 +25,4 @@ cp hbedv.key %%PREFIX%%/AntiVir/
 chown root:smmsp %%PREFIX%%/AntiVir/hbedv.key
 chmod 440 %%PREFIX%%/AntiVir/hbedv.key
 
-A license key for private (individual, non-commercial) use can be applied
-for free of charge at:
-http://free-av.de/unixreg_form_de.htm (German)
-http://free-av.com/unixreg_form_en.htm (English)
-
-Note:	AntiVir Milter 1.1.0-7 ships with a faulty anti-virus engine which
-	may just exit with the following error when trying to start it:
-	cannot access config file "/etc/avguard.conf"
-	Please update to the latest anti-virus engine by e.g. running the
-	antivirupdater script in order to solve this.
-
 ===========================================================================
diff --git a/security/antivir-milter/pkg-plist b/security/antivir-milter/pkg-plist
index 494034b8008b..0e32b7f4b4ff 100644
--- a/security/antivir-milter/pkg-plist
+++ b/security/antivir-milter/pkg-plist
@@ -31,7 +31,7 @@ etc/rc.d/avmilter.sh
 etc/rc.d/avupdater.sh-dist_avmilter
 @unexec if [ -f %B/avupdater.sh ]; then echo "If permanently deleting this package, %B/avupdater.sh must be removed manually."; fi
 sbin/antivirupdater
-sbin/avmilter
+sbin/avmilter.bin
 @exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter
 @exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/incoming
 @exec install -d -o smmsp -g smmsp -m 700 /var/spool/avmilter/outgoing
@@ -88,8 +88,7 @@ sbin/avmilter
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.DE
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README.gpg
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/avmilter_de.pdf
 %%PORTDOCS%%%%DOCSDIR%%/avmilter_en.pdf
-%%PORTDOCS%%%%DOCSDIR%%/antivir.gpg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%