On 2015/07/18 18:43, Michael McConville wrote:
> On Sat, Jul 18, 2015 at 10:50:12PM +0100, Stuart Henderson wrote:
> > On 2015/07/18 16:51, Michael McConville wrote:
> > > This should be /etc/ssl/cert.pem for us, no?
> > > 
> > >   https://github.com/lefcha/imapfilter/blob/master/src/imapfilter.c#L55
> > > 
> > > Related ticket here:
> > > 
> > >   https://github.com/lefcha/imapfilter/issues/94
> > > 
> > > I get that ticket's error on the current port (2.6.1) for one of the
> > > three IMAP domains I filter. Using '-t /etc/ssl/cert.pem' fixes it.
> > > 
> > 
> > Yep, that looks correct. Do you have a diff for the port?
> 
> Here it is. Tested, fixed the issue for me.
> 
> I'll mention it on their issue tracker if/when it's committed.

Thanks, committed - I also needed to bump REVISION.

> 
> 
> Index: patches/patch-src_imapfilter_c
> ===================================================================
> RCS file: /cvs/ports/mail/imapfilter/patches/patch-src_imapfilter_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_imapfilter_c
> --- patches/patch-src_imapfilter_c    18 Jul 2015 04:51:29 -0000      1.1
> +++ patches/patch-src_imapfilter_c    18 Jul 2015 22:34:38 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-src_imapfilter_c,v 1.1 2015/07/18 04:51:29 sthen Exp $
> ---- src/imapfilter.c.orig    Fri Jul 17 22:23:22 2015
> -+++ src/imapfilter.c Fri Jul 17 22:25:40 2015
> +--- src/imapfilter.c.orig    Mon Jun 29 02:33:17 2015
> ++++ src/imapfilter.c Sat Jul 18 18:34:04 2015
>  @@ -21,7 +21,10 @@
>   
>   extern buffer ibuf, obuf, nbuf, cbuf;
> @@ -13,6 +13,15 @@ $OpenBSD: patch-src_imapfilter_c,v 1.1 2
>   #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
>   extern SSL_CTX *tls11ctx, *tls12ctx;
>   #endif
> +@@ -52,7 +55,7 @@ main(int argc, char *argv[])
> +     opts.config = NULL;
> +     opts.oneline = NULL;
> +     opts.debug = NULL;
> +-    opts.truststore = "/etc/ssl/certs";
> ++    opts.truststore = "/etc/ssl/cert.pem";
> + 
> +     env.home = NULL;
> +     env.pathmax = -1;
>  @@ -109,7 +112,9 @@ main(int argc, char *argv[])
>   
>       SSL_library_init();
> 

Reply via email to