Bump 2.0.16-r1 to stable x86. Add FSH link /usr/sbin/sendmail -> /usr/lib/sendmail. Do not keepdir on the queue directories to minimize bogus errors in the mail log. Only install the sasl conf to /etc/sasl2 as the latest sasl looks there for the config files.

13 files changed, 67 insertions, 301 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index 0562b595140f..24616b6ba504 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.100 2004/01/11 03:53:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.101 2004/01/14 20:38:12 max Exp $
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> postfix-1.1.11.20020917-r1.ebuild,
+  postfix-1.1.11.20020917.ebuild, postfix-2.0.10-r1.ebuild,
+  postfix-2.0.12-r1.ebuild, postfix-2.0.13-r1.ebuild, postfix-2.0.14.ebuild,
+  postfix-2.0.15-r1.ebuild, postfix-2.0.16-r1.ebuild, postfix-2.0.9.ebuild,
+  files/gentestcrt.sh, files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2:
+  Bump 2.0.16-r1 to stable x86. Add FSH link /usr/sbin/sendmail ->
+  /usr/lib/sendmail. Do not keepdir on the queue directories to minimize bogus
+  errors in the mail log. Only install the sasl conf to /etc/sasl2 as the latest
+  sasl looks there for the config files.
 
   10 Jan 2004; Jason Wever <weeve@gentoo.org> postfix-2.0.11.ebuild:
   Marked stable on sparc.
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index 81b34903b816..3e381c9cf379 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,40 +1,38 @@
-MD5 6865f8a458a4ce5f600510a005e55375 ChangeLog 20212
+MD5 9a76c00dc374c58cb48acdd1a7a15c4b postfix-2.0.10-r1.ebuild 6162
+MD5 9dbec295c346a13a09fc91a1814755cb postfix-2.0.13-r1.ebuild 6347
+MD5 2fe228e8ea41468c95d28d6f166aa0dc postfix-2.0.9.ebuild 6236
+MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
+MD5 28f76da8e1230f4704425f5e86ec4cdf postfix-2.0.16-r1.ebuild 6658
+MD5 c156cd1b607a905125f9f1ca47177b16 postfix-2.0.12-r1.ebuild 6029
+MD5 a5f1d33d6b5226ed81cf7be55aa8f9c9 postfix-2.0.14.ebuild 6381
+MD5 75487fe50e2b5d4cbd68b5d2a91bf0aa postfix-2.0.15-r1.ebuild 6385
+MD5 5f5fb88ba28f4e444860a73a9ae85aa1 ChangeLog 20842
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 dc7ffc0b94cc3f86ecbe0e3d7d9aef1e postfix-1.1.11.20020917-r1.ebuild 4596
-MD5 c708c13c56038c9e5d56a80a2232b873 postfix-1.1.11.20020917.ebuild 4576
-MD5 7b7d8734e7bc6ee63b2a4091764a89f5 postfix-2.0.10-r1.ebuild 6165
 MD5 a515b7a5d1f6e1ac3d05ac9a1de560b3 postfix-2.0.11.ebuild 6033
-MD5 017fd96b86cea185de4708cf233f4e54 postfix-2.0.12-r1.ebuild 6032
-MD5 c12766a3a53ca35ee6ce96df52d4c304 postfix-2.0.13-r1.ebuild 6350
-MD5 b61085a605c41f64b6afb513fca4643c postfix-2.0.14.ebuild 6384
-MD5 60523f236fe252023ae5860b6d39b5e8 postfix-2.0.15-r1.ebuild 6388
-MD5 4b29aa1f5bc33e0fdeeae2ddc70fc18b postfix-2.0.16-r1.ebuild 6664
-MD5 f7902206b1ea1c3894f86f798f2eb0bd postfix-2.0.9.ebuild 6241
-MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 af54dd63ae7235856a5cc25284ac40c8 postfix-1.1.11.20020917.ebuild 4574
+MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
-MD5 499f6d9f2295ba6e359ce568842d050c files/digest-postfix-2.0.10-r1 295
+MD5 c96b069e399dd4c8d21faddcb6274de6 files/postfix.rc6 585
+MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
+MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
+MD5 569f1c46350b2718419b72bb9c443c3f files/saslpass 135
+MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
-MD5 6264e15636614de0cce39a66de79db5f files/digest-postfix-2.0.12-r1 295
-MD5 fbf57b537c7f42a7bf96f073ee3d22bf files/digest-postfix-2.0.13-r1 297
 MD5 b16da80a639afb1445a78346a3469d17 files/digest-postfix-2.0.14 296
-MD5 e38041c4e48c3b1f858b60a7cc200844 files/digest-postfix-2.0.15-r1 296
-MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
-MD5 e126c8295dad90d20bf2d6a47086ab0e files/digest-postfix-2.0.9 220
-MD5 f33a4ed862d59e73be66317079817bc1 files/gentestcrt.sh 8797
-MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
-MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
-MD5 3004148a32063214f57f0316b9f46116 files/postfix 517
-MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
+MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
 MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
+MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 e126c8295dad90d20bf2d6a47086ab0e files/digest-postfix-2.0.9 220
 MD5 61fc23026a194c592078961b7da6455c files/postfix-pg.postfix-2.0.0.2.patch.bz2 7526
-MD5 c96b069e399dd4c8d21faddcb6274de6 files/postfix.rc6 585
-MD5 569f1c46350b2718419b72bb9c443c3f files/saslpass 135
 MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
-MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
-MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
+MD5 3004148a32063214f57f0316b9f46116 files/postfix 517
+MD5 499f6d9f2295ba6e359ce568842d050c files/digest-postfix-2.0.10-r1 295
+MD5 6264e15636614de0cce39a66de79db5f files/digest-postfix-2.0.12-r1 295
+MD5 fbf57b537c7f42a7bf96f073ee3d22bf files/digest-postfix-2.0.13-r1 297
+MD5 e38041c4e48c3b1f858b60a7cc200844 files/digest-postfix-2.0.15-r1 296
+MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
 MD5 7dea3c30c3550cbbcdf4aac0b6d8dffa files/smtpd-2.0.conf 138
-MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
-MD5 460833c3a1ffc3a240c72f0537802b5c files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2 72150
-MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
-MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
 MD5 2451d1fd691c1e31e2d979e4c25f8d7e files/postfix-2.0.14/main.cf.diff 2382
+MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
+MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/files/gentestcrt.sh b/net-mail/postfix/files/gentestcrt.sh
deleted file mode 100644
index 3172c8e38b77..000000000000
--- a/net-mail/postfix/files/gentestcrt.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/bin/sh
-## $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/gentestcrt.sh,v 1.1 2003/09/24 05:08:51 max Exp $
-##
-##  gentestcrt -- Create self-signed test certificate
-##  (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
-##  Based on cca.sh script by Ralf S. Engelschall
-##
-
-#   external tools
-openssl="/usr/bin/openssl"
-
-#   some optional terminal sequences
-case $TERM in
-    xterm|xterm*|vt220|vt220*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'`
-        ;;
-    vt100|vt100*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'`
-        ;;
-    default)
-        T_MD=''
-        T_ME=''
-        ;;
-esac
-
-#   find some random files
-#   (do not use /dev/random here, because this device 
-#   doesn't work as expected on all platforms)
-randfiles=''
-for file in /var/log/messages /var/adm/messages \
-            /kernel /vmunix /vmlinuz \
-            /etc/hosts /etc/resolv.conf; do
-    if [ -f $file ]; then
-        if [ ".$randfiles" = . ]; then
-            randfiles="$file"
-        else
-            randfiles="${randfiles}:$file"
-        fi
-    fi
-done
-
-
-echo "${T_MD}maketestcrt -- Create self-signed test certificate${T_ME}"
-echo "(C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft"
-echo "Based on cca.sh script by Ralf S. Engelschall"
-echo ""
-
-grep -q -s DUMMY server.crt && mv server.crt server.crt.dummy
-grep -q -s DUMMY server.key && mv server.key server.key.dummy
-
-echo ""
-echo ""
-
-if [ ! -e ./server.crt -a ! -e ./server.key ];then 
-	echo "Will create server.key and server.crt in `pwd`"
-else
-	echo "server.key and server.crt already exist, dying"
-	exit
-fi
-
-echo ""
-
-
-mkdir -p /tmp/tmpssl-$$
-pushd /tmp/tmpssl-$$ > /dev/null
-
-
-    echo "${T_MD}INITIALIZATION${T_ME}"
-
-    echo ""
-    echo "${T_MD}Generating custom Certificate Authority (CA)${T_ME}"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 1: Generating RSA private key for CA (1024 bit)${T_ME}"
-    cp /dev/null ca.rnd
-    echo '01' >ca.ser
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out ca.key 1024
-    else
-        $openssl genrsa -out ca.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = CA
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Quebec"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Montreal"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Postfix SMTP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "For testing purposes only"
-commonName                      = "6. Common Name              (eg, CA name)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@FQDN)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key ca.key -out ca.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 3: Generating X.509 certificate for CA signed by itself${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:true,pathlen:0
-#nsComment        = "CCA generated custom CA certificate"
-#nsCertType       = sslCA
-EOT
-    $openssl x509 -extfile .cfg -req -days 365 -signkey ca.key -in ca.csr -out ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate self-signed CA certificate" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in ca.crt
-    $openssl rsa -text -in ca.key
-
-    echo "${T_MD}CERTIFICATE GENERATION${T_ME}"
-    user="server"
-
-    echo ""
-    echo "${T_MD}Generating custom USER${T_ME} [$user]"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 5: Generating RSA private key for USER (1024 bit)${T_ME}"
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out $user.key 1024
-    else
-        $openssl genrsa -out $user.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 6: Generating X.509 certificate signing request for USER${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = XY
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Unknown"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Server Room"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Postfix SMTP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "Test Certificate"
-commonName                      = "6. Common Name              (eg, DOMAIN NAME)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@fqdn)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key $user.key -out $user.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    rm -f .cfg
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 7: Generating X.509 certificate signed by own CA${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:false,pathlen:0
-#nsComment        = "CCA generated client certificate"
-#nsCertType       = client
-EOT
-    $openssl x509 -extfile .cfg -days 365 -CAserial ca.ser -CA ca.crt -CAkey ca.key -in $user.csr -req -out $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate X.509 certificate" 1>&2
-        exit 1
-    fi
-    caname="`$openssl x509 -noout -text -in ca.crt |\
-             grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-    username="`$openssl x509 -noout -text -in $user.crt |\
-               grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-#    echo "Assembling PKCS#12 package"
-#    $openssl pkcs12 -export -in $user.crt -inkey $user.key -certfile ca.crt -name "$username" -caname "$caname" -out $user.p12
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify -CAfile ca.crt $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in $user.crt
-    $openssl rsa -text -in $user.key
-
-
-popd >/dev/null
-
-
-rm -f /tmp/tmpssl-$$/*.csr
-rm -f /tmp/tmpssl-$$/ca.*
-chmod 400 /tmp/tmpssl-$$/*
-
-echo "Certificate creation done!"
-cp /tmp/tmpssl-$$/server.* .
-
-rm -rf /tmp/tmpssl-$$
diff --git a/net-mail/postfix/files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2 b/net-mail/postfix/files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2
deleted file mode 100644
index fdf1837fa63d..000000000000
--- a/net-mail/postfix/files/tls+ipv6-1.4-pf-1.1.11-20020917.patch.bz2
+++ /dev/null
diff --git a/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild b/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild
index 3ac761741106..7787f19741f3 100644
--- a/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild
+++ b/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.7 2003/12/14 22:59:41 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.8 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6"
 
diff --git a/net-mail/postfix/postfix-1.1.11.20020917.ebuild b/net-mail/postfix/postfix-1.1.11.20020917.ebuild
index 540ee7ee738f..ddf9b5f901e9 100644
--- a/net-mail/postfix/postfix-1.1.11.20020917.ebuild
+++ b/net-mail/postfix/postfix-1.1.11.20020917.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11.20020917.ebuild,v 1.9 2003/12/14 22:59:41 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11.20020917.ebuild,v 1.10 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap"
 
diff --git a/net-mail/postfix/postfix-2.0.10-r1.ebuild b/net-mail/postfix/postfix-2.0.10-r1.ebuild
index 3769e4192bf8..565d6c1a4c0f 100644
--- a/net-mail/postfix/postfix-2.0.10-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.10-r1.ebuild,v 1.7 2003/11/05 00:54:30 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.10-r1.ebuild,v 1.8 2004/01/14 20:38:12 max Exp $
 
 inherit eutils
 
diff --git a/net-mail/postfix/postfix-2.0.12-r1.ebuild b/net-mail/postfix/postfix-2.0.12-r1.ebuild
index 46c88d049e43..a0ec6f3634f6 100644
--- a/net-mail/postfix/postfix-2.0.12-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.12-r1.ebuild,v 1.4 2003/11/05 00:54:30 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.12-r1.ebuild,v 1.5 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
 
diff --git a/net-mail/postfix/postfix-2.0.13-r1.ebuild b/net-mail/postfix/postfix-2.0.13-r1.ebuild
index 4b433e971819..7d17000aa8a9 100644
--- a/net-mail/postfix/postfix-2.0.13-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.13-r1.ebuild,v 1.7 2003/11/05 00:54:30 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.13-r1.ebuild,v 1.8 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
 
diff --git a/net-mail/postfix/postfix-2.0.14.ebuild b/net-mail/postfix/postfix-2.0.14.ebuild
index d9eec11ad13c..997022da7629 100644
--- a/net-mail/postfix/postfix-2.0.14.ebuild
+++ b/net-mail/postfix/postfix-2.0.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.14.ebuild,v 1.3 2003/11/05 00:54:30 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.14.ebuild,v 1.4 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
 
diff --git a/net-mail/postfix/postfix-2.0.15-r1.ebuild b/net-mail/postfix/postfix-2.0.15-r1.ebuild
index c45aa9f6be1c..2137d688197b 100644
--- a/net-mail/postfix/postfix-2.0.15-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.15-r1.ebuild,v 1.2 2003/11/05 00:54:30 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.15-r1.ebuild,v 1.3 2004/01/14 20:38:12 max Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
 
diff --git a/net-mail/postfix/postfix-2.0.16-r1.ebuild b/net-mail/postfix/postfix-2.0.16-r1.ebuild
index 668254bd00f9..3878b7ccec2f 100644
--- a/net-mail/postfix/postfix-2.0.16-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.16-r1.ebuild,v 1.9 2003/11/11 03:54:55 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.16-r1.ebuild,v 1.10 2004/01/14 20:38:12 max Exp $
 
 inherit eutils ssl-cert
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+KEYWORDS="x86 ~sparc ~ppc ~alpha"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
 
 PROVIDE="virtual/mta virtual/mda"
@@ -37,8 +37,10 @@ RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
 	!virtual/mta"
 
+# Is this still necessary since gentoo sasl looks
+# in /etc/sasl2 for it's config files?
 pkg_setup() {
-	# Prevent mangling the smtpd.conf file
+	# Prevent mangling the smtpd.conf file.
 	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
 		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
 			ebegin "Protecting your smtpd.conf file"
@@ -53,7 +55,7 @@ pkg_setup() {
 			fi
 
 			# If both files exist, make sure that we preserve
-			# a copy of each with the ._cfg system
+			# a copy of each with the ._cfg system.
 			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
 				mv "${ROOT}/etc/sasl2/smtpd.conf" \
 					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
@@ -87,6 +89,7 @@ src_unpack() {
 	# Postfix does not get the FQDN if no hostname is configured.
 	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
 
+	# Fix install paths.
 	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
 		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
 }
@@ -144,6 +147,9 @@ src_install () {
 		mail_owner="postfix" \
 		setgid_group="postdrop" || die "postfix-install failed"
 
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
 	# Install an rmail for UUCP, closing bug #19127.
 	dobin auxiliary/rmail/rmail
 
@@ -188,16 +194,11 @@ src_install () {
 	if [ "`use sasl`" ] ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-		dodir /usr/lib/sasl2
-		dosym /etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
 	fi
-
-	keepdir /var/spool/postfix/{active,bounce,corrupt,defer,deferred,flush}
-	keepdir /var/spool/postfix/{hold,incomming,maildrop,pid,private,public}
 }
 
 pkg_postinst() {
-	ebegin "Fixing permissions"
+	ebegin "Fixing queue directories and permissions"
 	"${ROOT}/etc/postfix/post-install" upgrade-permissions
 	eend $?
 	echo
diff --git a/net-mail/postfix/postfix-2.0.9.ebuild b/net-mail/postfix/postfix-2.0.9.ebuild
index 207c3de6cde0..252745a38ad6 100644
--- a/net-mail/postfix/postfix-2.0.9.ebuild
+++ b/net-mail/postfix/postfix-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.9.ebuild,v 1.6 2003/09/05 08:38:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.9.ebuild,v 1.7 2004/01/14 20:38:12 max Exp $
 
 inherit eutils