Module Name: src
Committed By: tron
Date: Sun Jul 31 10:05:04 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist: makedefs postfix-install
src/external/ibm-public/postfix/dist/html: TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man5: postconf.5
src/external/ibm-public/postfix/dist/proto: postconf.proto
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/dist/postfix-install
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/dist/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.3 src/external/ibm-public/postfix/dist/makedefs:1.4
--- src/external/ibm-public/postfix/dist/makedefs:1.3 Wed Mar 23 19:10:44 2011
+++ src/external/ibm-public/postfix/dist/makedefs Sun Jul 31 10:05:03 2011
@@ -342,6 +342,33 @@
fi;;
esac
;;
+ Linux.3*) SYSTYPE=LINUX3
+ if [ -f /usr/include/db.h ]
+ then
+ : we are all set
+ elif [ -f /usr/include/db/db.h ]
+ then
+ CCARGS="$CCARGS -I/usr/include/db"
+ else
+ # On a properly installed system, Postfix builds
+ # by including <db.h> and by linking with -ldb
+ echo "No <db.h> include file found." 1>&2
+ echo "Install the appropriate db*-devel package first." 1>&2
+ echo "See the RELEASE_NOTES file for more information." 1>&2
+ exit 1
+ fi
+ SYSLIBS="-ldb"
+ for name in nsl resolv
+ do
+ for lib in /usr/lib64 /lib64 /usr/lib /lib
+ do
+ test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+ SYSLIBS="$SYSLIBS -l$name"
+ break
+ }
+ done
+ done
+ ;;
GNU.0*|GNU/kFreeBSD.[567]*)
SYSTYPE=GNU0
# Postfix no longer needs DB 1.85 compatibility
Index: src/external/ibm-public/postfix/dist/postfix-install
diff -u src/external/ibm-public/postfix/dist/postfix-install:1.2 src/external/ibm-public/postfix/dist/postfix-install:1.3
--- src/external/ibm-public/postfix/dist/postfix-install:1.2 Tue Jun 23 11:41:05 2009
+++ src/external/ibm-public/postfix/dist/postfix-install Sun Jul 31 10:05:03 2011
@@ -305,7 +305,7 @@
install_root_prompt="the prefix for installed file names. Specify
this ONLY if you are building ready-to-install packages for
-distribution to other machines."
+distribution to OTHER machines. See PACKAGE_README for instructions."
tempdir_prompt="a directory for scratch files while installing
Postfix. You must have write permission in this directory."
Index: src/external/ibm-public/postfix/dist/html/TLS_README.html
diff -u src/external/ibm-public/postfix/dist/html/TLS_README.html:1.4 src/external/ibm-public/postfix/dist/html/TLS_README.html:1.5
--- src/external/ibm-public/postfix/dist/html/TLS_README.html:1.4 Wed Mar 2 19:56:38 2011
+++ src/external/ibm-public/postfix/dist/html/TLS_README.html Sun Jul 31 10:05:04 2011
@@ -865,9 +865,9 @@
<p> By default, the OpenSSL server selects the client's most preferred
cipher that the server supports. With SSLv3 and later, the server
may choose its own most preferred cipher that is supported (offered)
-by the client. Setting "<a href="postconf.5.html#tls_preempts_cipherlist">tls_preempt_cipherlist</a> = yes" enables server
+by the client. Setting "<a href="postconf.5.html#tls_preempt_cipherlist">tls_preempt_cipherlist</a> = yes" enables server
cipher preferences. The default OpenSSL behaviour applies with
-"<a href="postconf.5.html#tls_preempts_cipherlist">tls_preempt_cipherlist</a> = no". </p>
+"<a href="postconf.5.html#tls_preempt_cipherlist">tls_preempt_cipherlist</a> = no". </p>
<p> While server cipher selection may in some cases lead to a more secure
or performant cipher choice, there is some risk of interoperability
Index: src/external/ibm-public/postfix/dist/html/postconf.5.html
diff -u src/external/ibm-public/postfix/dist/html/postconf.5.html:1.7 src/external/ibm-public/postfix/dist/html/postconf.5.html:1.8
--- src/external/ibm-public/postfix/dist/html/postconf.5.html:1.7 Wed Mar 2 19:56:38 2011
+++ src/external/ibm-public/postfix/dist/html/postconf.5.html Sun Jul 31 10:05:04 2011
@@ -7657,6 +7657,8 @@
The default time unit is s (seconds).
</p>
+<p> This feature is available in Postfix 2.8 and later. </p>
+
</DD>
@@ -7690,6 +7692,8 @@
The default time unit is s (seconds).
</p>
+<p> This feature is available in Postfix 2.8 and later. </p>
+
</DD>
@@ -15205,7 +15209,7 @@
<p> By default, the OpenSSL server selects the client's most preferred
cipher that the server supports. With SSLv3 and later, the server may
choose its own most preferred cipher that is supported (offered) by
-the client. Setting "<a href="postconf.5.html#tls_preempts_cipherlist">tls_preempt_cipherlist</a> = yes" enables server cipher
+the client. Setting "<a href="postconf.5.html#tls_preempt_cipherlist">tls_preempt_cipherlist</a> = yes" enables server cipher
preferences. </p>
<p> While server cipher selection may in some cases lead to a more secure
Index: src/external/ibm-public/postfix/dist/man/man5/postconf.5
diff -u src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.7 src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.8
--- src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.7 Wed Mar 2 19:56:38 2011
+++ src/external/ibm-public/postfix/dist/man/man5/postconf.5 Sun Jul 31 10:05:04 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: postconf.5,v 1.7 2011/03/02 19:56:38 tron Exp $
+.\" $NetBSD: postconf.5,v 1.8 2011/07/31 10:05:04 tron Exp $
.\"
.TH POSTCONF 5
.SH NAME
@@ -4371,6 +4371,8 @@
.PP
Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
The default time unit is s (seconds).
+.PP
+This feature is available in Postfix 2.8 and later.
.SH qmgr_fudge_factor (default: 100)
Obsolete feature: the percentage of delivery resources that a busy
mail system will use up for delivery of a large mailing list
@@ -4386,6 +4388,8 @@
.PP
Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
The default time unit is s (seconds).
+.PP
+This feature is available in Postfix 2.8 and later.
.SH qmgr_message_active_limit (default: 20000)
The maximal number of messages in the active queue.
.SH qmgr_message_recipient_limit (default: 20000)
Index: src/external/ibm-public/postfix/dist/proto/postconf.proto
diff -u src/external/ibm-public/postfix/dist/proto/postconf.proto:1.7 src/external/ibm-public/postfix/dist/proto/postconf.proto:1.8
--- src/external/ibm-public/postfix/dist/proto/postconf.proto:1.7 Wed Mar 2 19:56:38 2011
+++ src/external/ibm-public/postfix/dist/proto/postconf.proto Sun Jul 31 10:05:04 2011
@@ -13506,6 +13506,8 @@
The default time unit is s (seconds).
</p>
+<p> This feature is available in Postfix 2.8 and later. </p>
+
%PARAM qmgr_daemon_timeout 1000s
<p> How much time a Postfix queue manager process may take to handle
@@ -13517,6 +13519,8 @@
The default time unit is s (seconds).
</p>
+<p> This feature is available in Postfix 2.8 and later. </p>
+
%PARAM tls_preempt_cipherlist no
<p> With SSLv3 and later, use the server's cipher preference order
