security/gpgme: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2021-01-12 16:38:47 +01:00
parent 5672e26ebd
commit d356b9570b
4 changed files with 5 additions and 34 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gpgme
PORTVERSION= 1.15.0
PORTVERSION= 1.15.1
PORTREVISION?= 0
CATEGORIES?= security
MASTER_SITES= GNUPG/gpgme

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1609111779
SHA256 (gpgme-1.15.0.tar.bz2) = 0b472bc12c7d455906c8a539ec56da0a6480ef1c3a87aa5b74d7125df68d0e5b
SIZE (gpgme-1.15.0.tar.bz2) = 1692019
TIMESTAMP = 1610205903
SHA256 (gpgme-1.15.1.tar.bz2) = eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
SIZE (gpgme-1.15.1.tar.bz2) = 1699349

View file

@ -1,29 +0,0 @@
The operator< should be const, so it can be applied to const Signatures.
This fixes a build failure in security/libkleo.
diff --git lang/cpp/src/key.cpp lang/cpp/src/key.cpp
index e536d080..7411e9e4 100644
--- lang/cpp/src/key.cpp
+++ lang/cpp/src/key.cpp
@@ -865,7 +865,7 @@ UserID::Signature::Signature(const shared_gpgme_key_t &k, gpgme_user_id_t u, gpg
{
}
-bool UserID::Signature::operator<(const Signature &other)
+bool UserID::Signature::operator<(const Signature &other) const
{
// based on cmp_signodes() in g10/keylist.c
diff --git lang/cpp/src/key.h lang/cpp/src/key.h
index a7931672..57001a03 100644
--- lang/cpp/src/key.h
+++ lang/cpp/src/key.h
@@ -468,7 +468,7 @@ public:
}
/*! Defines a canonical sort order for signatures of the same user ID. */
- bool operator<(const Signature &other);
+ bool operator<(const Signature &other) const;
bool isNull() const
{

View file

@ -8,7 +8,7 @@ lib/common-lisp/gpgme/gpgme.asd
lib/common-lisp/gpgme/gpgme.lisp
lib/libgpgme.so
lib/libgpgme.so.11
lib/libgpgme.so.11.24.0
lib/libgpgme.so.11.24.1
libdata/pkgconfig/gpgme-glib.pc
libdata/pkgconfig/gpgme.pc
share/aclocal/gpgme.m4