Hello community,
here is the log from the commit of package postfix
checked in at Fri Jul 11 23:11:17 CEST 2008.
--------
--- postfix/postfix.changes 2008-06-17 12:51:47.000000000 +0200
+++ postfix/postfix.changes 2008-07-09 15:12:07.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 9 15:07:46 CEST 2008 - varkoly@suse.de
+
+- (fate#305005) Enable SMTPS in postfix ootb
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.R11762/_old 2008-07-11 23:10:45.000000000 +0200
+++ /var/tmp/diff_new_pack.R11762/_new 2008-07-11 23:10:45.000000000 +0200
@@ -25,7 +25,7 @@
AutoReqProv: on
Summary: A fast, secure, and flexible mailer
Version: 2.5.1
-Release: 30
+Release: 34
Source: postfix-%{version}.tar.gz
Source1: postfix-SuSE.tar.gz
Patch: dynamic_maps.patch
@@ -584,6 +584,8 @@
Wietse Venema
%changelog
+* Wed Jul 09 2008 varkoly@suse.de
+- (fate#305005) Enable SMTPS in postfix ootb
* Tue Jun 17 2008 varkoly@suse.de
- (bnc#396985) sending of NUL character disallowed by RFC2822
- (bnc#397127) without relay is silent about undeliverable mails
++++++ postfix-SuSE.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix
--- old/postfix-SuSE/SuSEconfig.postfix 2008-06-17 12:50:16.000000000 +0200
+++ new/postfix-SuSE/SuSEconfig.postfix 2008-07-09 15:02:48.000000000 +0200
@@ -397,11 +397,13 @@
fi
- if test "$POSTFIX_SMTP_TLS_SERVER" == "yes"; then
+ if test "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
grep -E '^smtps' /etc/services >/dev/null || {
warn_user 1>&2 "adding service \"smtps\" to /etc/services"
echo "smtps 465/tcp # smtp over SSL" >> /etc/services
}
+ fi
+ if test "$POSTFIX_SMTP_TLS_SERVER" == "yes" -o "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
$PCONF -e "smtpd_use_tls = yes"
$PCONF -e "smtpd_tls_CAfile = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE"
$PCONF -e "smtpd_tls_cert_file = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CERTFILE"
@@ -459,6 +461,7 @@
export POSTFIX_NULLCLIENT
export USE_AMAVIS
export POSTFIX_SMTP_TLS_SERVER
+ export POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT
export POSTFIX_SMTP_TLS_CLIENT
perl -e 'use strict;
@@ -476,6 +479,8 @@
defined $ENV{USE_AMAVIS} ? $ENV{USE_AMAVIS} : "no";
my $tlsserver =
defined $ENV{POSTFIX_SMTP_TLS_SERVER} ? $ENV{POSTFIX_SMTP_TLS_SERVER} : "no";
+my $sslserver =
+ defined $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} ? $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} : "no";
my $tlsclient =
defined $ENV{POSTFIX_SMTP_TLS_CLIENT} ? $ENV{POSTFIX_SMTP_TLS_CLIENT} : "no";
my $normalize = {};
@@ -527,14 +532,14 @@
}
} elsif( /\#?\s*(tlsmgr\s+unix.*)/ ) {
if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
- if ( $tlsclient ne "yes" && $tlsserver ne "yes" ) {
+ if ( $tlsclient ne "yes" && $tlsserver ne "yes" && $sslserver ne "yes" ) {
$line = "#".$1;
} else {
$line = $1;
}
} elsif( /\#?\s*(smtps\s+inet.*?smtpd)/ ) {
if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
- if ( $tlsserver ne "yes" ) {
+ if ( $sslserver ne "yes" ) {
$line = "#".$1." -o smtpd_tls_wrappermode=yes";
} else {
$line = $1." -o smtpd_tls_wrappermode=yes";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/sysconfig.postfix new/postfix-SuSE/sysconfig.postfix
--- old/postfix-SuSE/sysconfig.postfix 2007-12-06 13:16:37.000000000 +0100
+++ new/postfix-SuSE/sysconfig.postfix 2008-07-09 14:56:24.000000000 +0200
@@ -203,9 +203,22 @@
## Default: no
## Config: postfix
#
-# Do you want to use STARTTLS or SMTP over SSL
+# Do you want to use STARTTLS
#
-POSTFIX_SMTP_TLS_SERVER=no
+POSTFIX_SMTP_TLS_SERVER="no"
+
+## Type: yesno
+## Default: no
+## Config: postfix
+#
+# Do you want to use SMTP over SSL.
+# assigns port 465 to smtps in /etc/services
+# CAUTION: the IANA has assigned a different protocol to port 465
+# Usage of port 465 for smtps was not officially encouraged
+# If you enable this you need to make sure that it does not collide
+# with protocol urd
+#
+POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT="no"
## Type: yesno
## Default: no
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org