On Tue, May 22, 2018 at 08:23:20PM +0200, Jeremie Courreges-Anglas wrote:
> On Fri, May 18 2018, Klemens Nanni <k...@openbsd.org> wrote:
> > If neither `Pass' nor `PassCmd' is specified in the configuration,
> > mbsync(1) prompts for the IMAP password.
> >
> > This diff adds the missing "tty" promise in such cases.
> >
> > OK?
> >
> > PS: Noone complaint so far.
>
> I understand that getting rid of "proc exec" is appealing, but could you
> just add "tty" here?
As in `"tty" is not worth the hassle', here's a new diff.
I'm fine with both.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 12 May 2018 14:37:36 -0000 1.35
+++ Makefile 18 May 2018 20:41:45 -0000
@@ -3,7 +3,7 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
DISTNAME= isync-1.3.0
-REVISION= 1
+REVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
Index: patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/mail/isync/patches/patch-src_main_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_main_c
--- patches/patch-src_main_c 8 May 2018 22:07:42 -0000 1.3
+++ patches/patch-src_main_c 22 May 2018 19:33:09 -0000
@@ -12,30 +12,29 @@ Index: src/main.c
static void ATTR_PRINTFLIKE(1, 2)
debug( const char *msg, ... )
{
-@@ -716,6 +718,29 @@ main( int argc, char **argv )
+@@ -716,6 +718,28 @@ main( int argc, char **argv )
if (load_config( config, pseudo ))
return 1;
+
+ if (mvars->list) {
+ if (needs_proc_exec) {
-+ if (pledge("stdio rpath inet flock dns getpw proc exec"
-+ " prot_exec", NULL) == -1)
++ if (pledge("stdio rpath inet flock dns getpw tty"
++ " proc exec prot_exec", NULL) == -1)
+ sys_error("pledge\n");
+ } else {
-+ if (pledge("stdio rpath inet flock dns getpw"
-+ " prot_exec",
-+ NULL) == -1)
++ if (pledge("stdio rpath inet flock dns getpw tty"
++ " prot_exec", NULL) == -1)
+ sys_error("pledge\n");
+ }
+ } else {
+ if (needs_proc_exec) {
+ if (pledge("stdio rpath wpath cpath inet flock dns"
-+ " getpw proc exec prot_exec", NULL) == -1)
++ " getpw tty proc exec prot_exec", NULL) == -1)
+ sys_error("pledge\n");
+ } else {
+ if (pledge("stdio rpath wpath cpath inet flock dns"
-+ " getpw prot_exec", NULL) == -1)
++ " getpw tty prot_exec", NULL) == -1)
+ sys_error("pledge\n");
+ }
+ }
