From 4fa7a305e48bb2bcd13d6fd47980f55dc0e071f0 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 9 Jun 2023 16:32:31 +0100 Subject: [PATCH] gpgme: update to 1.21.0. --- .../gpgme/patches/0001-tests-log-error.patch | 51 ------ .../0002-tests-expiration-time-unsigned.patch | 159 ------------------ .../gpgme/patches/0003-tests-fix-32bit.patch | 75 --------- .../gpgme/patches/fix-error-conditions.patch | 40 ----- srcpkgs/gpgme/template | 16 +- 5 files changed, 8 insertions(+), 333 deletions(-) delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch deleted file mode 100644 index 50443efe2e7..00000000000 --- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Ingo=20Kl=C3=B6cker?= -Date: Wed, 17 Aug 2022 14:56:13 +0200 -Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails - -* lang/qt/tests/t-addexistingsubkey.cpp ( -AddExistingSubkeyJobTest::testAddExistingSubkeyAsync, -AddExistingSubkeyJobTest::testAddExistingSubkeySync, -AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use -QCOMPARE instead of QVERIFY for asserting equality. --- - -GnuPG-bug-id: 6137 ---- - lang/qt/tests/t-addexistingsubkey.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp -index 589c90bf..2e654cec 100644 ---- a/lang/qt/tests/t-addexistingsubkey.cpp -+++ b/lang/qt/tests/t-addexistingsubkey.cpp -@@ -168,7 +168,7 @@ private Q_SLOTS: - QSignalSpy spy (this, SIGNAL(asyncDone())); - QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT)); - -- QVERIFY(result.code() == GPG_ERR_NO_ERROR); -+ QCOMPARE(result.code(), static_cast(GPG_ERR_NO_ERROR)); - key.update(); - QCOMPARE(key.numSubkeys(), 3u); - } -@@ -190,7 +190,7 @@ private Q_SLOTS: - - const auto result = job->exec(key, sourceSubkey); - -- QVERIFY(result.code() == GPG_ERR_NO_ERROR); -+ QCOMPARE(result.code(), static_cast(GPG_ERR_NO_ERROR)); - key.update(); - QCOMPARE(key.numSubkeys(), 3u); - QCOMPARE(key.subkey(2).expirationTime(), 0); -@@ -213,7 +213,7 @@ private Q_SLOTS: - - const auto result = job->exec(key, sourceSubkey); - -- QVERIFY(result.code() == GPG_ERR_NO_ERROR); -+ QCOMPARE(result.code(), static_cast(GPG_ERR_NO_ERROR)); - key.update(); - QCOMPARE(key.numSubkeys(), 3u); - --- -2.11.0 - diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch deleted file mode 100644 index 57aef8852a1..00000000000 --- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch +++ /dev/null @@ -1,159 +0,0 @@ -From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Ingo=20Kl=C3=B6cker?= -Date: Wed, 17 Aug 2022 15:22:29 +0200 -Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as - unsigned number - -* lang/qt/tests/t-addexistingsubkey.cpp, -lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to -uint_least32_t. --- - -This doesn't change the outcome of the tests (they also pass without -this change because of the expiration dates of the test keys), but it's -still good practise to treat the expiration time as an unsigned number -if the assertions check that the expiration time is in some range. - -GnuPG-bug-id: 6137 ---- - lang/qt/tests/t-addexistingsubkey.cpp | 6 +++--- - lang/qt/tests/t-changeexpiryjob.cpp | 26 +++++++++++++------------- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp -index 2e654cec..87eadf43 100644 ---- a/lang/qt/tests/t-addexistingsubkey.cpp -+++ b/lang/qt/tests/t-addexistingsubkey.cpp -@@ -222,9 +222,9 @@ private Q_SLOTS: - // several times - const auto allowedDeltaTSeconds = 1; - const auto expectedExpirationRange = std::make_pair( -- sourceSubkey.expirationTime() - allowedDeltaTSeconds, -- sourceSubkey.expirationTime() + allowedDeltaTSeconds); -- const auto actualExpiration = key.subkey(2).expirationTime(); -+ 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()); -diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp -index 090002f3..3da74d46 100644 ---- a/lang/qt/tests/t-changeexpiryjob.cpp -+++ b/lang/qt/tests/t-changeexpiryjob.cpp -@@ -70,7 +70,7 @@ private Q_SLOTS: - QVERIFY(!key.isNull()); - QVERIFY(!key.subkey(0).isNull()); - QVERIFY(!key.subkey(1).isNull()); -- const auto subkeyExpiration = key.subkey(1).expirationTime(); -+ const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime()); - - { - // Create the job -@@ -101,7 +101,7 @@ private Q_SLOTS: - newExpirationDate.toSecsSinceEpoch() - 10, - QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch()); - { -- const auto actualExpiration = key.subkey(0).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -110,7 +110,7 @@ private Q_SLOTS: - "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); - } - { -- const auto actualExpiration = key.subkey(1).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); - QCOMPARE(actualExpiration, subkeyExpiration); // unchanged - } - } -@@ -133,7 +133,7 @@ private Q_SLOTS: - QVERIFY(!key.isNull()); - QVERIFY(!key.subkey(0).isNull()); - QVERIFY(!key.subkey(1).isNull()); -- const auto primaryKeyExpiration = key.subkey(0).expirationTime(); -+ const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime()); - - { - // Create the job -@@ -164,11 +164,11 @@ private Q_SLOTS: - newExpirationDate.toSecsSinceEpoch() - 10, - QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch()); - { -- const auto actualExpiration = key.subkey(0).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); - QCOMPARE(actualExpiration, primaryKeyExpiration); // unchanged - } - { -- const auto actualExpiration = key.subkey(1).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -196,7 +196,7 @@ private Q_SLOTS: - QVERIFY(!key.isNull()); - QVERIFY(!key.subkey(0).isNull()); - QVERIFY(!key.subkey(1).isNull()); -- const auto subkeyExpiration = key.subkey(1).expirationTime(); -+ const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime()); - - { - // Create the job -@@ -228,7 +228,7 @@ private Q_SLOTS: - newExpirationDate.toSecsSinceEpoch() - 10, - QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch()); - { -- const auto actualExpiration = key.subkey(0).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -237,7 +237,7 @@ private Q_SLOTS: - "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); - } - { -- const auto actualExpiration = key.subkey(1).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); - QCOMPARE(actualExpiration, subkeyExpiration); // unchanged - } - } -@@ -291,7 +291,7 @@ private Q_SLOTS: - newExpirationDate.toSecsSinceEpoch() - 10, - QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch()); - { -- const auto actualExpiration = key.subkey(0).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -300,7 +300,7 @@ private Q_SLOTS: - "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); - } - { -- const auto actualExpiration = key.subkey(1).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -359,7 +359,7 @@ private Q_SLOTS: - newExpirationDate.toSecsSinceEpoch() - 10, - QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch()); - { -- const auto actualExpiration = key.subkey(0).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); -@@ -368,7 +368,7 @@ private Q_SLOTS: - "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); - } - { -- const auto actualExpiration = key.subkey(1).expirationTime(); -+ const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); - QVERIFY2(actualExpiration >= expectedExpirationRange.first, - ("actual: " + std::to_string(actualExpiration) + - "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); --- -2.11.0 - diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch deleted file mode 100644 index aaaf57582f0..00000000000 --- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Ingo=20Kl=C3=B6cker?= -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(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(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(GPG_ERR_INV_TIME)); -+ } - } - - private: --- -2.11.0 - diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch deleted file mode 100644 index f70e167784c..00000000000 --- a/srcpkgs/gpgme/patches/fix-error-conditions.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= -Date: Thu, 18 Aug 2022 10:43:19 +0200 -Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations - -* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp -(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted -logic of string comparisons. --- - -This fixes the problem that the interactor didn't return the proper -error code if gpg didn't accept the key grip or the expiration date. - -GnuPG-bug-id: 6137 ---- - lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp -index 547e613d..8eec7460 100644 ---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp -+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp -@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int - strcmp(args, "keygen.flags") == 0) { - return FLAGS; - } else if (status == GPGME_STATUS_GET_LINE && -- strcmp(args, "keygen.keygrip")) { -+ strcmp(args, "keygen.keygrip") == 0) { - err = NO_KEY_ERROR; - return ERROR; - } -@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int - strcmp(args, "keyedit.prompt") == 0) { - return QUIT; - } else if (status == GPGME_STATUS_GET_LINE && -- strcmp(args, "keygen.valid")) { -+ strcmp(args, "keygen.valid") == 0) { - err = INV_TIME_ERROR; - return ERROR; - } diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 55dfa970fec..c1a5d3c20a6 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -1,7 +1,7 @@ # Template file for 'gpgme' pkgname=gpgme -version=1.18.0 -revision=3 +version=1.21.0 +revision=1 build_style=gnu-configure configure_args="--enable-fd-passing --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr @@ -13,17 +13,17 @@ maintainer="Orphaned " 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=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e +checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 + +CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" ac_cv_sys_file_offset_bits=no" elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" - CXXFLAGS="${CFLAGS}" + CXXFLAGS+=" ${CFLAGS}" fi -CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1" - libgpgme_package() { # posix-util.c call gpgconf to get GnuPG binaries depends="gnupg>=2" @@ -48,7 +48,7 @@ gpgme-devel_package() { gpgmepp_package() { short_desc+=" - C++ library" pkg_install() { - vmove usr/lib/libgpgmepp.so.* + vmove "usr/lib/libgpgmepp.so.*" } } @@ -66,7 +66,7 @@ gpgmepp-devel_package() { gpgmeqt_package() { short_desc+=" - Qt binding" pkg_install() { - vmove usr/lib/libqgpgme.so.* + vmove "usr/lib/libqgpgme.so.*" } }