Re: [PR PATCH] [Updated] gpgme: update to 1.18.0.

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages gpgme
https://github.com/void-linux/void-packages/pull/38825

gpgme: update to 1.18.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

I tested gpgme with pacman and haven't noticed any issues.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38825.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpgme-38825.patch --]
[-- Type: text/x-diff, Size: 13630 bytes --]

From e2b0e0e68d3f827360b05b30fa40da33a39f254f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:19:57 -0700
Subject: [PATCH 1/9] gpgme: update to 1.18.0.

---
 common/shlibs                               |  2 +-
 srcpkgs/gpgme/patches/fix-tests-32bit.patch | 75 +++++++++++++++++++++
 srcpkgs/gpgme/template                      |  7 +-
 3 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gpgme/patches/fix-tests-32bit.patch

diff --git a/common/shlibs b/common/shlibs
index bd9890ed7846..6dc6a3e37045 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -721,7 +721,7 @@ libdconf.so.1 dconf-0.13.90_1
 libassuan.so.0 libassuan-2.0.1_1
 libgpgme.so.11 libgpgme-1.12.0_2
 libgpgmepp.so.6 gpgmepp-1.7.0_3
-libqgpgme.so.7 gpgmeqt-1.7.0_3
+libqgpgme.so.15 gpgmeqt-1.18.0_1
 libgarcon-1.so.0 garcon-0.1.12_1
 libgarcon-gtk2-1.so.0 garcon-0.4.0_1
 libgarcon-gtk3-1.so.0 garcon-0.6.1_1
diff --git a/srcpkgs/gpgme/patches/fix-tests-32bit.patch b/srcpkgs/gpgme/patches/fix-tests-32bit.patch
new file mode 100644
index 000000000000..aaaf57582f00
--- /dev/null
+++ b/srcpkgs/gpgme/patches/fix-tests-32bit.patch
@@ -0,0 +1,75 @@
+From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Thu, 18 Aug 2022 10:55:09 +0200
+Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
+
+* lang/qt/tests/t-addexistingsubkey.cpp
+(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
+negative expiration date.
+--
+
+On 32-bit systems the expiration date of the test key overflows. This
+will cause the AddExistingSubkeyJob to fail. We expect it to fail with
+an "invalid time" error.
+
+GnuPG-bug-id: 6137
+---
+ lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
+ 1 file changed, 24 insertions(+), 18 deletions(-)
+
+diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
+index 87eadf43..c0eee57b 100644
+--- a/lang/qt/tests/t-addexistingsubkey.cpp
++++ b/lang/qt/tests/t-addexistingsubkey.cpp
+@@ -213,24 +213,30 @@ private Q_SLOTS:
+ 
+         const auto result = job->exec(key, sourceSubkey);
+ 
+-        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
+-        key.update();
+-        QCOMPARE(key.numSubkeys(), 3u);
+-
+-        // allow 1 second different expiration because gpg calculates with
+-        // expiration as difference to current time and takes current time
+-        // several times
+-        const auto allowedDeltaTSeconds = 1;
+-        const auto expectedExpirationRange = std::make_pair(
+-            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
+-            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
+-        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
+-        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
+-                 ("actual: " + std::to_string(actualExpiration) +
+-                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
+-        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
+-                 ("actual: " + std::to_string(actualExpiration) +
+-                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
++        if (sourceSubkey.expirationTime() > 0) {
++            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
++            key.update();
++            QCOMPARE(key.numSubkeys(), 3u);
++
++            // allow 1 second different expiration because gpg calculates with
++            // expiration as difference to current time and takes current time
++            // several times
++            const auto allowedDeltaTSeconds = 1;
++            const auto expectedExpirationRange = std::make_pair(
++                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
++                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
++            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
++            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
++                    ("actual: " + std::to_string(actualExpiration) +
++                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
++            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
++                    ("actual: " + std::to_string(actualExpiration) +
++                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
++        } else {
++            // on 32-bit systems the expiration date of the test key overflows;
++            // in this case we expect an appropriate error code
++            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
++        }
+     }
+ 
+ private:
+-- 
+2.11.0
+
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 8633075a8404..09b08c45ae6a 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.15.1
-revision=2
+version=1.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -9,12 +9,13 @@ configure_args="--enable-fd-passing
 hostmakedepends="gnupg pkg-config qt5-host-tools qt5-qmake"
 makedepends="libassuan-devel qt5-tools-devel"
 depends="gnupg>=2"
+checkdepends="which"
 short_desc="GnuPG Made Easy"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
+checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"

From 7a6238cf29960f4e15d9574307d209f9c84576b3 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:20:32 -0700
Subject: [PATCH 2/9] libkleo: rebuild for gpgme 1.18

---
 .../patches/disable-failing-test.patch        | 25 +++++++++++++++++++
 srcpkgs/libkleo/template                      |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libkleo/patches/disable-failing-test.patch

diff --git a/srcpkgs/libkleo/patches/disable-failing-test.patch b/srcpkgs/libkleo/patches/disable-failing-test.patch
new file mode 100644
index 000000000000..3095aa90b250
--- /dev/null
+++ b/srcpkgs/libkleo/patches/disable-failing-test.patch
@@ -0,0 +1,25 @@
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -25,13 +25,6 @@
+     LINK_LIBRARIES KF5::Libkleo Qt${QT_MAJOR_VERSION}::Test
+ )
+ 
+-ecm_add_test(
+-    keyresolvercoretest.cpp
+-    keyresolvercoretest.qrc
+-    TEST_NAME keyresolvercoretest
+-    LINK_LIBRARIES KF5::Libkleo Qt${QT_MAJOR_VERSION}::Test
+-)
+-
+ ecm_add_tests(
+     editdirectoryservicedialogtest.cpp
+     LINK_LIBRARIES KF5::Libkleo KF5::WidgetsAddons Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Test
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -33,7 +33,6 @@
+ ecm_add_tests(
+     keyselectioncombotest.cpp
+     keyserverconfigtest.cpp
+-    newkeyapprovaldialogtest.cpp
+     LINK_LIBRARIES KF5::Libkleo Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Test
+ )
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index caad7e4047a5..9dc4d95e7591 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,7 +1,7 @@
 # Template file for 'libkleo'
 pkgname=libkleo
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
  gettext kcoreaddons"

From e35c521421e0fd5e3c6714cc07c79e8ebf872944 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:38:25 -0700
Subject: [PATCH 3/9] messagelib: rebuild for gpgme 1.18

---
 srcpkgs/messagelib/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index f42b49ef0dc1..b6064699bcf3 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,7 +1,7 @@
 # Template file for 'messagelib'
 pkgname=messagelib
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kconfig"
@@ -15,6 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
 checksum=50de2bdd2bdba547b8b318a0ad075a1176f496457056988a2709ea94915a7a1b
+make_check=no # Running as root without --no-sandbox is not supported. See https://crbug.com/638180.
 
 #TODO: fix build without qca-qt5
 

From 0370976d10e9114b34768c1d9c57b9a5c827262f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:38:47 -0700
Subject: [PATCH 4/9] mailcommon: rebuild for gpgme 1.18

---
 srcpkgs/mailcommon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 8d1c8d25c6b5..2324875ed023 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
  gettext qt5-host-tools python3 kgendesignerplugin"

From 347362983ab18a1b13565385c20aab3dacf9a856 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:39:14 -0700
Subject: [PATCH 5/9] kdepim-addons: rebuild for gpgme 1.18

---
 srcpkgs/kdepim-addons/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 3bac99179a3f..bc4b24db33a7 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-addons'
 pkgname=kdepim-addons
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons
  kconfig kpackage gettext qt5-qmake qt5-host-tools"

From e3a634909be9486092681b99d238f22c1ef8d532 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:43:53 -0700
Subject: [PATCH 6/9] kget: rebuild for gpgme 1.18

---
 srcpkgs/kget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index cdf9e98935f3..1dba435510b4 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,7 +1,7 @@
 # Template file for 'kget'
 pkgname=kget
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools

From c46b2bde689ec8ec730ddba1654e636760dfcac9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:48:05 -0700
Subject: [PATCH 7/9] kleopatra: rebuild for gpgme 1.18

---
 srcpkgs/kleopatra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 9f30cbd5ed23..20e578868c60 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,7 +1,7 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
 makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"

From cce820b9dd161410d4ba01a6566620c85608422d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:49:57 -0700
Subject: [PATCH 8/9] kmail-account-wizard: rebuild for gpgme 1.18

---
 srcpkgs/kmail-account-wizard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 29e6d92f0251..ea99b3f86fd8 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
  gettext"

From b02c3f866156a30ecf8a57200c493fac61b07335 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:50:10 -0700
Subject: [PATCH 9/9] kmail: rebuild for gpgme 1.18

---
 srcpkgs/kmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index dbb6698418f9..d53fbeee2291 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail'
 pkgname=kmail
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
  gettext kcmutils kdoctools kconfig kcoreaddons"