pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pinentry-fltk: Created package for FLTK toolkit



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Jan 17 12:47:33 2019 +0100
Changeset:	4fa3b662e65a32e6c4f6aa69f009e0883dfd0c95

Added Files:
	pinentry-fltk/DESCR
	pinentry-fltk/Makefile
	pinentry-fltk/PLIST
	pinentry-fltk/patches/patch-fltk_main.cxx

Log Message:
pinentry-fltk: Created package for FLTK toolkit

The patch (from Debian) fixes the format string handling.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4fa3b662e65a32e6c4f6aa69f009e0883dfd0c95

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pinentry-fltk/DESCR                       |  4 ++++
 pinentry-fltk/Makefile                    | 22 ++++++++++++++++++++++
 pinentry-fltk/PLIST                       |  2 ++
 pinentry-fltk/patches/patch-fltk_main.cxx | 30 ++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)

diffs:
diff --git a/pinentry-fltk/DESCR b/pinentry-fltk/DESCR
new file mode 100644
index 0000000000..51c5dfc9d8
--- /dev/null
+++ b/pinentry-fltk/DESCR
@@ -0,0 +1,4 @@
+This is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+It provides programs for several graphical toolkits, such as FLTK,
+GTK+ and QT, as well as for the console, using curses.
diff --git a/pinentry-fltk/Makefile b/pinentry-fltk/Makefile
new file mode 100644
index 0000000000..cb46a34c64
--- /dev/null
+++ b/pinentry-fltk/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+PKGNAME=		${DISTNAME:S/pinentry-/pinentry-fltk-/}
+COMMENT=		Applications for entering PINs or Passphrases, FLTK enabled
+
+.include		"../../security/pinentry/Makefile.common"
+
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		pkg-config
+
+CONFIGURE_ARGS+=	--disable-pinentry-gtk2
+CONFIGURE_ARGS+=        --disable-pinentry-qt
+CONFIGURE_ARGS+=        --disable-pinentry-curses
+CONFIGURE_ARGS+=        --disable-pinentry-emacs
+#CONFIGURE_ARGS+=       --disable-fallback-curses
+CONFIGURE_ARGS+=        --disable-pinentry-gnome3
+CONFIGURE_ARGS+=        --disable-libsecret
+
+INSTALL_DIRS=		fltk
+
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pinentry-fltk/PLIST b/pinentry-fltk/PLIST
new file mode 100644
index 0000000000..37d56431c3
--- /dev/null
+++ b/pinentry-fltk/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/pinentry-fltk
diff --git a/pinentry-fltk/patches/patch-fltk_main.cxx b/pinentry-fltk/patches/patch-fltk_main.cxx
new file mode 100644
index 0000000000..315673d54a
--- /dev/null
+++ b/pinentry-fltk/patches/patch-fltk_main.cxx
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Fix format string handling (Patch from Debian).
+
+--- fltk/main.cxx.orig	2017-12-03 16:13:05.000000000 +0000
++++ fltk/main.cxx
+@@ -241,12 +241,12 @@ static int fltk_cmd_handler(pinentry_t p
+ 				if (pe->one_button)
+ 				{
+ 					fl_ok = ok.c_str();
+-					fl_message(message);
++					fl_message("%s", message);
+ 					result = 1; // OK
+ 				}
+ 				else if (pe->notok)
+ 				{
+-					switch (fl_choice(message, ok.c_str(), cancel.c_str(), pe->notok))
++					switch (fl_choice("%s", ok.c_str(), cancel.c_str(), pe->notok, message))
+ 					{
+ 					case 0: result = 1; break;
+ 					case 2: result = 0; break;
+@@ -256,7 +256,7 @@ static int fltk_cmd_handler(pinentry_t p
+ 				}
+ 				else
+ 				{
+-					switch (fl_choice(message, ok.c_str(), cancel.c_str(), NULL))
++					switch (fl_choice("%s", ok.c_str(), cancel.c_str(), NULL, message))
+ 					{
+ 					case 0: result = 1; break;
+ 					default:


Home | Main Index | Thread Index | Old Index