head 1.2; access; symbols pkgsrc-2022Q4:1.1.0.4 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.2 pkgsrc-2022Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2023.03.19.07.23.16; author wiz; state dead; branches; next 1.1; commitid dArHPih7u9f2KHhE; 1.1 date 2022.08.19.11.15.16; author tnn; state Exp; branches; next ; commitid rAqAexTWV8I5QtQD; desc @@ 1.2 log @gpgme: update to 1.19.0. Noteworthy changes in version 1.19.0 (2023-03-17) ------------------------------------------------- * New convenience option --identify for gpgme-json. * New context flag "no-auto-check-trustdb". [T6261] * Optionally, build QGpgME for Qt 6 * Support component "gpgtar-name" in gpgme_get_dirinfo. [T6342] * Extended gpgme_op_encrypt*, gpgme_op_encrypt_sign*, and gpgme_op_sign* to allow creating an encrypted and/or signed archive. [T6342] * Extended gpgme_op_decrypt*, gpgme_op_decrypt_verify*, and gpgme_op_verify* to allow extracting an encrypted and/or signed archive. [T6342] * cpp: Handle error when trying to sign expired keys. [T6155] * cpp: Support encryption flags ThrowKeyIds, EncryptWrap, and WantAddress. [T6359] * cpp, qt: Fix building with C++11. [T6141] * qt: Fix problem with expiration dates after 2038-01-19 on 32-bit systems when adding an existing subkey to another key. [T6137] * cpp: Allow setting the curve to use when generating ECC keys for smart cards. [T4429] * qt: Extend ListAllKeysJob to allow disabling the automatic trust database check when listing all keys. [T6261] * qt: Allow deferred start of import jobs. [T6323] * qt: Support creating and extracting signed and encrypted archives. [T6342] @ text @$NetBSD: patch-lang_cpp_src_importresult.cpp,v 1.1 2022/08/19 11:15:16 tnn Exp $ Fix building with C++ 11 https://dev.gnupg.org/T6141 --- lang/cpp/src/importresult.cpp.orig 2022-08-10 09:17:33.000000000 +0000 +++ lang/cpp/src/importresult.cpp @@@@ -152,17 +152,17 @@@@ void GpgME::ImportResult::mergeWith(cons } // was this key also considered during the first import const auto consideredInFirstImports = - std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) { + std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr); }); // did we see this key already in the list of keys of the other import const auto consideredInPreviousOtherImports = - std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) { + std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr); }); // was anything added to this key during the other import const auto changedInOtherImports = - std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) { + std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr) && (i->status != 0); }); if (consideredInFirstImports && !consideredInPreviousOtherImports) { @@@@ -177,15 +177,15 @@@@ void GpgME::ImportResult::mergeWith(cons // now do the same for the secret key counts const auto secretKeyConsideredInFirstImports = - std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) { + std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET); }); const auto secretKeyConsideredInPreviousOtherImports = - std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) { + std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET); }); const auto secretKeyChangedInOtherImports = - std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) { + std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) { return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET) && (i->status != GPGME_IMPORT_SECRET); }); if (secretKeyConsideredInFirstImports && !secretKeyConsideredInPreviousOtherImports) { @@@@ -204,7 +204,7 @@@@ void GpgME::ImportResult::mergeWith(cons d->imports.reserve(d->imports.size() + other.d->imports.size()); std::transform(std::begin(other.d->imports), std::end(other.d->imports), std::back_inserter(d->imports), - [](const auto import) { + [](const gpgme_import_status_t import) { gpgme_import_status_t copy = new _gpgme_import_status{*import}; if (import->fpr) { copy->fpr = strdup(import->fpr); @ 1.1 log @gpgme: add patch from upstream to not require C++14 @ text @d1 1 a1 1 $NetBSD$ @