pinentry: upgrade 1.3.2 -> 1.3.3

For detailed information, see the link below:
[1] https://github.com/gpg/pinentry/compare/pinentry-1.3.2...pinentry-1.3.3
[2] https://github.com/gpg/pinentry/blob/pinentry-1.3.3/NEWS

Note: small modification to libassuan_pkgconf.patch

Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index ebaf01f777c7dac6876e7e80725580007780c92b..3e0bd6f4ec757532a9945b8597c65042f192eb80 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -155,7 +155,7 @@ class OEListPackageconfigTests(OESelftestTestCase):
     def test_packageconfig_flags_option_all(self):
         results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir)
         expected_endlines = []
-        expected_endlines.append("pinentry-1.3.2")
+        expected_endlines.append("pinentry-1.3.3")
         expected_endlines.append("PACKAGECONFIG ncurses")
         expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase")
         expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")

diff --git a/meta/recipes-support/pinentry/pinentry/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry/libassuan_pkgconf.patch
index fbd370d9fd629d824793e8fff08d2d59d3c56da5..4ae7641c481ac3d1b23b2f8fe915eb48c071650a 100644 (file)
--- a/meta/recipes-support/pinentry/pinentry/libassuan_pkgconf.patch
+++ b/meta/recipes-support/pinentry/pinentry/libassuan_pkgconf.patch
@@ -1,5 +1,5 @@
 From 1bf04756b90832494020c39661ea944a0b11204f Mon Sep 17 00:00:00 2001
-From: Armin Kuster <akuster@mvista.com>
+From: Siddharth Doshi <sdoshi@mvista.com>
 Date: Thu, 22 May 2014 10:50:00 +0100
 Subject: [PATCH] libassuan: Improve pkgconfig support
 
@@ -9,6 +9,7 @@ the libassuan recipe for libassuan.pc generation.
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Armin Kuster <akuster@mvista.com>
+Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
 ---
  configure.ac    |  4 +--
  m4/libassuan.m4 | 94 ++++---------------------------------------------
@@ -51,7 +52,7 @@ index a2eb5d9..897f407 100644
 -  fi
 -
 -  use_gpgrt_config=""
--  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+-  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
 -    if $GPGRT_CONFIG libassuan --exists; then
 -      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
 -      AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])

diff --git a/meta/recipes-support/pinentry/pinentry_1.3.2.bb b/meta/recipes-support/pinentry/pinentry_1.3.3.bb
similarity index 93%
rename from meta/recipes-support/pinentry/pinentry_1.3.2.bb
rename to meta/recipes-support/pinentry/pinentry_1.3.3.bb
index a5c8d2258a6de737191f367084fb4b02767ed7e7..325a75a7cb9f0c8a740ed5dc0a030e6a950c037a 100644 (file)
--- a/meta/recipes-support/pinentry/pinentry_1.3.2.bb
+++ b/meta/recipes-support/pinentry/pinentry_1.3.3.bb
@@ -16,7 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0001-find-gpg-error-with-pkg-config.patch \
 "
 
-SRC_URI[sha256sum] = "8e986ed88561b4da6e9efe0c54fa4ca8923035c99264df0b0464497c5fb94e9e"
+SRC_URI[sha256sum] = "c2970f16d6afb66ecddfca767d743936c86239bff936eed7fd7597a678414b63"
 
 inherit autotools pkgconfig