summaryrefslogtreecommitdiff
path: root/security/gpa/files/patch-src_gpacontext.c
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2025-06-24 07:02:06 -0400
committerJason E. Hale <jhale@FreeBSD.org>2025-06-24 09:09:24 -0400
commit217815b0af27079f6b74cc7e5ca3ea05e53b0b15 (patch)
tree753fc27a434c5343428694e3923ed3420fed5d8c /security/gpa/files/patch-src_gpacontext.c
parentsecurity/rubygem-gpgme: Adapt for GpgME 2.0.0 (diff)
security/gpgme: Update to 2.0.0
Upstream has split most of the bindings out into separate projects with this release, so the child ports that were previously providing various bindings are now autonomous and have new origins. The python bindings should have been called py-gpg for many years now, since 'gpg' is the actual module name, so this also corrects that issue. security/gpgme-cpp -> security/gpgmepp security/gpgme-qt -> security/qgpgme security/py-gpgme -> security/py-gpg gpgmepp and qgpgme have been converted to CMake. py-gpg is now a "fun" autotools and FreeBSD ports system hybrid. Gpgme, itself, still uses autotools, but with much less parenting (patching) to do for its emancipated children. Adjust several ports to fix API incompatibility with upstream patches and with some of my own. Adjust all consumers to use the new port origins of the former child ports. https://dev.gnupg.org/T7673
Diffstat (limited to 'security/gpa/files/patch-src_gpacontext.c')
-rw-r--r--security/gpa/files/patch-src_gpacontext.c70
1 files changed, 70 insertions, 0 deletions
diff --git a/security/gpa/files/patch-src_gpacontext.c b/security/gpa/files/patch-src_gpacontext.c
new file mode 100644
index 000000000000..6b41a8f4cc80
--- /dev/null
+++ b/security/gpa/files/patch-src_gpacontext.c
@@ -0,0 +1,70 @@
+The trustlist feature, which only worked for a short period in 2003, was
+removed in GpgME 2.0.0.
+
+--- src/gpacontext.c.orig 2022-11-14 07:04:19 UTC
++++ src/gpacontext.c
+@@ -38,8 +38,6 @@ static void gpa_context_next_key (GpaContext *context,
+ static void gpa_context_start (GpaContext *context);
+ static void gpa_context_done (GpaContext *context, gpg_error_t err);
+ static void gpa_context_next_key (GpaContext *context, gpgme_key_t key);
+-static void gpa_context_next_trust_item (GpaContext *context,
+- gpgme_trust_item_t item);
+ static void gpa_context_progress (GpaContext *context, int current, int total);
+
+ /* The GPGME I/O callbacks */
+@@ -65,7 +63,6 @@ enum
+ START,
+ DONE,
+ NEXT_KEY,
+- NEXT_TRUST_ITEM,
+ PROGRESS,
+ LAST_SIGNAL
+ };
+@@ -113,7 +110,6 @@ gpa_context_class_init (GpaContextClass *klass)
+ klass->start = gpa_context_start;
+ klass->done = gpa_context_done;
+ klass->next_key = gpa_context_next_key;
+- klass->next_trust_item = gpa_context_next_trust_item;
+ klass->progress = gpa_context_progress;
+
+ /* Signals */
+@@ -143,15 +139,6 @@ gpa_context_class_init (GpaContextClass *klass)
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1,
+ G_TYPE_POINTER);
+- signals[NEXT_TRUST_ITEM] =
+- g_signal_new ("next_trust_item",
+- G_TYPE_FROM_CLASS (object_class),
+- G_SIGNAL_RUN_FIRST,
+- G_STRUCT_OFFSET (GpaContextClass, next_trust_item),
+- NULL, NULL,
+- g_cclosure_marshal_VOID__POINTER,
+- G_TYPE_NONE, 1,
+- G_TYPE_POINTER);
+ signals[PROGRESS] =
+ g_signal_new ("progress",
+ G_TYPE_FROM_CLASS (object_class),
+@@ -496,10 +483,6 @@ gpa_context_event_cb (void *data, gpgme_event_io_t typ
+ case GPGME_EVENT_NEXT_KEY:
+ g_signal_emit (context, signals[NEXT_KEY], 0, type_data);
+ break;
+- case GPGME_EVENT_NEXT_TRUSTITEM:
+- g_signal_emit (context, signals[NEXT_TRUST_ITEM], 0,
+- type_data);
+- break;
+ default:
+ /* Ignore unsupported event types */
+ break;
+@@ -527,12 +510,6 @@ gpa_context_next_key (GpaContext *context, gpgme_key_t
+
+ static void
+ gpa_context_next_key (GpaContext *context, gpgme_key_t key)
+-{
+- /* Do nothing yet */
+-}
+-
+-static void
+-gpa_context_next_trust_item (GpaContext *context, gpgme_trust_item_t item)
+ {
+ /* Do nothing yet */
+ }