- added missing format patch, release 2

diff --git a/pinentry-format.patch b/pinentry-format.patch
new file mode 100644 (file)
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:

diff --git a/pinentry.spec b/pinentry.spec
index 5fa2b36752515d0b789fa69351e68671f4241c39..1db55861ba3866a72e2dc001d0b953c5f5aba7eb 100644 (file)
--- 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