- Update to 1.1 (final). For changes since 1.1-beta see the ChangeLog

  in the DOCSDIR.
- Rename the start script from antivir-milter.sh to avmilter.sh to be
  consistent with naming of the rest of the installed AntiVir Milter
  files and directories.
- Now that AntiVir Milter supports using a different location from
  /etc for the ignore, scan and warn config files no longer install
  them in the EXAMPLESDIR but in PREFIX/etc/avmilter (i.e. install
  as sample files, copy over when not already existent, etc.).
- Change the location of the AntiVir Milter config file (avmilter.conf)
  but not that of the scan engine (antivir.conf; shared between different
  AntiVir products) from PREFIX/etc to PREFIX/etc/avmilter in order to
  have all AntiVir Milter config files in one place but don't directly
  populate PREFIX/etc with them.

If you had previously changed PREFIX/etc/avmilter.conf you have to
bring over your changes to PREFIX/etc/avmilter/avmilter.conf but note
that some variables have been renamed. If you used ignore, scan and/or
warn files in /etc you can now move them to PREFIX/etc/avmilter.

Approved by:	netchild

5 files changed, 115 insertions, 86 deletions

diff --git a/security/antivir-milter/files/patch-doc::MANUAL b/security/antivir-milter/files/patch-doc::MANUAL
index b1493ce..0ea99b9 100644
--- a/security/antivir-milter/files/patch-doc::MANUAL
+++ b/security/antivir-milter/files/patch-doc::MANUAL
@@ -1,11 +1,11 @@
 --- doc/MANUAL.orig	Wed Jan 28 11:48:04 2004
 +++ doc/MANUAL	Mon Mar  1 01:08:06 2004
-@@ -3,39 +3,39 @@
+@@ -24,37 +24,38 @@
  
  To start, stop, restart AntiVir Milter:
  
 -	# /usr/sbin/rcavmilter [start|stop|status|restart]
-+	# %%PREFIX%%/etc/rc.d/antivir-milter.sh [start|stop|status|restart]
++	# %%PREFIX%%/etc/rc.d/avmilter.sh [start|stop|status|restart]
  
  When executed successfully, a message from AntiVir Milter with
  the scan engine version and VDF version is present in the log file
@@ -16,60 +16,51 @@
  2. Copying the license file 
  ---------------------------
  
- If you have a license file for commercial or privat user,
--copy the license file *.key to the folder /usr/lib/AntiVir and 
+-Copy the license file *.key to the folder /usr/lib/AntiVir and 
 -set the access rights of user and group to default uucp:
--
++Copy the license file *.key to the folder %%PREFIX%%/AntiVir and 
++set the access rights of user root and group to smmsp:
+ 
 -	# cp hbedv.key /usr/lib/AntiVir/
 -	# chown uucp:uucp /usr/lib/AntiVir/avmgate.key
-+copy the license file *.key to the folder %%PREFIX%%/AntiVir and 
-+set the access rights of user root and group smmsp:
- 
 +	# cp hbedv.key %%PREFIX%%/AntiVir/
 +	# chown root:smmsp %%PREFIX%%/AntiVir/hbedv.key
 +	# chmod 440 %%PREFIX%%/AntiVir/hbedv.key
  
+ 
  3. Configuring AntiVir Milter
  -----------------------------
  
 -AntiVir Milter provides the configuration file /etc/avmilter.conf:
-+AntiVir Milter provides the configuration file %%PREFIX%%/etc/avmilter.conf:
- The following directives are available:
- 
--# User                            uucp
--# Group                           uucp
-+# User                            smmsp
-+# Group                           smmsp
- # Postmaster                      postmaster
- # MyHostName                      localhost
- # SpoolDir                        /var/spool/avmilter
--# AntiVirDir                      /usr/lib/AntiVir
-+# AntiVirDir                      %%PREFIX%%/AntiVir
- # TemporaryDir                    /var/tmp
- # MinFreeBlocks                   100
--# ForwardTo                       /usr/lib/sendmail -oem -oi
-+# ForwardTo                       /usr/sbin/sendmail -oem -oi
- # MaxNestingLevel                 20
- # MaxAttachments                  100
- # BlockSuspiciousMime             NO
-@@ -43,7 +43,7 @@
- # VirusAlertToRcpt                NO
- # VirusAlertToSender              NO
- # VirusAlertToPostmaster          YES
--# VirusAlertsUser                 AntiVir
-+# VirusAlertsUser                 MAILER-DAEMON
- # RejectVirusMail                 NO
- # ScanInArchive                   YES
- # ArchiveMaxSize		  0
-@@ -64,21 +64,21 @@
- # LogFile			  NO
- # MaxRecipientsPerMessage	  100
- 
--For a detailed description see /etc/avmilter.conf.
-+For a detailed description see %%PREFIX%%/etc/avmilter.conf.
- 
- 
- 4. Configuring automatic update
+-The following directives are available:
++AntiVir Milter provides the following directives in the configuration file
++%%PREFIX%%/etc/avmilter/avmilter.conf:
+ 
+-# User				uucp
+-# Group				uucp
++# User				smmsp
++# Group				smmsp
+ # Postmaster			postmaster
+ # MyHostName			localhost
+ # SpoolDir			/var/spool/avmilter
+-# AntiVirDir			/usr/lib/AntiVir
++# AntiVirDir			%%PREFIX%%/AntiVir
+ # TemporaryDir			/var/tmp
+-# ForwardTo			/usr/lib/sendmail -oem -oi
++# ForwardTo			/usr/sbin/sendmail -oem -oi
+ # MaxNestingLevel		same as ArchiveMaxRecursion
+ # MaxAttachments		100
+ # BlockSuspiciousMime		NO
+@@ -62,7 +63,7 @@
+ # ExposeRecipientAlerts		NO
+ # ExposeSenderAlerts		NO
+ # ExposePostmasterAlerts	YES
+-# AlertsUser			AntiVir
++# AlertsUser			MAILER-DAEMON
+ # RejectAlertMail		NO
+ # QuarantineAlert		YES
+ # ScanInArchive			YES
+@@ -93,13 +94,13 @@
  -------------------------------
  
  Add the following line for a daily update at e.g. 0:25 a.m.:
@@ -80,29 +71,23 @@
  in the file antivir.conf.
  
 -The file /etc/antivir.conf contains settable parameters effecting
--the automatic virus protection updates. The following directives 
--are provided:
+-the automatic protection updates. The following directives 
 +The file %%PREFIX%%/etc/antivir.conf contains settable parameters
-+effecting the automatic virus protection updates. The following
-+directives are provided:
- 
- # EmailTo            root@localhost
- # LogTo              /var/log/antivir.log
-@@ -88,10 +88,10 @@
- # HTTPProxyPassword  password
- # SyslogFacility     user
- # SyslogPriority     notice
++effecting the automatic protection updates. The following directives
+ are provided:
+ 
+ # EmailTo            	root@localhost
+@@ -113,7 +114,7 @@
+ # HTTPProxyPassword  	password
+ # SyslogFacility     	user
+ # SyslogPriority     	notice
 -# GnuPGBinary
-+# GnuPGBinary        %%PREFIX%%/bin/gpg
++# GnuPGBinary		%%LOCALBASE%%/bin/gpg
  # GnuPGOptions
- 
--For a detailled description see /etc/avmilter.conf.
-+For a detailled description see %%PREFIX%%/etc/avmilter.conf.
- 
- 
- 5. Notification Templates
-@@ -101,7 +101,7 @@
- have the possibility to define your own text in virus and
+ # DetectDialer
+ # DetectJoke
+@@ -133,7 +134,7 @@
+ you have the possibility to define your own text in alert and
  pathological notification mails.
  
 -The directory /usr/lib/AntiVir/templates contains the 
@@ -110,3 +95,32 @@
  following files:
  
  	patho-administrator
+@@ -190,14 +191,15 @@
+ will be printed to syslog:
+ (avmilter[1234]: Mail from foo@bar.tld to john@doe.tld will be scanned!)
+ 
+-The tables are: /etc/avmilter.scan and /etc/avmilter.ignore.
++The tables are: %%PREFIX%%/etc/avmilter/avmilter.scan and
++%%PREFIX%%/etc/avmilter/avmilter.ignore.
+ Example files are included in this package.
+ Each table consists of an address that contains regular expressions
+ and one and/or two flags:
+ 
+ Examples:
+ ----------------------
+-/etc/avmilter.scan:
++avmilter.scan:
+ The i is an option for the regexp and it means ignore case.
+ 
+ #The following matches exactly the *recipient* address "foo@bar.tld"
+@@ -298,8 +300,8 @@
+ 11. Notice Mail Restrictions
+ ------------------------
+ 
+-In the /etc/avmilter.warn file one can specify who receives a
+-mail in case of an alert.
++In the %%PREFIX%%/etc/avmilter/avmilter.warn file one can specify
++who receives a mail in case of an alert.
+ The definition there is used instead of the definition in the
+ avmilter.conf (Expose*Alerts).
+ 
diff --git a/security/antivir-milter/files/patch-etc::avmilter.conf b/security/antivir-milter/files/patch-etc::avmilter.conf
index 71a0e52..7b22e19 100644
--- a/security/antivir-milter/files/patch-etc::avmilter.conf
+++ b/security/antivir-milter/files/patch-etc::avmilter.conf
@@ -20,7 +20,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -66,7 +66,7 @@
+@@ -65,7 +65,7 @@
  # Select the directory and binary of sendmail and the arguments how to 
  # call sendmail. 
  
@@ -29,7 +29,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -93,7 +93,7 @@
+@@ -85,7 +85,7 @@
  # Block mails which are coded as a fragmented message.
  # "Message Fragmentation and Reassembly" (RFC2046, section 5.2.2.1).
  
@@ -38,15 +38,15 @@
  
  
  # ------------------------------------------------------------------------
-@@ -121,6 +121,7 @@
- # VirusAlertsUser                 AvMilter
+@@ -113,6 +113,7 @@
+ # AlertsUser                 AvMilter
  # or
- # VirusAlertsUser             someone@anywhere.tld
-+VirusAlertsUser                 MAILER-DAEMON
+ # AlertsUser             someone@anywhere.tld
++AlertsUser             MAILER-DAEMON
  
  
  # ------------------------------------------------------------------------
-@@ -171,7 +172,7 @@
+@@ -183,7 +184,7 @@
  # If BlockSuspiciousArchive is YES, stop delivery of mails
  # containing archives if ArchiveMaxRecursion has been reached.
  
@@ -55,7 +55,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -181,7 +182,7 @@
+@@ -193,7 +194,7 @@
  # If BlockEncryptedArchive is YES, stop delivery of mails 
  # containing encrypted files in an archive.
  
@@ -64,7 +64,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -189,7 +190,7 @@
+@@ -201,7 +202,7 @@
  # to the header of checked mail. E.g.: "X-AntiVirus: Checked by ..."
  # This option is only available in commercial mode.    
  
@@ -73,7 +73,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -204,7 +205,7 @@
+@@ -216,7 +217,7 @@
  # ScanTimeout specifies the scan time of mail, in seconds, when to stop  
  # scanning of mails. 
  
@@ -82,7 +82,7 @@
  
  
  # ------------------------------------------------------------------------
-@@ -213,6 +214,11 @@
+@@ -224,6 +225,11 @@
  # rejected message.
  
  # ExternalProgram             /dir/my_own_script
diff --git a/security/antivir-milter/files/patch-init::rc.avmilter b/security/antivir-milter/files/patch-init::rc.avmilter
index 485e62a..9498783 100644
--- a/security/antivir-milter/files/patch-init::rc.avmilter
+++ b/security/antivir-milter/files/patch-init::rc.avmilter
@@ -1,31 +1,30 @@
 --- init/rc.avmilter.orig	Sun Sep 21 19:51:22 2003
 +++ init/rc.avmilter	Sun Sep 21 20:22:38 2003
-@@ -14,20 +14,27 @@
+@@ -15,13 +15,19 @@
  
  case "$1" in
      start)
 -		echo "Starting AntiVir Milter."
--		/usr/sbin/avmilter -p inet:3333@localhost
+-		/usr/sbin/avmilter	
 +		if [ -x %%PREFIX%%/sbin/avmilter ]; then
 +			umask 0077
 +			/bin/rm -f /var/spool/avmilter/avmilter.sock
 +			/usr/sbin/daemon -f %%PREFIX%%/sbin/avmilter \
-+				-C %%PREFIX%%/etc/avmilter.conf \
++				-P %%PREFIX%%/etc/avmilter \
 +				-p local:/var/spool/avmilter/avmilter.sock &
 +			umask 0022
-+			echo -n " antivir-milter"
++			echo -n " avmilter"
 +		fi
  		;;
      stop)
 -		echo -n "Shutting down AntiVir Milter."
--		killall -TERM /usr/sbin/avmilter
+ 		killall -TERM avmilter
 -		echo
-+		/usr/bin/killall -TERM avmilter
-+		/bin/rm -f /var/spool/avmilter/avmilter.sock
-+		echo -n " antivir-milter"
++		echo -n " avmilter"
  		;;
      restart)
  	        "$0" stop
+@@ -29,7 +35,7 @@
         		"$0" start
          	;;
      status)
@@ -34,7 +33,7 @@
                  then
                          echo "FAILED avmilter is not running!"
                  else        
-@@ -35,7 +42,7 @@
+@@ -37,7 +43,7 @@
          	fi
  	;;
      *)
diff --git a/security/antivir-milter/files/patch-pgp::README b/security/antivir-milter/files/patch-pgp::README
new file mode 100644
index 0000000..8922c93
--- /dev/null
+++ b/security/antivir-milter/files/patch-pgp::README
@@ -0,0 +1,16 @@
+--- 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-script::avq b/security/antivir-milter/files/patch-script::avq
index e8bf041..dcde2cf 100644
--- a/security/antivir-milter/files/patch-script::avq
+++ b/security/antivir-milter/files/patch-script::avq
@@ -5,7 +5,7 @@
  #******************************************************************************
  
 -configuration=/etc/avmilter.conf
-+configuration=%%PREFIX%%/etc/avmilter.conf
++configuration=%%PREFIX%%/etc/avmilter/avmilter.conf
  queue="`egrep -i '^[Ss][Pp][Oo][Oo][Ll][Dd][Ii][Rr]' ${configuration} | awk '{print $2;}'`"
  queue_set=0
  pname="`basename $0`"