From 7c8b7d32b970010c35bb35b6f8718de3300020c8 Mon Sep 17 00:00:00 2001 From: jakob Date: Wed, 25 Dec 2002 11:51:23 +0000 Subject: [PATCH] update to postfix offical release 2.0. read the RELEASE_NOTES file for information about important changes. --- mail/postfix/stable/Makefile | 12 +-- mail/postfix/stable/distinfo | 12 +-- mail/postfix/stable/files/postfix-disable | 2 +- mail/postfix/stable/files/postfix-enable | 2 +- mail/postfix/stable/patches/patch-master.cf | 15 ++-- mail/postfix/stable/pkg/DEINSTALL | 2 +- mail/postfix/stable/pkg/INSTALL | 92 +++++++++++++-------- mail/postfix/stable/pkg/PFRAG.tls | 3 +- mail/postfix/stable/pkg/PLIST | 7 +- 9 files changed, 89 insertions(+), 58 deletions(-) diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile index 3c6697218cb..2873bf27614 100644 --- a/mail/postfix/stable/Makefile +++ b/mail/postfix/stable/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.39 2002/11/25 08:14:02 jakob Exp $ +# $OpenBSD: Makefile,v 1.40 2002/12/25 11:51:23 jakob Exp $ -VERSION= 1.1.12 +VERSION= 2.0.0.1 DISTNAME= postfix-${VERSION} PKGNAME= postfix-${VERSION} @@ -9,9 +9,9 @@ MAINTAINER= Jakob Schlyter MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/} -TLSVERSION= 0.8.11a -TLSPFIXVERSON= 1.1.11 -TLSSSLVERSION= 0.9.6d -TLSDISTNAME= pfixtls-${TLSVERSION}-${TLSPFIXVERSON}-${TLSSSLVERSION} +TLSVERSION= 0.8.12 +TLSPFIXVERSION= ${VERSION} +TLSSSLVERSION= 0.9.6h +TLSDISTNAME= pfixtls-${TLSVERSION}-${TLSPFIXVERSION}-${TLSSSLVERSION} .include diff --git a/mail/postfix/stable/distinfo b/mail/postfix/stable/distinfo index 30d12da87cb..934488e7d77 100644 --- a/mail/postfix/stable/distinfo +++ b/mail/postfix/stable/distinfo @@ -1,6 +1,6 @@ -MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 82fc61f233f5edcece3baa749e53677d -MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 -RMD160 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 3f63e16d53aada492a256cce8dd9b54c5e5b4495 -RMD160 (postfix/postfix-1.1.12.tar.gz) = 8afd27159fecd8a7794a5f8fe6a65eade2a7f6d4 -SHA1 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz) = 193c92ff90e018a4f985b4d21829d6f5a0e11af9 -SHA1 (postfix/postfix-1.1.12.tar.gz) = cfecd528a89e51d8168f8c879113f4f797013ba5 +MD5 (postfix/pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz) = 1111b97c77e71b2f7edd9ab6d36fb550 +MD5 (postfix/postfix-2.0.0.1.tar.gz) = 946339f1ed4fa2fcea4ca5b5fadd1018 +RMD160 (postfix/pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz) = d65d908f2796906ff8c64088968c6a1064c94c69 +RMD160 (postfix/postfix-2.0.0.1.tar.gz) = 13c2dd6e20a3e885162402267538180ec8de0082 +SHA1 (postfix/pfixtls-0.8.12-2.0.0.1-0.9.6h.tar.gz) = 19573a232c4c523c647624882e89dd16e48d1551 +SHA1 (postfix/postfix-2.0.0.1.tar.gz) = a07fa565089dddbcc9236aa1ed88ada575f3afea diff --git a/mail/postfix/stable/files/postfix-disable b/mail/postfix/stable/files/postfix-disable index 62c27fdb436..fa3c6213d70 100644 --- a/mail/postfix/stable/files/postfix-disable +++ b/mail/postfix/stable/files/postfix-disable @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: postfix-disable,v 1.1 2000/09/25 21:02:34 jakob Exp $ +# $OpenBSD: postfix-disable,v 1.2 2002/12/25 11:51:23 jakob Exp $ if [ ! -f /etc/mailer.conf.pre-postfix ]; then echo "can't find /etc/mailer.conf.pre-postfix, postfix not disabled" diff --git a/mail/postfix/stable/files/postfix-enable b/mail/postfix/stable/files/postfix-enable index 7cb66b0158d..17d5ab7252f 100644 --- a/mail/postfix/stable/files/postfix-enable +++ b/mail/postfix/stable/files/postfix-enable @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: postfix-enable,v 1.2 2001/11/10 23:33:22 jakob Exp $ +# $OpenBSD: postfix-enable,v 1.3 2002/12/25 11:51:23 jakob Exp $ if [ -f /etc/mailer.conf.postfix ]; then if [ -f /etc/mailer.conf ]; then diff --git a/mail/postfix/stable/patches/patch-master.cf b/mail/postfix/stable/patches/patch-master.cf index d832f2522c3..b8819e17981 100644 --- a/mail/postfix/stable/patches/patch-master.cf +++ b/mail/postfix/stable/patches/patch-master.cf @@ -1,6 +1,8 @@ ---- conf/master.cf.orig Tue Jan 8 16:08:32 2002 -+++ conf/master.cf Tue Jan 8 16:18:38 2002 -@@ -68,22 +68,22 @@ +$OpenBSD: patch-master.cf,v 1.4 2002/12/25 11:51:23 jakob Exp $ + +--- conf/master.cf.orig Tue Dec 10 10:13:00 2002 ++++ conf/master.cf Tue Dec 10 10:15:01 2002 +@@ -69,24 +69,24 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (50) # ========================================================================== @@ -15,8 +17,7 @@ -defer unix - - n - 0 bounce -flush unix n - n 1000? 0 flush -smtp unix - - n - - smtp --showq unix n - n - - showq --error unix - - n - - error +-relay unix - - n - - smtp +smtp inet n - - - - smtpd +#628 inet n - - - - qmqpd +pickup fifo n - - 60 1 pickup @@ -28,6 +29,10 @@ +defer unix - - - - 0 bounce +flush unix n - - 1000? 0 flush +smtp unix - - - - - smtp ++relay unix - - - - - smtp + # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 +-showq unix n - n - - showq +-error unix - - n - - error +showq unix n - - - - showq +error unix - - - - - error local unix - n n - - local diff --git a/mail/postfix/stable/pkg/DEINSTALL b/mail/postfix/stable/pkg/DEINSTALL index 589919dbc37..843f1113d52 100644 --- a/mail/postfix/stable/pkg/DEINSTALL +++ b/mail/postfix/stable/pkg/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.2 2002/01/25 08:14:30 jakob Exp $ +# $OpenBSD: DEINSTALL,v 1.3 2002/12/25 11:51:23 jakob Exp $ # # De-installation setup of postfix diff --git a/mail/postfix/stable/pkg/INSTALL b/mail/postfix/stable/pkg/INSTALL index 3669b0c6744..175d524bacc 100644 --- a/mail/postfix/stable/pkg/INSTALL +++ b/mail/postfix/stable/pkg/INSTALL @@ -1,12 +1,12 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.5 2002/10/29 16:25:28 jakob Exp $ +# $OpenBSD: INSTALL,v 1.6 2002/12/25 11:51:23 jakob Exp $ # # Pre/post-installation setup of postfix PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} CONFIG_DIR=/etc/postfix -SAMPLE_CONFIG_DIR=$PREFIX/share/examples/postfix +SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/postfix SPOOL_DIR=/var/spool/postfix # Function: set up postfix user/group accounts. @@ -51,7 +51,7 @@ do_spooldir() [ -d $SPOOL_DIR/etc ] || install -d -o root -g wheel -m 755 $SPOOL_DIR/etc [ -d $SPOOL_DIR/dev ] || install -d -o root -g wheel -m 755 $SPOOL_DIR/dev for file in localtime services resolv.conf ; do - install -o root -g wheel -m 755 /etc/$file $SPOOL_DIR/etc + install -o root -g wheel -m 644 /etc/$file $SPOOL_DIR/etc done } @@ -72,45 +72,53 @@ MAILER chmod 644 /etc/mailer.conf.postfix } -# Function: install the postfix configuration files from the samples +# Function: update postfix scripts # -do_configs() +update_scripts() { - if [ -d $CONFIG_DIR ]; then - echo "" - echo "+---------------" - echo "| The existing $1 configuration files in $CONFIG_DIR," - echo "| have NOT been changed. You may want to compare them to the" - echo "| current sample files, $SAMPLE_CONFIG_DIR," - echo "| and update your configuration as needed." - echo "|" - echo "| Existing $CONFIG_DIR/postfix-script, however, will be" - echo "| updated to the latest version." - echo "+---------------" - echo "" - else - # Install config files. - install -d -o root -g wheel -m 755 $CONFIG_DIR - install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR - - # The correct files will be installed later. - rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install} - - echo "" - echo "+---------------" - echo "| The $1 configuration files in $CONFIG_DIR," - echo "| have been installed. Please view these files and change" - echo "| the configuration to meet your needs." - echo "+---------------" - echo "" - fi - + rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install} install -o root -g wheel -m 544 \ $SAMPLE_CONFIG_DIR/{postfix-script,post-install} $CONFIG_DIR install -o root -g wheel -m 444 \ $SAMPLE_CONFIG_DIR/postfix-files $CONFIG_DIR +} - $CONFIG_DIR/post-install command_directory=${PREFIX}/sbin set-permissions +# Function: install the postfix configuration files from the samples +# +do_configs() +{ + PINSTALL="${CONFIG_DIR}/post-install command_directory=${PREFIX}/sbin" + + if [ -d $CONFIG_DIR ]; then + update_scripts + + echo "" + $PINSTALL upgrade-configuration + echo "" + + echo "+---------------" + echo "| The existing configuration files in $CONFIG_DIR has been preserved." + echo "| You may want to compare them to the current sample files," + echo "| $SAMPLE_CONFIG_DIR, and update your configuration as needed." + echo "|" + echo "| $CONFIG_DIR/post{fix-{script,files},-install} has been updated." + echo "+---------------" + echo "" + else + install -d -o root -g wheel -m 755 $CONFIG_DIR + install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR + + update_scripts + + $PINSTALL first-install-reminder + + echo "+---------------" + echo "| Configuration files has been installed in $CONFIG_DIR." + echo "| Please update these files to meet your needs." + echo "+---------------" + fi + + $PINSTALL set-permissions create-missing grep syslogd_flags /etc/rc.conf{,.local} 2>/dev/null | grep -q postfix if [ $? -eq 1 ]; then @@ -119,6 +127,7 @@ do_configs() echo "| Don't forget to add \"-a /var/spool/postfix/dev/log\" to syslogd_flags" echo "| in /etc/rc.conf.local (or /etc/rc.conf) and restart syslogd." echo "+---------------" + echo "" fi } @@ -126,7 +135,18 @@ do_configs() # do_notice() { + + echo "+---------------" + echo "| The Postfix SMTP server will reject mail for unknown local users." + echo "| If the SMTP server is running chrooted, which is default in OpenBSD," + echo "| you need to keep /etc/{passwd,pwd.db} in sync with" + echo "| /var/spool/postfix/etc/{passwd,pwd.db} or adjust the setting of the" + echo "| local_recipient_maps parameter in main.cf." + echo "|" + echo "| For more information, read ${PREFIX}/share/examples/postfix/main.cf" + echo "+---------------" echo "" + echo "+---------------" echo "| Postfix can be set up to replace sendmail entirely. Please read the" echo "| documentation at file:$PREFIX/share/doc/postfix/html/index.html or" @@ -158,9 +178,9 @@ case $2 in do_accts ;; POST-INSTALL) + do_mailwrapper do_spooldir do_configs $1 - do_mailwrapper do_notice ;; *) diff --git a/mail/postfix/stable/pkg/PFRAG.tls b/mail/postfix/stable/pkg/PFRAG.tls index d0683720a77..c680df0d312 100644 --- a/mail/postfix/stable/pkg/PFRAG.tls +++ b/mail/postfix/stable/pkg/PFRAG.tls @@ -1,5 +1,6 @@ -@comment $OpenBSD: PFRAG.tls,v 1.2 2001/10/26 18:25:55 jakob Exp $ +@comment $OpenBSD: PFRAG.tls,v 1.3 2002/12/25 11:51:23 jakob Exp $ libexec/postfix/tlsmgr +man/man8/tlsmgr.8 share/doc/postfix/tls/conf.html share/doc/postfix/tls/index.html share/doc/postfix/tls/install.html diff --git a/mail/postfix/stable/pkg/PLIST b/mail/postfix/stable/pkg/PLIST index e1cd7833a48..945c0e7403d 100644 --- a/mail/postfix/stable/pkg/PLIST +++ b/mail/postfix/stable/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2002/01/25 08:14:30 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.5 2002/12/25 11:51:23 jakob Exp $ @pkgcfl postfix-* %%tls%% libexec/postfix/bounce @@ -137,6 +137,7 @@ share/doc/postfix/html/trivial-rewrite.8.html share/doc/postfix/html/uce.html share/doc/postfix/html/virtual.5.html share/doc/postfix/html/virtual.8.html +share/doc/postfix/readme/ADDRESS_CLASS_README share/doc/postfix/readme/DB_README share/doc/postfix/readme/DEBUG_README share/doc/postfix/readme/ETRN_README @@ -145,12 +146,15 @@ share/doc/postfix/readme/INSTALL share/doc/postfix/readme/LDAP_README share/doc/postfix/readme/LINUX_README share/doc/postfix/readme/LMTP_README +share/doc/postfix/readme/LOCAL_RECIPIENT_README share/doc/postfix/readme/MACOSX_README +share/doc/postfix/readme/MAILDROP_README share/doc/postfix/readme/MYSQL_README share/doc/postfix/readme/NFS_README share/doc/postfix/readme/PACKAGE_README share/doc/postfix/readme/PCRE_README share/doc/postfix/readme/QMQP_README +share/doc/postfix/readme/RELEASE_NOTES share/doc/postfix/readme/RESTRICTION_CLASS_README share/doc/postfix/readme/SASL_README share/doc/postfix/readme/ULTRIX_README @@ -180,6 +184,7 @@ share/examples/postfix/sample-flush.cf share/examples/postfix/sample-ldap.cf share/examples/postfix/sample-lmtp.cf share/examples/postfix/sample-local.cf +share/examples/postfix/sample-mime.cf share/examples/postfix/sample-misc.cf share/examples/postfix/sample-pcre-access.cf share/examples/postfix/sample-pcre-body.cf