Re: security/pinentry patch for WINOUT_X11 systems
Jun-SAN, On Sun, 28 Dec 2014, Jun Kuriyama wrote: > At Tue, 23 Dec 2014 00:36:24 +0300 (MSK), > Dmitry Morozovsky wrote: > > > > pinentry currently brokes if WITHOUT_X11 (or, by new world orderm > > > > OPTIONS_UNSET+=X11) is set. > > > > > > You can use security/pinentry-curses if you don't want Qt/GTK+ gui. > > > > Ah I see. Maybe then security/gnupg should detect headless config and > > switch > > between generic and curses ports, perhaps? > > Hmm, I'm no problem with this patch, but should this be handled by > security/pinentry meta-port side? Yes, Max' solution to make pinentry meta-port is much more flexible (it has been implemented between my mail with CC: to you and current time). Thanks, and sorry for the noise! > > > Index: security/gnupg/Makefile > > === > > --- security/gnupg/Makefile (revision 375271) > > +++ security/gnupg/Makefile (working copy) > > @@ -22,7 +22,11 @@ > > libksba.so:${PORTSDIR}/security/libksba \ > > libnpth.so:${PORTSDIR}/devel/npth > > BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error > > +.if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} > > +RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry-curses > > +.else > > RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry > > +.endif > > > > GNU_CONFIGURE= YES > > USES= gmake iconv tar:bzip2 > > > -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: security/pinentry patch for WINOUT_X11 systems
At Tue, 23 Dec 2014 00:36:24 +0300 (MSK), Dmitry Morozovsky wrote: > > > pinentry currently brokes if WITHOUT_X11 (or, by new world orderm > > > OPTIONS_UNSET+=X11) is set. > > > > You can use security/pinentry-curses if you don't want Qt/GTK+ gui. > > Ah I see. Maybe then security/gnupg should detect headless config and switch > between generic and curses ports, perhaps? Hmm, I'm no problem with this patch, but should this be handled by security/pinentry meta-port side? > Index: security/gnupg/Makefile > === > --- security/gnupg/Makefile (revision 375271) > +++ security/gnupg/Makefile (working copy) > @@ -22,7 +22,11 @@ > libksba.so:${PORTSDIR}/security/libksba \ > libnpth.so:${PORTSDIR}/devel/npth > BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error > +.if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} > +RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry-curses > +.else > RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry > +.endif > > GNU_CONFIGURE= YES > USES= gmake iconv tar:bzip2 -- Jun Kuriyama // FreeBSD Project // S2 Factory, Inc. ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: security/pinentry patch for WINOUT_X11 systems
On Mon, 22 Dec 2014, Max Brazhnikov wrote: > > pinentry currently brokes if WITHOUT_X11 (or, by new world orderm > > OPTIONS_UNSET+=X11) is set. > > You can use security/pinentry-curses if you don't want Qt/GTK+ gui. Ah I see. Maybe then security/gnupg should detect headless config and switch between generic and curses ports, perhaps? Index: security/gnupg/Makefile === --- security/gnupg/Makefile (revision 375271) +++ security/gnupg/Makefile (working copy) @@ -22,7 +22,11 @@ libksba.so:${PORTSDIR}/security/libksba \ libnpth.so:${PORTSDIR}/devel/npth BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error +.if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} +RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry-curses +.else RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry +.endif GNU_CONFIGURE= YES USES= gmake iconv tar:bzip2 -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: security/pinentry patch for WINOUT_X11 systems
On Fri, 19 Dec 2014 15:26:27 +0300 Dmitry Morozovsky wrote: > Max, > > pinentry currently brokes if WITHOUT_X11 (or, by new world orderm > OPTIONS_UNSET+=X11) is set. You can use security/pinentry-curses if you don't want Qt/GTK+ gui. > what do you think about the following patch? Feel free to commit if you're really need it. > > marck@castor:/FreeBSD/ports/ports/security/pinentry> svn diff > Index: Makefile > === > --- Makefile(revision 374940) > +++ Makefile(working copy) > @@ -25,7 +25,11 @@ > .if !defined(PINENTRY_SLAVE) > OPTIONS_MULTI= FRONTEND > OPTIONS_MULTI_FRONTEND=NCURSES GTK2 QT4 > +. if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} > +OPTIONS_DEFAULT= NCURSES > +. else > OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} > +. endif > > NCURSES_DESC= Curses frontend > GTK2_DESC= Gtk+ 2 frontend signature.asc Description: This is a digitally signed message part.
Re: security/pinentry patch for WINOUT_X11 systems
On 19/12/2014 11:26 PM, Dmitry Morozovsky wrote: > Max, > > pinentry currently brokes if WITHOUT_X11 (or, by new world orderm > OPTIONS_UNSET+=X11) is set. > > what do you think about the following patch? > > marck@castor:/FreeBSD/ports/ports/security/pinentry> svn diff > Index: Makefile > === > --- Makefile(revision 374940) > +++ Makefile(working copy) > @@ -25,7 +25,11 @@ > .if !defined(PINENTRY_SLAVE) > OPTIONS_MULTI= FRONTEND > OPTIONS_MULTI_FRONTEND=NCURSES GTK2 QT4 > +. if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} > +OPTIONS_DEFAULT= NCURSES > +. else > OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} > +. endif > > NCURSES_DESC= Curses frontend > GTK2_DESC= Gtk+ 2 frontend > > Max, That's a good idea and ensures a correct build but it adds complexity if packages are built for other target environments. The use of src.conf was "meant" to be guidence for the buildworld/buildkernel experience, its expedient use in ports adds unintented logic to Makefiles and we've learnt to rename src.conf when ports are built to minimise this. The change to pinentry options (removing GTK) caused a problem for us too, when we rebuilt our package set. Ensuring that the appropriate front-end is selected, in our case ncurses, as an option is the better, more general solution. Regards, Dewayne. -- For the talkers: “The superior man acts before he speaks, and afterwards speaks according to his action.” For everyone else: “Life is really simple, but we insist on making it complicated.” ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
security/pinentry patch for WINOUT_X11 systems
Max, pinentry currently brokes if WITHOUT_X11 (or, by new world orderm OPTIONS_UNSET+=X11) is set. what do you think about the following patch? marck@castor:/FreeBSD/ports/ports/security/pinentry> svn diff Index: Makefile === --- Makefile(revision 374940) +++ Makefile(working copy) @@ -25,7 +25,11 @@ .if !defined(PINENTRY_SLAVE) OPTIONS_MULTI= FRONTEND OPTIONS_MULTI_FRONTEND=NCURSES GTK2 QT4 +. if defined(WITHOUT_X11) || ${OPTIONS_UNSET:MX11} +OPTIONS_DEFAULT= NCURSES +. else OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} +. endif NCURSES_DESC= Curses frontend GTK2_DESC= Gtk+ 2 frontend -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"