Michael McConville wrote:
> The only change in this release is the addition of our SSLv3 patch.
>
> ok?
jturner@ pointed out that this has to wait two weeks because it removes
a file, but ok'd otherwise.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/imapfilter/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile 22 Jan 2016 00:51:24 -0000 1.21
> +++ Makefile 25 Feb 2016 01:49:19 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= remote IMAP filtering utility
>
> -V= 2.6.5
> +V= 2.6.6
> DISTNAME= imapfilter-${V}
>
> GH_TAGNAME= v${V}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/imapfilter/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 22 Jan 2016 00:51:24 -0000 1.12
> +++ distinfo 25 Feb 2016 01:49:19 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (imapfilter-2.6.5.tar.gz) =
> D0tJ4b516/1eOjvb/wHWiqr9t6zdw1/EDc9DcClwgFU=
> -SIZE (imapfilter-2.6.5.tar.gz) = 56993
> +SHA256 (imapfilter-2.6.6.tar.gz) =
> Pukh2cojx5QpH6mBUCjgLBngVJ4fje0RM6DuF0emIw4=
> +SIZE (imapfilter-2.6.6.tar.gz) = 57086
> Index: patches/patch-src_socket_c
> ===================================================================
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- patches/patch-src_socket_c 4 Nov 2015 17:51:18 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,32 +0,0 @@
> -$OpenBSD: patch-src_socket_c,v 1.1 2015/11/04 17:51:18 jca Exp $
> -
> -Cope with SSLv3 removal.
> -
> ---- src/socket.c.orig Wed Sep 30 22:55:26 2015
> -+++ src/socket.c Mon Nov 2 22:47:35 2015
> -@@ -16,8 +16,10 @@
> - #include "imapfilter.h"
> - #include "session.h"
> -
> --
> --SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
> -+SSL_CTX *ssl23ctx, *tls1ctx;
> -+#ifndef OPENSSL_NO_SSL3_METHOD
> -+SSL_CTX *ssl3ctx;
> -+#endif
> - #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
> - SSL_CTX *tls11ctx, *tls12ctx;
> - #endif
> -@@ -95,7 +97,12 @@ open_secure_connection(session *ssn)
> - if (!ssn->sslproto) {
> - ctx = ssl23ctx;
> - } else if (!strcasecmp(ssn->sslproto, "ssl3")) {
> -+#ifndef OPENSSL_NO_SSL3_METHOD
> - ctx = ssl3ctx;
> -+#else
> -+ error("protocol SSLv3 not supported\n");
> -+ goto fail;
> -+#endif
> - } else if (!strcasecmp(ssn->sslproto, "tls1")) {
> - ctx = tls1ctx;
> - } else if (!strcasecmp(ssn->sslproto, "tls1.1")) {
>
