Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 561152 Details for
Bug 675060
mail-mta/netqmail-1.06-r5 fails to build against dev-libs/openssl-1.1.0j
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
a patch for netqmail-1.05-tls-smtpauth-20070417.patch
netqmail-1.05-tls-smtpauth-20070417.patch.patch (text/plain), 2.64 KB, created by
Alexander Hof
on 2019-01-14 20:25:05 UTC
(
hide
)
Description:
a patch for netqmail-1.05-tls-smtpauth-20070417.patch
Filename:
MIME Type:
Creator:
Alexander Hof
Created:
2019-01-14 20:25:05 UTC
Size:
2.64 KB
patch
obsolete
>diff --git a/netqmail-1.05-tls-smtpauth-20070417.patch b/netqmail-1.05-tls-smtpauth-20070417.patch >index 1f12902..65e0c3d 100644 >--- a/netqmail-1.05-tls-smtpauth-20070417.patch >+++ b/netqmail-1.05-tls-smtpauth-20070417.patch >@@ -1,8 +1,9 @@ >-VERSION: 20070417 >+VERSION: 20190114 > > This patch for netqmail 1.05 is a composite of the latest versions of Frederik > Vermulen's TLS patch (20070408) and Erwin Hoffmann's SMTP-AUTH (0.5.8) update > to Eric M. Johnston's and Krzysztof Dabrowski's qmail-smtpd-auth-0.31 patch. >+It was later ported to openssl 1.1.x by Alex H. (git@alexh.name). > > To install, get netqmail 1.05, put it in the same directory as this patch, and > then set it up: >@@ -804,8 +805,8 @@ diff -urN ../../netqmail-1.05-orig/netqmail-1.05/qmail-remote.c ./qmail-remote.c > { > +#ifdef TLS > + /* shouldn't talk to the client unless in an appropriate state */ >-+ int state = ssl ? ssl->state : SSL_ST_BEFORE; >-+ if (state & SSL_ST_OK || (!smtps && state & SSL_ST_BEFORE)) >++ int state = ssl ? SSL_get_state(ssl) : TLS_ST_BEFORE; >++ if (state & TLS_ST_OK || (!smtps && state & TLS_ST_BEFORE)) > +#endif > substdio_putsflush(&smtpto,"QUIT\r\n"); > /* waiting for remote side is just too ridiculous */ >@@ -1010,7 +1011,7 @@ diff -urN ../../netqmail-1.05-orig/netqmail-1.05/qmail-remote.c ./qmail-remote.c > + X509_NAME *subj = X509_get_subject_name(peercert); > + i = X509_NAME_get_index_by_NID(subj, NID_commonName, -1); > + if (i >= 0) { >-+ const ASN1_STRING *s = X509_NAME_get_entry(subj, i)->value; >++ const ASN1_STRING *s = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subj, i)); > + if (s) { peer.len = s->length; peer.s = s->data; } > + } > + if (peer.len <= 0) { >@@ -1839,7 +1840,7 @@ diff -urN ../../netqmail-1.05-orig/netqmail-1.05/qmail-smtpd.c ./qmail-smtpd.c > + subj = X509_get_subject_name(peercert); > + n = X509_NAME_get_index_by_NID(subj, NID_pkcs9_emailAddress, -1); > + if (n >= 0) { >-+ const ASN1_STRING *s = X509_NAME_get_entry(subj, n)->value; >++ const ASN1_STRING *s = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subj, n)); > + if (s) { email.len = s->length; email.s = s->data; } > + } > + >@@ -2132,10 +2133,10 @@ diff -urN ../../netqmail-1.05-orig/netqmail-1.05/ssl_timeoutio.c ./ssl_timeoutio > + > + SSL_renegotiate(ssl); > + r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); >-+ if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r; >++ if (r <= 0 || SSL_get_state(ssl) == SSL_ST_CONNECT) return r; > + > + /* this is for the server only */ >-+ ssl->state = SSL_ST_ACCEPT; >++ SSL_set_accept_state(ssl); > + return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); > +} > +
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 675060
:
560604
| 561152 |
561154
|
561156
|
561158
|
576818
|
576820
|
589470