do not look at /etc/postfix/*.conf on installation

2 files changed, 59 insertions, 13 deletions

diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
index 387497e3d61..8f6a41de566 100644
--- a/mail/postfix-current/files/patch-sum
+++ b/mail/postfix-current/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/08/14 06:56:55 itojun Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/14 11:26:46 itojun Exp $
 
-MD5 (patch-aa) = 68ffad3419a83994f0813e7b96798435
+MD5 (patch-aa) = 357c00b48cea63e8ee9dec43bbe6a210
 MD5 (patch-af) = f441d8a6613df506f8fbe9b87537035e
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index 7dbf58bcdd1..f0fa6f5e23b 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,7 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
---- INSTALL.sh.orig	Mon Aug 14 15:47:00 2000
-+++ INSTALL.sh	Mon Aug 14 15:47:55 2000
-@@ -8,35 +8,35 @@
+$NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
+--- INSTALL.sh.orig	Mon Aug 14 19:32:38 2000
++++ INSTALL.sh	Mon Aug 14 19:33:07 2000
+@@ -6,39 +6,39 @@
+ PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc
+ umask 022
  
 -cat <<EOF
 -
@@ -70,7 +72,11 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 +#
 +#EOF
  
-@@ -106,15 +106,12 @@
+ # By now, shells must have functions. Ultrix users must use sh5 or lose.
+ # The following shell functions replace files/symlinks while minimizing
+@@ -104,34 +104,31 @@
+ 
+ install_root=/
  tempdir=`pwd`
 -config_directory=/etc/postfix
 -daemon_directory=/usr/libexec/postfix
@@ -93,7 +99,7 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 -manpages=/usr/local/man
 +manpages=__PREFIX/man
  
-@@ -122,14 +119,14 @@
+ # Find out the location of configuration files.
  
 -for name in install_root tempdir config_directory
 -do
@@ -120,7 +126,29 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 +#    done
 +#done
  
-@@ -166,16 +163,16 @@
+ # Sanity checks
+ 
+@@ -153,31 +150,31 @@
+ 
+ CONFIG_DIRECTORY=$install_root$config_directory
+ 
+-test -f $CONFIG_DIRECTORY/main.cf && {
+-    for name in daemon_directory command_directory queue_directory mail_owner 
+-    do
+-	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
+-    done
+-}
++#test -f $CONFIG_DIRECTORY/main.cf && {
++#    for name in daemon_directory command_directory queue_directory mail_owner 
++#    do
++#	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
++#    done
++#}
+ 
+-test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
++#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
+ 
+ # Override default settings.
  
 -for name in daemon_directory command_directory \
 -    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
@@ -151,7 +179,11 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 +#    done
 +#done
  
-@@ -227,6 +224,6 @@
+ # Sanity checks
+ 
+@@ -225,10 +222,10 @@
+ 
+ DAEMON_DIRECTORY=$install_root$daemon_directory
  COMMAND_DIRECTORY=$install_root$command_directory
 -QUEUE_DIRECTORY=$install_root$queue_directory
 +QUEUE_DIRECTORY=$queue_directory
@@ -161,19 +193,31 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 +#NEWALIASES_PATH=$install_root$newaliases_path
 +#MAILQ_PATH=$install_root$mailq_path
  MANPAGES=$install_root$manpages
-@@ -239,3 +236,3 @@
+ 
+ # Create any missing directories.
+@@ -237,7 +234,7 @@
+ test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
+ test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1
  test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1
 -for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH
 +for path in $SENDMAIL_PATH
  do
-@@ -259,4 +256,4 @@
+     dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'`
+     test -d $dir || mkdir -p $dir || exit 1
+@@ -257,8 +254,8 @@
+ 
+ test -f bin/sendmail && {
      compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1
 -    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
 -    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
 +#    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
 +#    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
  }
-@@ -292,9 +289,9 @@
+ 
+ if [ -f $CONFIG_DIRECTORY/main.cf ]
+@@ -290,13 +287,13 @@
+     "mail_owner = $mail_owner" \
+ || exit 1
  
 -(echo "# This file was generated by $0"
 -for name in sendmail_path newaliases_path mailq_path setgid manpages
@@ -190,3 +234,5 @@ $NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
 +#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1
 +#rm -f $tempdir/junk
  
+ # Use set-gid privileges instead of writable maildrop (optional).
+