[packages/pinentry] - added missing format patch, release 2

qboosh qboosh at pld-linux.org
Wed Dec 6 16:22:26 CET 2017


commit e199b8d05b88afb1339b28d5a71c0129ffddeb24
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 6 16:23:38 2017 +0100

    - added missing format patch, release 2

 pinentry-format.patch | 26 ++++++++++++++++++++++++++
 pinentry.spec         |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index 5fa2b36..1db5586 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -11,7 +11,7 @@ Summary:	Simple PIN or passphrase entry dialogs
 Summary(pl.UTF-8):	Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
 Name:		pinentry
 Version:	1.1.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
diff --git a/pinentry-format.patch b/pinentry-format.patch
new file mode 100644
index 0000000..dad35d8
--- /dev/null
+++ b/pinentry-format.patch
@@ -0,0 +1,26 @@
+--- pinentry-1.1.0/fltk/main.cxx.orig	2017-12-03 17:13:05.000000000 +0100
++++ pinentry-1.1.0/fltk/main.cxx	2017-12-05 17:52:30.945016594 +0100
+@@ -241,12 +241,12 @@
+ 				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 @@
+ 				}
+ 				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:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pinentry.git/commitdiff/e199b8d05b88afb1339b28d5a71c0129ffddeb24



More information about the pld-cvs-commit mailing list