diff options
| -rw-r--r-- | mail/postfix/Makefile | 8 | ||||
| -rw-r--r-- | mail/postfix/distinfo | 12 | ||||
| -rw-r--r-- | mail/postfix/patches/patch-aa | 56 |
3 files changed, 40 insertions, 36 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index dd26605b2b6..55d869298fb 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.40 2001/05/15 01:33:35 itojun Exp $ +# $NetBSD: Makefile,v 1.41 2001/06/07 09:23:20 itojun Exp $ -DISTNAME= postfix-20010228-pl02 -PKGNAME= postfix-20010228pl2 +DISTNAME= postfix-20010228-pl03 +PKGNAME= postfix-20010228pl3 CATEGORIES= mail MASTER_SITES= ftp://postfix.cloud9.net/official/ -PATCHFILES= postfix-20010228pl02-v6-20010515a.diff.gz \ +PATCHFILES= postfix-20010228pl02-v6-20010607a.diff.gz \ postfix-20010228release-ercpt.diff PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ ftp://ftp.gw.com/pub/people/kim/patches/ diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index c0f931fb099..0859c4cf356 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2001/05/15 01:33:35 itojun Exp $ +$NetBSD: distinfo,v 1.7 2001/06/07 09:23:20 itojun Exp $ -SHA1 (postfix/postfix-20010228-pl02.tar.gz) = abc4dda3bbaf46d73700e47c0a9c6090b18e844f -Size (postfix/postfix-20010228-pl02.tar.gz) = 979794 bytes -SHA1 (postfix/postfix-20010228pl02-v6-20010515a.diff.gz) = c03dc903ba4a4a3ff8cdd107c4e4c85be3b6a965 -Size (postfix/postfix-20010228pl02-v6-20010515a.diff.gz) = 22713 bytes +SHA1 (postfix/postfix-20010228-pl03.tar.gz) = 42de339b5aa2717005578d2586feabd1aa7d9ed7 +Size (postfix/postfix-20010228-pl03.tar.gz) = 981414 bytes +SHA1 (postfix/postfix-20010228pl02-v6-20010607a.diff.gz) = aad91f49fa27889615e1416a0f0a1f2512fe2997 +Size (postfix/postfix-20010228pl02-v6-20010607a.diff.gz) = 22723 bytes SHA1 (postfix/postfix-20010228release-ercpt.diff) = c6abc5d57ca1a36de85dadee878b266d707ad3cd Size (postfix/postfix-20010228release-ercpt.diff) = 4484 bytes -SHA1 (patch-aa) = f7d4185faa98a8348d3d993f7d477121dede43d7 +SHA1 (patch-aa) = a2cbec9609c9abaf87a8e11220ddf2546802648d SHA1 (patch-af) = 1f96a9b36cc65b079839542cc4e7a3230318013c diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa index a3dcdd9dd5e..ad55a2847bd 100644 --- a/mail/postfix/patches/patch-aa +++ b/mail/postfix/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ +$NetBSD: patch-aa,v 1.9 2001/06/07 09:23:20 itojun Exp $ ---- INSTALL.sh.orig Sat Apr 28 02:47:23 2001 -+++ INSTALL.sh Thu May 3 09:10:27 2001 +--- INSTALL.sh.orig Tue May 1 23:21:22 2001 ++++ INSTALL.sh Thu Jun 7 17:50:31 2001 @@ -7,39 +7,39 @@ umask 022 @@ -132,7 +132,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ # Sanity checks -@@ -159,40 +156,40 @@ +@@ -159,42 +156,42 @@ CONFIG_DIRECTORY=$install_root$config_directory @@ -143,15 +143,17 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ - done -} - --test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf || { -- test -t 0 || { -- echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2 -- echo file from a previous Postfix installation. 1>&2 -- echo 1>&2 -- echo Use interactive installation instead. 1>&2 -- exit 1 -- } --} +-if [ -f $CONFIG_DIRECTORY/install.cf ] +-then +- . $CONFIG_DIRECTORY/install.cf +-elif [ ! -t 0 -a -z "$install_root" ] +-then +- echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2 +- echo file from a previous Postfix installation. 1>&2 +- echo 1>&2 +- echo Use interactive installation instead. 1>&2 +- exit 1 +-fi +#test -f $CONFIG_DIRECTORY/main.cf && { +# for name in daemon_directory command_directory queue_directory mail_owner +# do @@ -159,15 +161,17 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ +# done +#} + -+#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf || { -+# test -t 0 || { -+# echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2 -+# echo file from a previous Postfix installation. 1>&2 -+# echo 1>&2 -+# echo Use interactive installation instead. 1>&2 -+# exit 1 -+# } -+#} ++#if [ -f $CONFIG_DIRECTORY/install.cf ] ++#then ++# . $CONFIG_DIRECTORY/install.cf ++#elif [ ! -t 0 -a -z "$install_root" ] ++#then ++# echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2 ++# echo file from a previous Postfix installation. 1>&2 ++# echo 1>&2 ++# echo Use interactive installation instead. 1>&2 ++# exit 1 ++#fi # Override default settings. @@ -204,7 +208,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ # Sanity checks -@@ -240,10 +237,10 @@ +@@ -242,10 +239,10 @@ DAEMON_DIRECTORY=$install_root$daemon_directory COMMAND_DIRECTORY=$install_root$command_directory @@ -218,7 +222,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ MANPAGES=$install_root$manpages # Create any missing directories. -@@ -252,7 +249,7 @@ +@@ -254,7 +251,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 @@ -227,7 +231,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ do dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'` test -d $dir || mkdir -p $dir || exit 1 -@@ -272,8 +269,8 @@ +@@ -274,8 +271,8 @@ test -f bin/sendmail && { compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1 @@ -238,7 +242,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $ } if [ -f $CONFIG_DIRECTORY/main.cf ] -@@ -298,13 +295,13 @@ +@@ -300,13 +297,13 @@ "mail_owner = $mail_owner" \ || exit 1 |