CVS commit: pkgsrc/security/gpgme

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Aug 19 11:15:16 UTC 2022

Modified Files:
        pkgsrc/security/gpgme: Makefile distinfo
Added Files:
        pkgsrc/security/gpgme/patches: patch-lang_cpp_src_importresult.cpp

Log Message:
gpgme: add patch from upstream to not require C++14


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/gpgme/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.107 pkgsrc/security/gpgme/Makefile:1.108
--- pkgsrc/security/gpgme/Makefile:1.107        Thu Aug 18 10:38:26 2022
+++ pkgsrc/security/gpgme/Makefile      Fri Aug 19 11:15:16 2022
@@ -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_
 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

Index: pkgsrc/security/gpgme/distinfo
diff -u pkgsrc/security/gpgme/distinfo:1.51 pkgsrc/security/gpgme/distinfo:1.52
--- pkgsrc/security/gpgme/distinfo:1.51 Wed Aug 17 17:46:43 2022
+++ pkgsrc/security/gpgme/distinfo      Fri Aug 19 11:15:16 2022
@@ -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

Added files:

Index: pkgsrc/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp
diff -u /dev/null pkgsrc/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp:1.1
--- /dev/null   Fri Aug 19 11:15:16 2022
+++ pkgsrc/security/gpgme/patches/patch-lang_cpp_src_importresult.cpp   Fri Aug 19 11:15:16 2022
@@ -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);