Update to 1.13.1

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -14,3 +14,4 @@
 /gpgme-1.11.0.tar.bz2
 /gpgme-1.11.1.tar.bz2
 /gpgme-1.12.0.tar.bz2
+/gpgme-1.13.1.tar.bz2

0001-python-bindings-callback-test.patch

@@ -1,93 +0,0 @@
-From 651a1afe80bcc421da26f38015e8a322e140f130 Mon Sep 17 00:00:00 2001
-From: Ben McGinnes <ben@adversary.org>
-Date: Sat, 20 Oct 2018 11:07:55 +1100
-Subject: [PATCH] python bindings: callback test
-
-* lang/python/tests/t-callbacks.py: Updated test logic to try
-  generating a key which expires in 2099 and if that fails then
-  fallback to an expiration in 2037 in an attempt to catch the 32-bit
-  systems.
----
- lang/python/tests/t-callbacks.py | 32 ++++++++++++++++++++++++++++++--
- 1 file changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
-index 5bcac237..3a210dd0 100755
---- a/lang/python/tests/t-callbacks.py
-+++ b/lang/python/tests/t-callbacks.py
-@@ -20,12 +20,14 @@
- from __future__ import absolute_import, print_function, unicode_literals
- 
- import os
-+import platform
- import gpg
- import support
- _ = support  # to appease pyflakes.
- 
- del absolute_import, print_function, unicode_literals
- 
-+oops = None
- c = gpg.Context()
- c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
- 
-@@ -99,6 +101,17 @@ Expire-Date: 2099-12-31
- </GnupgKeyParms>
- """
- 
-+prams = """<GnupgKeyParms format="internal">
-+Key-Type: RSA
-+Key-Length: 1024
-+Name-Real: Joe Tester
-+Name-Comment: with stupid passphrase
-+Name-Email: joe+gpg@example.org
-+Passphrase: Crypt0R0cks
-+Expire-Date: 2037-12-31
-+</GnupgKeyParms>
-+"""
-+
- messages = []
- 
- 
-@@ -111,7 +124,10 @@ def progress_cb(what, typ, current, total, hook=None):
- 
- c = gpg.Context()
- c.set_progress_cb(progress_cb, messages)
--c.op_genkey(parms, None, None)
-+try:
-+    c.op_genkey(parms, None, None)
-+except Exception as oops:
-+    c.op_genkey(prams, None, None)
- assert len(messages) > 0
- 
- 
-@@ -123,7 +139,10 @@ def progress_cb(what, typ, current, total, hook=None):
- c = gpg.Context()
- c.set_progress_cb(progress_cb, None)
- try:
--    c.op_genkey(parms, None, None)
-+    try:
-+        c.op_genkey(parms, None, None)
-+    except Exception as oops:
-+        c.op_genkey(prams, None, None)
- except Exception as e:
-     assert e == myException
- else:
-@@ -139,6 +158,15 @@ alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
- cookie = object()
- edit_cb_called = False
- 
-+def oops_check():
-+    if oops is not None and platform.architecture()[0] != "64bit":
-+        y2k38_msg = "System appears to be 32-bit and vulnerable to EOL in 2038."
-+    elif oops is not None and platform.architecture()[0] == "64bit":
-+        y2k38_msg = "System appears to be 64-bit, but may use 32-bit time."
-+    else:
-+        y2k38_msg = "System is 64-bit and/or not susceptible to 2038 EOL."
-+    return y2k38_msg
-+
- 
- def edit_cb(status, args, hook):
-     global edit_cb_called
--- 
-2.21.0.rc1
-

0001-qt-Use-tofu-conflict-test-keys-without-expiry.patch

@@ -1,100 +0,0 @@
-From 66376f3e206a1aa791d712fb8577bb3490268f60 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@gnupg.org>
-Date: Wed, 9 Jan 2019 08:25:21 +0100
-Subject: [PATCH] qt: Use tofu conflict test keys without expiry
-
-* lang/qt/tests/t-tofuinfo.cpp: Use new test keys without
-expiry.
-
---
-The old keys expired on 2019-01-06.
-
-GnuPG-Bug-Id: T3815
----
- lang/qt/tests/t-tofuinfo.cpp | 58 +++++++++++++++++++-----------------
- 1 file changed, 30 insertions(+), 28 deletions(-)
-
-diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
-index b7161028..2d881069 100644
---- a/lang/qt/tests/t-tofuinfo.cpp
-+++ b/lang/qt/tests/t-tofuinfo.cpp
-@@ -69,46 +69,48 @@ static const char testMsg1[] =
- 
- static const char conflictKey1[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
- "\n"
--"mDMEWG+w/hYJKwYBBAHaRw8BAQdAiq1oStvDYg8ZfFs5DgisYJo8dJxD+C/AA21O\n"
--"K/aif0O0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBHoJBLaV\n"
--"DamYAgoa1L5BwMOl/x88BQJYb7D+AhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
--"Ah4BAheAAAoJEL5BwMOl/x88GvwA/0SxkbLyAcshGm2PRrPsFQsSVAfwaSYFVmS2\n"
--"cMVIw1PfAQDclRH1Z4MpufK07ju4qI33o4s0UFpVRBuSxt7A4P2ZD7g4BFhvsP4S\n"
--"CisGAQQBl1UBBQEBB0AmVrgaDNJ7K2BSalsRo2EkRJjHGqnp5bBB0tapnF81CQMB\n"
--"CAeIeAQYFggAIBYhBHoJBLaVDamYAgoa1L5BwMOl/x88BQJYb7D+AhsMAAoJEL5B\n"
--"wMOl/x88OR0BAMq4/vmJUORRTmzjHcv/DDrQB030DSq666rlckGIKTShAPoDXM9N\n"
--"0gZK+YzvrinSKZXHmn0aSwmC1/hyPybJPEljBw==\n"
--"=p2Oj\n"
-+"mDMEXDWgpxYJKwYBBAHaRw8BAQdAguVu4qkx8iw4eU+TQ4vvcKG7IdcZvbMhw3Zc\n"
-+"npGf0+u0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBO6ovNDG\n"
-+"nLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
-+"AAoJEJYJ0fjlWbUrLaMBALegwkv2+sEcmKZqxt8JscYvFiEuycv2+rKHaZA0eDoN\n"
-+"AP97W4XrJb5x49J5jDDdeko8k00uGqiiuAXJo27/i/phA7g4BFw1oKcSCisGAQQB\n"
-+"l1UBBQEBB0Crhw24E2lPBhd/y+ZFotQ/2TrYqkUQqGPmff8ofLziNgMBCAeIeAQY\n"
-+"FggAIBYhBO6ovNDGnLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsMAAoJEJYJ0fjlWbUr\n"
-+"/K8BAJWsa+tOZsJw7w5fz6O0We6Xx4Rt17jHf563G6wMcz9+AQDRsedJ7w4zYzS9\n"
-+"MFiJQ5aN0NDHMRtDFWAgCunVnJ3OBw==\n"
-+"=fZa5\n"
- "-----END PGP PUBLIC KEY BLOCK-----\n";
- 
- static const char conflictKey2[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
- "\n"
--"mDMEWG+xShYJKwYBBAHaRw8BAQdA567gPEPJRpqKnZjlFJMRNUqruRviYMyygfF6\n"
--"6Ok+ygu0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBJ5kRh7E\n"
--"I98w8kgUcmkAfYFvqqHsBQJYb7FKAhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
--"Ah4BAheAAAoJEGkAfYFvqqHsYR0BAOz8JjYB4VvGkt6noLS3F5TLfsedGwQkBCw5\n"
--"znw/vGZsAQD9DSX+ekwdrN56mNO8ISt5uVS7B1ZQtouNBF+nzcwbDbg4BFhvsUoS\n"
--"CisGAQQBl1UBBQEBB0BFupW8+Xc1ikab8TJqANjQhvFVh6uLsgcK4g9lZgbGXAMB\n"
--"CAeIeAQYFggAIBYhBJ5kRh7EI98w8kgUcmkAfYFvqqHsBQJYb7FKAhsMAAoJEGkA\n"
--"fYFvqqHs15ABALdN3uiV/07cJ3RkNb3WPcijGsto+lECDS11dKEwTMFeAQDx+V36\n"
--"ocbYC/xEuwi3w45oNqGieazzcD/GBbt8OBk3BA==\n"
--"=45IR\n"
-+"mDMEXDWgixYJKwYBBAHaRw8BAQdAMWOhumYspcvEOTuesOSN4rvnJVOj/6qOWFTu\n"
-+"x+wPRra0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBA64G88Q\n"
-+"NPXztj8ID/FhC7tiGbeRBQJcNaCLAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
-+"AAoJEPFhC7tiGbeRUt4A/2hf4Zgz+TYyfeH/4/ZtyL1JuZggqR1s5UopEx2Aiw10\n"
-+"AP405KiTd31TJQN8Ru+7bskPu0/mzLZMNkRvBNEdc5kbDLg4BFw1oIsSCisGAQQB\n"
-+"l1UBBQEBB0B5NtSrx7wDDKgwUe5Rxz0vRkaWLtyE0KbfE77oPy5DGAMBCAeIeAQY\n"
-+"FggAIBYhBA64G88QNPXztj8ID/FhC7tiGbeRBQJcNaCLAhsMAAoJEPFhC7tiGbeR\n"
-+"km0BAP8TQwraipqb1pJlLsEgDXeM5Jocz4fuePD78BsOBtORAP9gpCyKXdyJYGlA\n"
-+"qjmG356yG6pCK9aPckTZ9IViPiHWCw==\n"
-+"=tn3Q\n"
- "-----END PGP PUBLIC KEY BLOCK-----\n";
- 
- static const char conflictMsg1[] = "-----BEGIN PGP MESSAGE-----\n"
- "\n"
--"owGbwMvMwCG2z/HA4aX/5W0YT3MlMUTkb2xPSizi6ihlYRDjYJAVU2Sp4mTZNpV3\n"
--"5QwmLqkrMLWsTCCFDFycAjCR1vcMf4U0Qrs6qzqfHJ9puGOFduLN2nVmhsumxjBE\n"
--"mdw4lr1ehIWR4QdLuNBpe86PGx1PtNXfVAzm/hu+vfjCp5BVNjPTM9L0eAA=\n"
--"=MfBD\n"
-+"owGbwMvMwCE2jfPij6eRW7UZTwsnMcSYLnT0Ki0uUXD3C1XILFHk6ihlYRDjYJAV\n"
-+"U2R5t2LPhWNz9tx2D3lqANPEygTSwcDFKQAT+RjG8M9of873hQrMpinBVwKYv+rq\n"
-+"XGmYW+ZcZJ+133KDq+itzlxGhg3L2X/6Khj+2Hd+He+KnXtunF2wNWxl7849e/Sy\n"
-+"v6tc+8MBAA==\n"
-+"=fZLe\n"
- "-----END PGP MESSAGE-----\n";
- 
- static const char conflictMsg2[] = "-----BEGIN PGP MESSAGE-----\n"
- "\n"
--"owGbwMvMwCGWyVDbmL9q4RvG01xJDBH5GyvS8vO5OkpZGMQ4GGTFFFnmpbjJHVG+\n"
--"b/DJQ6QIppaVCaSQgYtTACaySZHhr/SOPrdFJ89KrcwKY5i1XnflXYf2PK76SafK\n"
--"tkxXuXzvJAvDX4kCybuqFk3HXCexz2+IrnZ+5X5EqOnuo3ens2cte+uzlhMA\n"
--"=BIAi\n"
-+"owGbwMvMwCH2MZF7d5Lk9omMp4WTGGJMFwZ4lRaXKLj7hSpklihydZSyMIhxMMiK\n"
-+"KbLw7ZA+L2Dy9fM2ew5+mCZWJpAOBi5OAZhIUhIjw7bV+xS+cR0quqhmcY2Dl3WW\n"
-+"8Ufr+rRNufOPyIdoO6nEXGH47/B+E1+oxS6e5f5n7MJ3aHBO+s345sipGV/4f665\n"
-+"9mmiGjsA\n"
-+"=8oJA\n"
- "-----END PGP MESSAGE-----\n";
- 
- class TofuInfoTest: public QGpgMETest
--- 
-2.21.0.rc1
-

gpgme.spec

@@ -9,19 +9,14 @@
 
 Name:           gpgme
 Summary:        GnuPG Made Easy - high level crypto API
-Version:        1.12.0
+Version:        1.13.1
-Release:        3%{?dist}
+Release:        1%{?dist}
 
 License:        LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
-Source0:        ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
+Source0:        https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2
 Source2:        gpgme-multilib.h
 
-## upstream patches
-# https://dev.gnupg.org/T3815
-Patch0001:      0001-qt-Use-tofu-conflict-test-keys-without-expiry.patch
-Patch0002:      0001-python-bindings-callback-test.patch
-
 ## downstream patches
 # Don't add extra libs/cflags in gpgme-config/cmake equivalent
 Patch1001:      0001-don-t-add-extra-libraries-for-linking.patch
@@ -130,8 +125,6 @@ Obsoletes:      platform-python-gpg < %{version}-%{release}
 # set it to a value which we know will be suppressed.
 sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
 
-find -type f -name Makefile\* -exec sed -i -e 's|GPG = gpg|GPG = gpg2|' {} ';'
-
 %build
 ./autogen.sh
 %configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python
@@ -176,6 +169,7 @@ make check
 %doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION
 %{_bindir}/%{name}-json
 %{_libdir}/lib%{name}.so.11*
+%{_libdir}/pkgconfig/%{name}*.pc
 
 %files devel
 %{_bindir}/%{name}-config
@@ -214,6 +208,9 @@ make check
 %{python3_sitearch}/gpg/
 
 %changelog
+* Mon Jul 29 18:46:42 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.13.1-1
+- Update to 1.13.1
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (gpgme-1.12.0.tar.bz2) = c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
+SHA512 (gpgme-1.13.1.tar.bz2) = 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8