diff options
| author | danfe <danfe@FreeBSD.org> | 2016-01-29 11:21:32 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2016-01-29 11:21:32 +0800 |
| commit | 134eee418c6713611607ca322d95c384fd13f2b5 (patch) | |
| tree | 978abe8349a0fda0b1e7c3bc536fbd7b565db4bc /mail | |
| parent | b6cec179f0fb89c9806688f181a46a9f516308f8 (diff) | |
| download | freebsd-ports-gnome-134eee418c6713611607ca322d95c384fd13f2b5.tar.gz freebsd-ports-gnome-134eee418c6713611607ca322d95c384fd13f2b5.tar.zst freebsd-ports-gnome-134eee418c6713611607ca322d95c384fd13f2b5.zip | |
Merge patches that patch the same file.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dovecot/files/patch-src__login-common__ssl-proxy-openssl.c | 11 | ||||
| -rw-r--r-- | mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/mail/dovecot/files/patch-src__login-common__ssl-proxy-openssl.c b/mail/dovecot/files/patch-src__login-common__ssl-proxy-openssl.c deleted file mode 100644 index b2a7adcdbb15..000000000000 --- a/mail/dovecot/files/patch-src__login-common__ssl-proxy-openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/login-common/ssl-proxy-openssl.c.orig 2015-03-19 11:57:04.578367000 -0500 -+++ src/login-common/ssl-proxy-openssl.c 2015-03-19 11:57:21.859436000 -0500 -@@ -818,7 +818,7 @@ static void ssl_proxy_ctx_init(SSL_CTX * - { - const char *cafile; - -- SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); -+ SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); - - cafile = getenv("SSL_CA_FILE"); - if (cafile != NULL) { diff --git a/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c b/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c index bafb55067c07..3985bc727695 100644 --- a/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c +++ b/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c @@ -1,5 +1,5 @@ ---- src/login-common/ssl-proxy-openssl.c.orig 2015-03-07 13:25:36.487131678 +0100 -+++ src/login-common/ssl-proxy-openssl.c 2015-03-07 13:24:28.303136938 +0100 +--- src/login-common/ssl-proxy-openssl.c.orig 2011-01-20 21:16:59 UTC ++++ src/login-common/ssl-proxy-openssl.c @@ -21,6 +21,7 @@ #include <openssl/ssl.h> #include <openssl/err.h> @@ -8,3 +8,12 @@ #define DOVECOT_SSL_DEFAULT_CIPHER_LIST "ALL:!LOW:!SSLv2" /* Check every 30 minutes if parameters file has been updated */ +@@ -817,7 +818,7 @@ static void ssl_proxy_ctx_init(SSL_CTX * + { + const char *cafile; + +- SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); ++ SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + + cafile = getenv("SSL_CA_FILE"); + if (cafile != NULL) { |