Index: head/security/amavisd-new/files/DEINSTALL.tmpl
===================================================================
--- head/security/amavisd-new/files/DEINSTALL.tmpl	(revision 72492)
+++ head/security/amavisd-new/files/DEINSTALL.tmpl	(revision 72493)
@@ -1,62 +1,31 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.1 2003-01-04 07:20:30 demon Exp $
-#
-
-USER=%%AMAVISUSER%%
-GROUP=%%AMAVISGROUP%%
-DIR=%%AMAVISDIR%%
-QUARANTINE=%%AMAVISQUARANTINE%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-
-    if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
-	/usr/sbin/pw groupdel ${GROUP}
-	echo "Deleted group \"${GROUP}\"."
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
-	/usr/sbin/pw userdel ${USER}
-	echo "Deleted user \"${USER}\"."
-    fi
-
-    if [ -e ${DIR} ]; then
-	/bin/rm -rf ${DIR}
-	echo "Deleted \"${DIR}\" directory."
-    fi
-    
-    if [ -e ${QUARANTINE} ]; then
-      echo "You should manually remove the \"${QUARANTINE}\" directory."
-    fi
-fi
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.1 2003-01-04 07:20:30 demon Exp $
+#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.2 2003-01-04 10:59:25 demon Exp $
 #
 
 USER=%%AMAVISUSER%%
 GROUP=%%AMAVISGROUP%%
 DIR=%%AMAVISDIR%%
 QUARANTINE=%%AMAVISQUARANTINE%%
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 
     if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
 	/usr/sbin/pw groupdel ${GROUP}
 	echo "Deleted group \"${GROUP}\"."
     fi
 
     if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
 	/usr/sbin/pw userdel ${USER}
 	echo "Deleted user \"${USER}\"."
     fi
 
     if [ -e ${DIR} ]; then
 	/bin/rm -rf ${DIR}
 	echo "Deleted \"${DIR}\" directory."
     fi
     
     if [ -e ${QUARANTINE} ]; then
       echo "You should manually remove the \"${QUARANTINE}\" directory."
     fi
 fi

Property changes on: head/security/amavisd-new/files/DEINSTALL.tmpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/security/amavisd-new/files/INSTALL.tmpl
===================================================================
--- head/security/amavisd-new/files/INSTALL.tmpl	(revision 72492)
+++ head/security/amavisd-new/files/INSTALL.tmpl	(revision 72493)
@@ -1,92 +1,46 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/INSTALL.tmpl,v 1.1 2003-01-04 07:20:30 demon Exp $
-#
-
-USER=%%AMAVISUSER%%
-GROUP=%%AMAVISGROUP%%
-DIR=%%AMAVISDIR%%
-QUARANTINE=%%AMAVISQUARANTINE%%
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-	if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-    else
-	if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-	   -d ${DIR} \
-	   -s /bin/sh \
-	   -c "Scanning Virus Account"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    fi
-
-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}
-    echo "Created \"${DIR}\" directory."
-    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE}
-    echo "Created \"${QUARANTINE}\" directory."    
-fi
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/INSTALL.tmpl,v 1.1 2003-01-04 07:20:30 demon Exp $
+#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/INSTALL.tmpl,v 1.2 2003-01-04 10:59:25 demon Exp $
 #
 
 USER=%%AMAVISUSER%%
 GROUP=%%AMAVISGROUP%%
 DIR=%%AMAVISDIR%%
 QUARANTINE=%%AMAVISQUARANTINE%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
     if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	echo "You already have a group \"${GROUP}\", so I will use it."
     else
 	if /usr/sbin/pw groupadd ${GROUP} -h -
 	then
 	    echo "Added group \"${GROUP}\"."
 	else
 	    echo "Adding group \"${GROUP}\" failed..."
 	    echo "Please create it, and try again."
 	    exit 1
 	fi
     fi
 
     if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	echo "You already have a user \"${USER}\", so I will use it."
     else
 	if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
 	   -d ${DIR} \
 	   -s /bin/sh \
 	   -c "Scanning Virus Account"
 	then
 	    echo "Added user \"${USER}\"."
 	else
 	    echo "Adding user \"${USER}\" failed..."
 	    echo "Please create it, and try again."
 	    exit 1
 	fi
     fi
 
     /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}
     echo "Created \"${DIR}\" directory."
     /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE}
     echo "Created \"${QUARANTINE}\" directory."    
 fi

Property changes on: head/security/amavisd-new/files/INSTALL.tmpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/security/amavisd-new/files/MESSAGE.tmpl
===================================================================
--- head/security/amavisd-new/files/MESSAGE.tmpl	(revision 72492)
+++ head/security/amavisd-new/files/MESSAGE.tmpl	(revision 72493)
@@ -1,30 +1,15 @@
 
 *******************************************************************
  To use amavisd-new, you need to install at least one virus scanner.
  For example McAfee VirusScan is available as a FreeBSD port
  in /usr/ports/security/vscan. If you want to use the amavis sendmail
  milter interface, you need to type the following command:
 
 	touch %%AMAVISDIR%%/use.milter
 
  A configuration template is available in %%PREFIX%%/etc
  as amavisd.conf-dist. Copy it to amavisd.conf and edit it to
  suit your needs. Documentation is available in
  %%DOCSDIR%%.
 *******************************************************************
 
-
-*******************************************************************
- To use amavisd-new, you need to install at least one virus scanner.
- For example McAfee VirusScan is available as a FreeBSD port
- in /usr/ports/security/vscan. If you want to use the amavis sendmail
- milter interface, you need to type the following command:
-
-	touch %%AMAVISDIR%%/use.milter
-
- A configuration template is available in %%PREFIX%%/etc
- as amavisd.conf-dist. Copy it to amavisd.conf and edit it to
- suit your needs. Documentation is available in
- %%DOCSDIR%%.
-*******************************************************************
-

Property changes on: head/security/amavisd-new/files/MESSAGE.tmpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/security/amavisd-new/files/amavisd.sh.tmpl
===================================================================
--- head/security/amavisd-new/files/amavisd.sh.tmpl	(revision 72492)
+++ head/security/amavisd-new/files/amavisd.sh.tmpl	(revision 72493)
@@ -1,74 +1,37 @@
 #!/bin/sh
 
 if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
 	echo "$0: Cannot determine the PREFIX" >&2
 	exit 1
 fi
 
 DIR=%%AMAVISDIR%%
 PIDFILE=$DIR/amavisd.pid
 CONFIGFILE=${PREFIX}/etc/amavisd.conf
 SOCKFILES=$DIR/amavis*.sock
 MILTERFLAG=$DIR/use.milter
 
 case "$1" in
 start)
 	if [ -e ${PREFIX}/etc/amavisd.conf ]; then
 		rm -rf ${SOCKFILES}
 		if [ -e $MILTERFLAG ]; then
 			su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavis-milter -D -p $DIR/amavis-milter.sock"
 		fi
 		su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd -c ${CONFIGFILE} > /dev/null 2>&1" && echo -n ' amavisd'
 	fi
 	;;
 stop)
 	if [ -e $MILTERFLAG ]; then
 		killall -u %%AMAVISUSER%% amavis-milter >/dev/null 2>&1
 	fi
 	if [ -e $PIDFILE ]; then
 		su %%AMAVISUSER%% -c "kill `cat $PIDFILE`" && echo -n ' amavisd'
 	fi
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
 	;;
 esac
 
 exit 0
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-	echo "$0: Cannot determine the PREFIX" >&2
-	exit 1
-fi
-
-DIR=%%AMAVISDIR%%
-PIDFILE=$DIR/amavisd.pid
-CONFIGFILE=${PREFIX}/etc/amavisd.conf
-SOCKFILES=$DIR/amavis*.sock
-MILTERFLAG=$DIR/use.milter
-
-case "$1" in
-start)
-	if [ -e ${PREFIX}/etc/amavisd.conf ]; then
-		rm -rf ${SOCKFILES}
-		if [ -e $MILTERFLAG ]; then
-			su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavis-milter -D -p $DIR/amavis-milter.sock"
-		fi
-		su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd -c ${CONFIGFILE} > /dev/null 2>&1" && echo -n ' amavisd'
-	fi
-	;;
-stop)
-	if [ -e $MILTERFLAG ]; then
-		killall -u %%AMAVISUSER%% amavis-milter >/dev/null 2>&1
-	fi
-	if [ -e $PIDFILE ]; then
-		su %%AMAVISUSER%% -c "kill `cat $PIDFILE`" && echo -n ' amavisd'
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0

Property changes on: head/security/amavisd-new/files/amavisd.sh.tmpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/security/amavisd-new/files/patch-amavisd.conf
===================================================================
--- head/security/amavisd-new/files/patch-amavisd.conf	(revision 72492)
+++ head/security/amavisd-new/files/patch-amavisd.conf	(revision 72493)
@@ -1,70 +1,35 @@
 --- amavisd.conf.orig	Fri Dec 27 16:04:17 2002
 +++ amavisd.conf	Fri Jan  3 22:29:45 2003
 @@ -36,11 +36,11 @@
  #
  
  # Set the user and group to which the daemon will change when started as root:
 -$daemon_user  = 'amavis';	# (no default;  customary: vscan or amavis)
 -$daemon_group = 'amavis';	# (no default)
 +$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
 +$daemon_group = '%%AMAVISGROUP%%';	# (no default)
  
  # Runtime directory (no trailing slash, defaults to '/var/amavis')
 -$TEMPBASE = '/var/amavis';
 +$TEMPBASE = '%%AMAVISDIR%%';
  
  
  # MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025'
 @@ -309,7 +309,7 @@
  #   or a directory (no trailing slash)
  # (the default value is undef, meaning no quarantine)
  #
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
  
  
  # A finer control of quarantining is available through variable
 @@ -638,7 +638,7 @@
  # a hash lookup table can be read from a file,
  # one address per line, comments and empty lines are permitted:
  #
 -read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
 +#read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
  
  # ... or set directly:
  map { $whitelist_sender{lc($_)}=1 } (qw(
---- amavisd.conf.orig	Fri Dec 27 16:04:17 2002
-+++ amavisd.conf	Fri Jan  3 22:29:45 2003
-@@ -36,11 +36,11 @@
- #
- 
- # Set the user and group to which the daemon will change when started as root:
--$daemon_user  = 'amavis';	# (no default;  customary: vscan or amavis)
--$daemon_group = 'amavis';	# (no default)
-+$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
-+$daemon_group = '%%AMAVISGROUP%%';	# (no default)
- 
- # Runtime directory (no trailing slash, defaults to '/var/amavis')
--$TEMPBASE = '/var/amavis';
-+$TEMPBASE = '%%AMAVISDIR%%';
- 
- 
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025'
-@@ -309,7 +309,7 @@
- #   or a directory (no trailing slash)
- # (the default value is undef, meaning no quarantine)
- #
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
- 
- 
- # A finer control of quarantining is available through variable
-@@ -638,7 +638,7 @@
- # a hash lookup table can be read from a file,
- # one address per line, comments and empty lines are permitted:
- #
--read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
-+#read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
- 
- # ... or set directly:
- map { $whitelist_sender{lc($_)}=1 } (qw(

Property changes on: head/security/amavisd-new/files/patch-amavisd.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property