diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-06-12 19:53:55 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-06-12 19:53:55 +0000 |
| commit | bdc374ff265a23e8815d4d8986ea5f1eb05c7553 (patch) | |
| tree | 48d62f4553dd1fe1543c622d976c4036bcc71d75 /mail-mta | |
| parent | New CPAN version. (diff) | |
| download | gentoo-2-bdc374ff265a23e8815d4d8986ea5f1eb05c7553.tar.gz gentoo-2-bdc374ff265a23e8815d4d8986ea5f1eb05c7553.tar.bz2 gentoo-2-bdc374ff265a23e8815d4d8986ea5f1eb05c7553.zip | |
Fixed bug 95637, added patch from bug 94257.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch | 33 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r16.ebuild | 7 |
3 files changed, 43 insertions, 3 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 1b08e4c5da71..df835ee54bcb 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.43 2005/06/12 19:35:43 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.44 2005/06/12 19:53:55 hansmi Exp $ + + 12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild, + +files/qmail-1.03-env-servercert.patch: + Fixed bug 95637, added patch from bug 94257. 12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> files/qmail-genrsacert.sh: diff --git a/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch b/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch new file mode 100644 index 000000000000..132992b332e4 --- /dev/null +++ b/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch @@ -0,0 +1,33 @@ +diff -Nru qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c +--- qmail-1.03.orig/qmail-smtpd.c 2005-06-06 00:32:59.000000000 +0300 ++++ qmail-1.03/qmail-smtpd.c 2005-06-06 08:18:58.051312616 +0300 +@@ -1314,6 +1314,11 @@ + stralloc saciphers = {0}; + X509_STORE *store; + X509_LOOKUP *lookup; ++ const char *servercert; ++ ++ /* if set, use servercert selected through SMTP_SERVERCERT env var */ ++ servercert = env_get("SMTP_SERVERCERT"); ++ if (!servercert) servercert = SERVERCERT; + + SSL_library_init(); + +@@ -1321,7 +1326,7 @@ + ctx = SSL_CTX_new(SSLv23_server_method()); + if (!ctx) { tls_err("unable to initialize ctx"); return; } + +- if (!SSL_CTX_use_certificate_chain_file(ctx, SERVERCERT)) ++ if (!SSL_CTX_use_certificate_chain_file(ctx, servercert)) + { SSL_CTX_free(ctx); tls_err("missing certificate"); return; } + SSL_CTX_load_verify_locations(ctx, CLIENTCA, NULL); + +@@ -1343,7 +1348,7 @@ + if (!myssl) { tls_err("unable to initialize ssl"); return; } + + /* this will also check whether public and private keys match */ +- if (!SSL_use_RSAPrivateKey_file(myssl, SERVERCERT, SSL_FILETYPE_PEM)) ++ if (!SSL_use_RSAPrivateKey_file(myssl, servercert, SSL_FILETYPE_PEM)) + { SSL_free(myssl); tls_err("no valid RSA private key"); return; } + + ciphers = env_get("TLSCIPHERS"); diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index 1fe442c43632..ed8a81551f92 100644 --- a/mail-mta/qmail/qmail-1.03-r16.ebuild +++ b/mail-mta/qmail/qmail-1.03-r16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.18 2005/06/05 15:21:17 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.19 2005/06/12 19:53:55 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails flag-o-matic @@ -253,7 +253,7 @@ src_unpack() { # TODO Should be fixed with new TLS-patch #epatch ${FILESDIR}/${PVR}/starttls-recordio.patch - # Add double-bounce-trim-patch from bug 45782 + # Add double-bounce-trim-patch from bug 67810 EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \ epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch @@ -261,6 +261,9 @@ src_unpack() { EPATCH_SINGLE_MSG="Applying fix for a special case with courier-imapd" \ epatch ${FILESDIR}/${PVR}/famd-dnotify.patch + # See bug 94257 + epatch ${FILESDIR}/${PVR}/qmail-1.03-env-servercert.patch + # See bug #90631 if use logmail; then EPATCH_SINGLE_MSG='Enabling logging of all mails via ~alias/.qmail-log' \ |