cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to imapfilter 2.6.5

Browse Source 
ok juanfra@
This commit is contained in:
mmcc 2016-01-22 00:51:24 +00:00
parent 1df40f76ef
commit 7f474b0639
3 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/imapfilter/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2016/01/07 17:33:38 mmcc Exp $
# $OpenBSD: Makefile,v 1.21 2016/01/22 00:51:24 mmcc Exp $
COMMENT= remote IMAP filtering utility
V= 2.6.4
V= 2.6.5
DISTNAME= imapfilter-${V}
GH_TAGNAME= v${V}

4
mail/imapfilter/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (imapfilter-2.6.4.tar.gz) = qyn6qxWluaxha/ymURTFBno6JrezLipwwy6xKsHxbB4=
SIZE (imapfilter-2.6.4.tar.gz) = 56920
SHA256 (imapfilter-2.6.5.tar.gz) = D0tJ4b516/1eOjvb/wHWiqr9t6zdw1/EDc9DcClwgFU=
SIZE (imapfilter-2.6.5.tar.gz) = 56993

48
mail/imapfilter/patches/patch-src_imapfilter_c
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-src_imapfilter_c,v 1.3 2015/11/04 17:51:18 jca Exp $
Cope with SSLv3 removal.
--- src/imapfilter.c.orig Wed Sep 30 22:55:26 2015
+++ src/imapfilter.c Mon Nov 2 22:37:03 2015
@@ -21,7 +21,10 @@
extern buffer ibuf, obuf, nbuf, cbuf;
extern regexp responses[];
-extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
+extern SSL_CTX *ssl23ctx, *tls1ctx;
+#ifndef OPENSSL_NO_SSL3_METHOD
+extern SSL_CTX *ssl3ctx;
+#endif
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
extern SSL_CTX *tls11ctx, *tls12ctx;
#endif
@@ -114,7 +117,9 @@ main(int argc, char *argv[])
SSL_library_init();
SSL_load_error_strings();
+#ifndef OPENSSL_NO_SSL3_METHOD
ssl3ctx = SSL_CTX_new(SSLv3_client_method());
+#endif
ssl23ctx = SSL_CTX_new(SSLv23_client_method());
tls1ctx = SSL_CTX_new(TLSv1_client_method());
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
@@ -125,7 +130,9 @@ main(int argc, char *argv[])
capath = opts.truststore;
else if (exists_file(opts.truststore))
cafile = opts.truststore;
+#ifndef OPENSSL_NO_SSL3_METHOD
SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
+#endif
SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
@@ -150,7 +157,9 @@ main(int argc, char *argv[])
#endif
stop_lua();
+#ifndef OPENSSL_NO_SSL3_METHOD
SSL_CTX_free(ssl3ctx);
+#endif
SSL_CTX_free(ssl23ctx);
SSL_CTX_free(tls1ctx);
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL