diff options
author | itojun <itojun@pkgsrc.org> | 2000-10-15 14:10:19 +0000 |
---|---|---|
committer | itojun <itojun@pkgsrc.org> | 2000-10-15 14:10:19 +0000 |
commit | d74ef912d974abb5f0c9107f75b77c1743f7987c (patch) | |
tree | 5c94d80272809ffccb538beb98820086ef594fff /mail/postfix-current/patches | |
parent | a21cdf179544db8ec56b72c9c49a834168fc8757 (diff) | |
download | pkgsrc-d74ef912d974abb5f0c9107f75b77c1743f7987c.tar.gz |
use 2000/10/05 + IPv6 patch. changes are really too many to paste here.
mostly SASL related changes, it seems.
Diffstat (limited to 'mail/postfix-current/patches')
-rw-r--r-- | mail/postfix-current/patches/patch-aa | 93 | ||||
-rw-r--r-- | mail/postfix-current/patches/patch-ab | 22 | ||||
-rw-r--r-- | mail/postfix-current/patches/patch-af | 11 |
3 files changed, 39 insertions, 87 deletions
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa index f0fa6f5e23b..94b9d11ef6b 100644 --- a/mail/postfix-current/patches/patch-aa +++ b/mail/postfix-current/patches/patch-aa @@ -1,9 +1,8 @@ -$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 +$NetBSD: patch-aa,v 1.7 2000/10/15 14:10:20 itojun Exp $ + +--- INSTALL.sh.orig Wed Sep 20 22:06:06 2000 ++++ INSTALL.sh Wed Oct 11 11:42:36 2000 +@@ -8,35 +8,35 @@ -cat <<EOF - @@ -72,34 +71,30 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $ +# +#EOF - # 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 --command_directory=/usr/sbin -+config_directory=__PREFIX/share/postfix -+daemon_directory=__PREFIX/libexec/postfix -+command_directory=__PREFIX/sbin - queue_directory=/var/spool/postfix +@@ -110,15 +110,12 @@ + : ${tempdir=`pwd`} +-: ${config_directory=/etc/postfix} +-: ${daemon_directory=/usr/libexec/postfix} +-: ${command_directory=/usr/sbin} ++: ${config_directory=__PREFIX/share/postfix} ++: ${daemon_directory=__PREFIX/libexec/postfix} ++: ${command_directory=__PREFIX/sbin} + : ${queue_directory=/var/spool/postfix} -if [ -f /usr/lib/sendmail ] -- then sendmail_path=/usr/lib/sendmail -- else sendmail_path=/usr/sbin/sendmail +- then : ${sendmail_path=/usr/lib/sendmail} +- else : ${sendmail_path=/usr/sbin/sendmail} -fi --newaliases_path=/usr/bin/newaliases --mailq_path=/usr/bin/mailq -+sendmail_path=__PREFIX/libexec/postfix/sendmail -+#newaliases_path=/usr/bin/newaliases -+#mailq_path=/usr/bin/mailq - mail_owner=postfix - setgid=no --manpages=/usr/local/man -+manpages=__PREFIX/man - - # Find out the location of configuration files. +-: ${newaliases_path=/usr/bin/newaliases} +-: ${mailq_path=/usr/bin/mailq} ++: ${sendmail_path=__PREFIX/libexec/postfix/sendmail} ++#: ${newaliases_path=/usr/bin/newaliases} ++#: ${mailq_path=/usr/bin/mailq} + : ${mail_owner=postfix} + : ${setgid=no} +-: ${manpages=/usr/local/man} ++: ${manpages=__PREFIX/man} + +@@ -126,14 +123,14 @@ -for name in install_root tempdir config_directory -do @@ -126,11 +121,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $ +# done +#done - # Sanity checks - -@@ -153,31 +150,31 @@ - - CONFIG_DIRECTORY=$install_root$config_directory +@@ -159,10 +156,10 @@ -test -f $CONFIG_DIRECTORY/main.cf && { - for name in daemon_directory command_directory queue_directory mail_owner @@ -148,7 +139,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $ -test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf +#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf - # Override default settings. +@@ -170,16 +167,16 @@ -for name in daemon_directory command_directory \ - queue_directory sendmail_path newaliases_path mailq_path mail_owner\ @@ -179,11 +170,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $ +# done +#done - # Sanity checks - -@@ -225,10 +222,10 @@ - - DAEMON_DIRECTORY=$install_root$daemon_directory +@@ -231,6 +228,6 @@ COMMAND_DIRECTORY=$install_root$command_directory -QUEUE_DIRECTORY=$install_root$queue_directory +QUEUE_DIRECTORY=$queue_directory @@ -193,31 +180,19 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $ +#NEWALIASES_PATH=$install_root$newaliases_path +#MAILQ_PATH=$install_root$mailq_path MANPAGES=$install_root$manpages - - # 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 +@@ -243,3 +240,3 @@ 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 - dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'` - test -d $dir || mkdir -p $dir || exit 1 -@@ -257,8 +254,8 @@ - - test -f bin/sendmail && { +@@ -263,4 +260,4 @@ 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 } - - if [ -f $CONFIG_DIRECTORY/main.cf ] -@@ -290,13 +287,13 @@ - "mail_owner = $mail_owner" \ - || exit 1 +@@ -296,9 +293,9 @@ -(echo "# This file was generated by $0" -for name in sendmail_path newaliases_path mailq_path setgid manpages @@ -234,5 +209,3 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 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). - diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab deleted file mode 100644 index 6c424b0ca0e..00000000000 --- a/mail/postfix-current/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2000/10/04 15:22:10 christos Exp $ - ---- makedefs.orig Tue Oct 3 18:47:56 2000 -+++ makedefs Tue Oct 3 19:20:56 2000 -@@ -174,7 +174,7 @@ - *) echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;; - esac;; - Linux.2*) SYSTYPE=LINUX2 -- for name in db nsl resolv -+ for name in db db1 nsl resolv - do - test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name" - done -@@ -182,6 +182,8 @@ - CCARGS="$CCARGS -DPATH_DB_H='<db_185.h>'" - elif [ -f /usr/include/db/db.h ]; then - CCARGS="$CCARGS -DPATH_DB_H='<db/db.h>'" -+ elif [ -f /usr/include/db1/db.h ]; then -+ CCARGS="$CCARGS -DPATH_DB_H='<db1/db.h>'" - fi - ;; - IRIX*.5.*) SYSTYPE=IRIX5 diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af index 778376bd128..93fc233f5ad 100644 --- a/mail/postfix-current/patches/patch-af +++ b/mail/postfix-current/patches/patch-af @@ -1,8 +1,9 @@ -$NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $ ---- conf/main.cf.orig Mon Aug 14 13:51:15 2000 -+++ conf/main.cf Mon Aug 14 14:07:32 2000 +$NetBSD: patch-af,v 1.5 2000/10/15 14:10:20 itojun Exp $ + +--- conf/main.cf.orig Fri Oct 6 00:01:00 2000 ++++ conf/main.cf Wed Oct 11 11:40:57 2000 @@ -1 +1,3 @@ -+# $NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $ ++# $NetBSD: patch-af,v 1.5 2000/10/15 14:10:20 itojun Exp $ +# # Global Postfix configuration file. This file lists only a subset @@ -19,3 +21,3 @@ @@ -30,7 +31,7 @@ $NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $ +# listen to IPv4 and IPv6 smtp socket +inet_interfaces = 0.0.0.0, :: -@@ -376,5 +385,4 @@ +@@ -417,5 +426,4 @@ # -debugger_command = - PATH=/usr/bin:/usr/X11R6/bin |