Index | Thread | Search

From:
Stepan Zolotuev <poopenfarten@dismail.de>
Subject:
Fix runtime crashes in net/profanity
To:
OpenBSD ports <ports@openbsd.org>, op@openbsd.org
Date:
Wed, 25 Dec 2024 11:19:05 +0000

Download raw body.

Thread
Hello,

After recent python 3.12 migration a known issue of profanity has
surfaced, where it crashes upon every startup.

This was fixed by an upstream commit multiple months ago.
The diff below is exactly that.
Tests pass too.


diff --git net/profanity/Makefile net/profanity/Makefile
index a9a7e4ff8..8e0a83973 100644
--- net/profanity/Makefile
+++ net/profanity/Makefile
@@ -1,6 +1,6 @@
 COMMENT =      console based XMPP client
 DISTNAME =     profanity-0.14.0
-REVISION =     2
+REVISION =     3
 CATEGORIES =   net

 HOMEPAGE =     https://profanity-im.github.io/
diff --git net/profanity/patches/patch-src_pgp_gpg_c net/profanity/patches/patch-src_pgp_gpg_c
new file mode 100644
index 000000000..dbe55d3e5
--- /dev/null
+++ net/profanity/patches/patch-src_pgp_gpg_c
@@ -0,0 +1,15 @@
+Fix crashes on startup.
+Taken from upstream commit 0995b1a180e24ebc0383621d3d5bfaff98e1f877.
+
+Index: src/pgp/gpg.c
+--- src/pgp/gpg.c.orig
++++ src/pgp/gpg.c
+@@ -889,7 +889,8 @@ out:
+ static ProfPGPKey*
+ _gpgme_key_to_ProfPGPKey(gpgme_key_t key)
+ {
+-    if (key == NULL) {
++    if (key == NULL || key->uids == NULL
++        || key->subkeys == NULL || key->uids->uid == NULL) {
+         return NULL;
+     }