Hello community,

here is the log from the commit of package pinentry for openSUSE:Factory 
checked in at 2015-10-28 17:17:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pinentry (Old)
 and      /work/SRC/openSUSE:Factory/.pinentry.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pinentry"

Changes:
--------
--- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes        2015-10-17 
16:37:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes   2015-10-28 
17:17:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Oct 21 12:28:42 UTC 2015 - dmuel...@suse.com
+
+- add pinentry-qt4-fix-qstring-conversion.patch (bsc#951307)
+
+-------------------------------------------------------------------

New:
----
  pinentry-qt4-fix-qstring-conversion.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pinentry.spec ++++++
--- /var/tmp/diff_new_pack.K1lSXj/_old  2015-10-28 17:17:34.000000000 +0100
+++ /var/tmp/diff_new_pack.K1lSXj/_new  2015-10-28 17:17:34.000000000 +0100
@@ -34,6 +34,7 @@
 Patch1:         pinentry-0.7.2-gtk+-2.4.diff
 # PATCH-FIX-SUSE make it build with ncurses ABI 6
 Patch7:         pinentry-ncurses6.diff
+Patch8:         pinentry-qt4-fix-qstring-conversion.patch
 BuildRequires:  libassuan-devel >= 2.1.0
 BuildRequires:  libgpg-error-devel >= 1.16
 BuildRequires:  libqt4-devel
@@ -106,6 +107,7 @@
 %setup -q
 %patch1 -p1
 %patch7
+%patch8 -p1
 
 %build
 # Regenerate moc's


++++++ pinentry-qt4-fix-qstring-conversion.patch ++++++
Index: pinentry-0.9.6/qt/main.cpp
===================================================================
--- pinentry-0.9.6.orig/qt/main.cpp
+++ pinentry-0.9.6/qt/main.cpp
@@ -190,15 +190,15 @@ qt_cmd_handler (pinentry_t pe)
       if (!ret)
        return -1;
 
-      const char *pin = pinentry.pin().toUtf8().constData();
+      QByteArray pin = pinentry.pin().toUtf8();
 
-      int len = strlen (pin);
+      int len = strlen (pin.constData());
       if (len >= 0)
        {
          pinentry_setbufferlen (pe, len + 1);
          if (pe->pin)
            {
-             strcpy (pe->pin, pin);
+             strcpy (pe->pin, pin.constData());
              return len;
            }
        }

Reply via email to