Update to 1.1.0-3 which amongst several fixes and some minor new features

brings native binaries for FreeBSD/i386 5-STABLE. For a complete list of
changes since 1.1 please see the installed ChangeLog.

Approved by:	netchild

5 files changed, 120 insertions, 13 deletions

diff --git a/security/antivir-milter/files/patch-doc::MANUAL b/security/antivir-milter/files/patch-doc::MANUAL
index 0ea99b9..86cc5aa 100644
--- a/security/antivir-milter/files/patch-doc::MANUAL
+++ b/security/antivir-milter/files/patch-doc::MANUAL
@@ -22,7 +22,7 @@
 +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
+-	# chown uucp:antivir /usr/lib/AntiVir/avmgate.key
 +	# cp hbedv.key %%PREFIX%%/AntiVir/
 +	# chown root:smmsp %%PREFIX%%/AntiVir/hbedv.key
 +	# chmod 440 %%PREFIX%%/AntiVir/hbedv.key
@@ -37,7 +37,7 @@
 +%%PREFIX%%/etc/avmilter/avmilter.conf:
  
 -# User				uucp
--# Group				uucp
+-# Group				antivir
 +# User				smmsp
 +# Group				smmsp
  # Postmaster			postmaster
diff --git a/security/antivir-milter/files/patch-etc::avmilter.conf b/security/antivir-milter/files/patch-etc::avmilter.conf
index 7b22e19..aab271c 100644
--- a/security/antivir-milter/files/patch-etc::avmilter.conf
+++ b/security/antivir-milter/files/patch-etc::avmilter.conf
@@ -5,7 +5,7 @@
  # AntiVir Milter will run as the specified user and group.
  
 -# User                            uucp 
--# Group                           uucp
+-# Group                           antivir
 +User                              smmsp
 +Group                             smmsp
  
diff --git a/security/antivir-milter/files/patch-init::rc.avmilter b/security/antivir-milter/files/patch-init::rc.avmilter
index 9498783..487c3d6 100644
--- a/security/antivir-milter/files/patch-init::rc.avmilter
+++ b/security/antivir-milter/files/patch-init::rc.avmilter
@@ -18,8 +18,9 @@
  		;;
      stop)
 -		echo -n "Shutting down AntiVir Milter."
- 		killall -TERM avmilter
+-		killall -TERM /usr/sbin/avmilter > /dev/null 2>&1
 -		echo
++		killall -TERM avmilter > /dev/null 2>&1
 +		echo -n " avmilter"
  		;;
      restart)
diff --git a/security/antivir-milter/files/patch-script::avq b/security/antivir-milter/files/patch-script::avq
index dcde2cf..cc77b10 100644
--- a/security/antivir-milter/files/patch-script::avq
+++ b/security/antivir-milter/files/patch-script::avq
@@ -1,15 +1,15 @@
 --- script/avq.orig	Sat Oct 11 13:26:02 2003
 +++ script/avq	Sat Oct 11 13:31:54 2003
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #******************************************************************************
  
 -configuration=/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`"
-@@ -49,6 +49,15 @@
+ 
+ for arg ;
+ do
+@@ -68,6 +68,15 @@
  systeme="`uname`"
  date_param="-d"
  
@@ -24,8 +24,8 @@
 +
  usage() {
      echo "${pname} usage:"
-     echo "    ${pname} [--queue=DIR] "
-@@ -124,7 +133,7 @@
+     echo "    ${pname} [--conf=.conf] "
+@@ -149,7 +158,7 @@
          data=`/bin/ls "${queue}"/*/[Dd]f-"${id}"`
         echo "ctor: ${ctrl} ${data}" 
          if [ ! -f "${data}" ] ; then
@@ -34,7 +34,7 @@
                   "in queue '$queue'."
              exit 3            
          fi
-@@ -136,9 +145,13 @@
+@@ -161,9 +170,13 @@
          bnam="`basename ${ctrl}`"
          case $newstate in
          R)
@@ -51,7 +51,7 @@
              ;;
          *)
              Qtrl="`echo $bnam|sed -e 's/^.\(.*\)$/'${newstate}'\1/'`"
-@@ -179,7 +192,7 @@
+@@ -204,7 +217,7 @@
              group=`egrep -i '^group' "$configuration"|awk '{print $2;}'`
              if [ -f "${data}" ] ; then
                  if /bin/ls "${queue}"/*/??-"${id}" > /dev/null 2>&1 ; then
diff --git a/security/antivir-milter/files/patch-script::avupdater b/security/antivir-milter/files/patch-script::avupdater
new file mode 100644
index 0000000..2aab655
--- /dev/null
+++ b/security/antivir-milter/files/patch-script::avupdater
@@ -0,0 +1,106 @@
+--- script/avupdater.orig	Thu Nov 25 10:29:31 2004
++++ script/avupdater	Wed Dec  8 15:23:09 2004
+@@ -5,10 +5,8 @@
+ # Copyright (c) 2002-2004 H+BEDV Datentechnik GmbH
+ #
+ 
+-PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin"
+-
+ DAEMONNAME="antivir"
+-AVDIR="/usr/lib/AntiVir"
++AVDIR="%%PREFIX%%/AntiVir"
+ 
+ DAEMON="$AVDIR/$DAEMONNAME"
+ 
+@@ -41,6 +39,17 @@
+ 	PROCESSLIST=""
+ 
+ 	case "${OS}" in
++		freebsd)
++			# Work around bug in some versions of ps(1) where
++			# `ps -o 'pid= command='` doesn't work.
++			for PROC in `ps axw -o 'pid=' -o 'command=' | grep ${DAEMONNAME}.*[-]-updater-daemon`
++			do
++				if [ -z "`$ECHO ${PROC} | sed -e s/[0-9]//g`" ]
++				then
++					PROCESSLIST="${PROCESSLIST} ${PROC}"
++				fi
++			done
++			;;
+ 		sunos)
+ 			for PROC in `ps -Ao pid,args | grep ${DAEMONNAME}.*[-]-updater-daemon`
+ 			do
+@@ -64,63 +73,41 @@
+ 
+ case "$1" in
+ 	start)
+-		$ECHO -n "Starting AntiVir: avupdater"
+-
+-		if [ ! -x "$DAEMON" ]
+-		then
+-			$ECHO " (FAILED)"
+-			$ECHO " "
+-			$ECHO "error: $DAEMON is missing"
+-			$ECHO " "
+-			exit 1
+-		fi
+-
+-		$DAEMON --updater-daemon -q
+-
+-		if [ $? -ne 0 ]
+-		then
+-			$ECHO " (FAILED)"
+-			$ECHO " "
+-			$ECHO "error: $DAEMONNAME failed to start"
+-			$ECHO "See log files for details."
+-			$ECHO " "
+-			exit 1
++		if [ -x "$DAEMON" ]; then
++			$DAEMON --updater-daemon -q \
++				-C %%PREFIX%%/etc/antivir.conf
++			if [ $? -eq 0 ]; then
++				$ECHO -n " avupdater"
++			fi
+ 		fi
+-
+-		$ECHO "."
+ 		;;
+ 	stop)
+-		$ECHO -n "Stopping AntiVir: avupdater"
+-
+ 		getPROCESSLIST
+ 		for PROC in $PROCESSLIST
+ 		do
+ 			kill -15 $PROC
+ 		done
+ 
+-		$ECHO "."
++		$ECHO -n " avupdater"
+ 		;;
+ 	restart)
+ 		$0 stop
+ 		$0 start
+ 		;;
+ 	status)
+-		$ECHO -n "AntiVir Status: avupdater "
+-
+ 		getPROCESSLIST
+ 		if [ ! -z "$PROCESSLIST" ]
+ 		then
+-			$ECHO -n "(running)"
++			$ECHO "OK avupdater is running!"
+ 			RC=0
+ 		else
+-			$ECHO -n "(not running)"
++			$ECHO "FAILED avupdater is not running!"
+ 			RC=3
+ 		fi
+-		$ECHO "."
+ 		exit $RC
+ 		;;
+ 	*)
+-		$ECHO "usage: $0 {start|stop|restart|status}"
++		$ECHO "Usage: `basename $0` {start|stop|restart|status}" >&2
+ 		exit 1
+ 		;;
+ esac