diff options
author | tnn <tnn@pkgsrc.org> | 2022-08-19 11:15:16 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2022-08-19 11:15:16 +0000 |
commit | a34d21e0feac89907669db9353f07d9b27789957 (patch) | |
tree | 268c9cd5cc1f6d5f9070aedb57a9ef2a48d09b0b /security/gpgme | |
parent | 76bc8d5e0fd8327d93374d61b55e4b990a23e062 (diff) | |
download | pkgsrc-a34d21e0feac89907669db9353f07d9b27789957.tar.gz |
gpgme: add patch from upstream to not require C++14
Diffstat (limited to 'security/gpgme')
-rw-r--r-- | security/gpgme/Makefile | 4 | ||||
-rw-r--r-- | security/gpgme/distinfo | 3 | ||||
-rw-r--r-- | security/gpgme/patches/patch-lang_cpp_src_importresult.cpp | 56 |
3 files changed, 60 insertions, 3 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 8e4dae292bc..c724ab74232 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2022/08/18 10:38:26 tnn Exp $ +# $NetBSD: Makefile,v 1.108 2022/08/19 11:15:16 tnn Exp $ DISTNAME= gpgme-1.18.0 CATEGORIES= security @@ -10,7 +10,7 @@ HOMEPAGE= https://www.gnupg.org/related_software/gpgme/ COMMENT= GnuPG Made Easy LICENSE= gnu-gpl-v2 -USE_LANGUAGES+= c99 c++14 # https://dev.gnupg.org/T6141 +USE_LANGUAGES+= c99 c++ USE_LIBTOOL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 299d896aff8..e5474f48e40 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.51 2022/08/17 17:46:43 wiz Exp $ +$NetBSD: distinfo,v 1.52 2022/08/19 11:15:16 tnn Exp $ BLAKE2s (gpgme-1.18.0.tar.bz2) = 48a1a66cca2fbe838112932507f11119039c07e2150da2d4fb392cb6ff21c5c4 SHA512 (gpgme-1.18.0.tar.bz2) = c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac Size (gpgme-1.18.0.tar.bz2) = 1762323 bytes SHA1 (patch-Makefile.in) = ab9510ae7af22350b7f34de0461d1a9574371089 SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072 +SHA1 (patch-lang_cpp_src_importresult.cpp) = 3ca3b68c2846debc563d8d12e38ae626cf29035d diff --git a/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp b/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp new file mode 100644 index 00000000000..35cc0d2a40c --- /dev/null +++ b/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp @@ -0,0 +1,56 @@ +$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); |