diff options
Diffstat (limited to 'user/gpgme')
| -rw-r--r-- | user/gpgme/1.12.0-fix-t-tofuinfo.patch | 100 | ||||
| -rw-r--r-- | user/gpgme/APKBUILD | 20 | ||||
| -rw-r--r-- | user/gpgme/test32bit.patch | 93 |
3 files changed, 8 insertions, 205 deletions
diff --git a/user/gpgme/1.12.0-fix-t-tofuinfo.patch b/user/gpgme/1.12.0-fix-t-tofuinfo.patch deleted file mode 100644 index 74ba11050..000000000 --- a/user/gpgme/1.12.0-fix-t-tofuinfo.patch +++ /dev/null @@ -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.19.2 - diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD index c541b7af7..1f6f983d1 100644 --- a/user/gpgme/APKBUILD +++ b/user/gpgme/APKBUILD @@ -1,21 +1,19 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gpgme -pkgver=1.12.0 -pkgrel=2 +pkgver=1.13.0 +pkgrel=0 pkgdesc="GnuPG Made Easy" url="https://www.gnupg.org/related_software/gpgme/" arch="all" # gpgme-tool: GPL3; lib is mixture of the rest license="(LGPL-3.0+ OR GPL-2.0+) AND LGPL-2.1+ AND MIT AND GPL-3.0+" depends="gnupg" -depends_dev="libgpg-error-dev libassuan-dev qt5-qtbase-dev" -makedepends="$depends_dev doxygen python3-dev swig cmd:which" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev doxygen libassuan-dev libgpg-error-dev python3-dev + swig cmd:which" subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme py3-gpg:_py" -source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 - 1.12.0-fix-t-tofuinfo.patch - test32bit.patch - " +source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build() { cd "$builddir" @@ -27,7 +25,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --enable-languages=cl,cpp,python3,qt + --enable-languages=cl,cpp,python,qt make } @@ -61,6 +59,4 @@ _py() { mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/" } -sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 gpgme-1.12.0.tar.bz2 -c8748651021a6ea670329cffb9565b905272b092315e77dc6fa9fa23890f8a55c2159edbfa026e8af961f2ff0c0d524dc8332a2e9a24fce2b37ac7cc4bb88cb3 1.12.0-fix-t-tofuinfo.patch -26bb302f462d7164842acea38080b3937b0b7b11d12fcfe1a61d656a41c993474dc7d9ca2298f936b030874a2f59f85b2189b11087f8b39d4c685a9a4e5d9450 test32bit.patch" +sha512sums="47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b gpgme-1.13.0.tar.bz2" diff --git a/user/gpgme/test32bit.patch b/user/gpgme/test32bit.patch deleted file mode 100644 index 49dafdddb..000000000 --- a/user/gpgme/test32bit.patch +++ /dev/null @@ -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.11.0 - |