On Tue, Mar 09, 2021 at 10:14:26PM +0100, Klemens Nanni wrote:
> The isync package finally drops the isync wrapper and only ships with
> mbsync(1); here's the relevant part from ${WRKSRC}/NEWS for the 1.4.x
> release branch:
>
> [1.4.0]
>
> The 'isync' compatibility wrapper was removed.
>
> Added support for disabling TLS v1.3 - adjust SSLVersions if you set it.
> Removed support for obsolete/insecure SSL v3.
>
> The IMAP '$Forwarded' / Maildir 'P' (passed) flag is supported now.
>
> Support for configuring a TLS cipher string was added.
>
> IMAP mailbox subscriptions are supported now.
>
> The IMAP user query can be scripted now.
>
> Added built-in support for macOS Keychain.
>
> Messages excluded by MaxSize will now result in placeholders.
>
> The use of Master/Slave terminology has been deprecated.
>
> I've been running this update without problems so far and will commit in
> a few days.
Works fine for my setup.
OK remi@
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 22 Feb 2021 18:50:53 -0000 1.46
> +++ Makefile 9 Mar 2021 21:03:50 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME= isync-1.3.5
> +DISTNAME= isync-1.4.1
>
> CATEGORIES= mail
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 22 Feb 2021 18:50:53 -0000 1.17
> +++ distinfo 22 Feb 2021 19:11:37 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.3.5.tar.gz) = aPUy5dzUNLArhz2SAyPryain2H8Rn3zAUDZdwBTPdlU=
> -SIZE (isync-1.3.5.tar.gz) = 316671
> +SHA256 (isync-1.4.1.tar.gz) = DTbbtXuwbIu+ELtm9ArlQwlbFDRDIJtwNxZ75gBCAVA=
> +SIZE (isync-1.4.1.tar.gz) = 336281
> Index: patches/patch-src_drv_imap_c
> ===================================================================
> RCS file: /cvs/ports/mail/isync/patches/patch-src_drv_imap_c,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-src_drv_imap_c
> --- patches/patch-src_drv_imap_c 22 Feb 2021 18:50:53 -0000 1.6
> +++ patches/patch-src_drv_imap_c 22 Feb 2021 19:26:20 -0000
> @@ -5,8 +5,8 @@ Use pledge.
> Index: src/drv_imap.c
> --- src/drv_imap.c.orig
> +++ src/drv_imap.c
> -@@ -41,6 +41,8 @@
> - # include <sasl/saslutil.h>
> +@@ -45,6 +45,8 @@
> + # include <Security/Security.h>
> #endif
>
> +extern int needs_proc_exec;
> @@ -14,12 +14,12 @@ Index: src/drv_imap.c
> #ifdef HAVE_LIBSSL
> enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
> #endif
> -@@ -3388,6 +3390,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> - }
> - acc_opt = 1;
> +@@ -3718,6 +3720,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> + #endif
> + 143;
> }
> + if (server->sconf.tunnel || server->pass_cmd)
> + needs_proc_exec = 1;
> - if (store)
> - type = "IMAP store", name = store->gen.name;
> - else
> + if (store) {
> + if (!store->server) {
> + store->server = nfmalloc( sizeof(sserver) );
> Index: patches/patch-src_main_c
> ===================================================================
> RCS file: /cvs/ports/mail/isync/patches/patch-src_main_c,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-src_main_c
> --- patches/patch-src_main_c 13 Jul 2020 00:08:10 -0000 1.8
> +++ patches/patch-src_main_c 22 Feb 2021 19:11:29 -0000
> @@ -14,9 +14,9 @@ Index: src/main.c
> static void ATTR_PRINTFLIKE(1, 2)
> debug( const char *msg, ... )
> {
> -@@ -738,6 +740,36 @@ main( int argc, char **argv )
> +@@ -754,6 +756,36 @@ main( int argc, char **argv )
>
> - if (load_config( config, pseudo ))
> + if (merge_ops( cops, ops ))
> return 1;
> +
> + if (mvars->list) {
> @@ -49,5 +49,5 @@ Index: src/main.c
> + }
> + }
>
> - if (!channels) {
> - fputs( "No channels defined. Try 'man " EXE "'\n", stderr );
> + if (load_config( config ))
> + return 1;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/isync/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 17 Oct 2017 17:24:14 -0000 1.8
> +++ pkg/PLIST 9 Mar 2021 21:04:46 -0000
> @@ -1,9 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.8 2017/10/17 17:24:14 danj Exp $
> -@bin bin/isync
> @bin bin/mbsync
> bin/mbsync-get-cert
> @bin bin/mdconvert
> -@man man/man1/isync.1
> @man man/man1/mbsync.1
> @man man/man1/mdconvert.1
> share/doc/isync/
> @@ -13,5 +11,4 @@ share/doc/isync/NEWS
> share/doc/isync/README
> share/doc/isync/TODO
> share/examples/isync/
> -share/examples/isync/isyncrc.sample
> share/examples/isync/mbsyncrc.sample
>
