Sat Jan 23 11:43:40 2021 UTC ()
profanity: Add explicit dependency on mozilla-rootcerts

Point profanity at the certificates directory installed by the package.

Should help with PR pkg/55949


(nia)
diff -r1.6 -r1.7 pkgsrc/chat/profanity/Makefile
diff -r1.3 -r1.4 pkgsrc/chat/profanity/distinfo
diff -r0 -r1.1 pkgsrc/chat/profanity/patches/patch-src_config_preferences.c
cvs diff -r1.6 -r1.7 pkgsrc/chat/profanity/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/profanity/Makefile 2021/01/14 12:50:25 1.6
+++ pkgsrc/chat/profanity/Makefile 2021/01/23 11:43:40 1.7
@@ -1,41 +1,49 @@ @@ -1,41 +1,49 @@
1# $NetBSD: Makefile,v 1.6 2021/01/14 12:50:25 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2021/01/23 11:43:40 nia Exp $
2 2
3DISTNAME= profanity-0.9.5 3DISTNAME= profanity-0.9.5
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= https://profanity-im.github.io/ 6MASTER_SITES= https://profanity-im.github.io/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://profanity-im.github.io/ 9HOMEPAGE= https://profanity-im.github.io/
10COMMENT= Console based XMPP client inspired by irssi 10COMMENT= Console based XMPP client inspired by irssi
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
 13DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 14
13USE_TOOLS+= autoconf pkg-config 15USE_TOOLS+= autoconf pkg-config
14 16
15AUTOCONF_REQD= 2.69 17AUTOCONF_REQD= 2.69
16 18
17FAKE_NCURSES= yes 19FAKE_NCURSES= yes
18GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 21USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
21 23
22USE_CURSES= wide 24USE_CURSES= wide
23 25
24SUBST_CLASSES+= python 26SUBST_CLASSES+= python
25SUBST_STAGE.python= pre-configure 27SUBST_STAGE.python= pre-configure
26SUBST_FILES.python= configure.ac 28SUBST_FILES.python= configure.ac
27SUBST_SED.python= -e 's,python-config,python${PYVERSSUFFIX}-config,g' 29SUBST_SED.python= -e 's,python-config,python${PYVERSSUFFIX}-config,g'
28 30
 31SUBST_CLASSES+= paths
 32SUBST_STAGE.paths= pre-configure
 33SUBST_MESSAGE.paths= Fixing absolute paths.
 34SUBST_FILES.paths= src/config/preferences.c
 35SUBST_VARS.paths= PREFIX
 36
29CONFIGURE_ARGS+= --enable-plugins 37CONFIGURE_ARGS+= --enable-plugins
30CONFIGURE_ARGS+= --enable-c-plugins 38CONFIGURE_ARGS+= --enable-c-plugins
31CONFIGURE_ARGS+= --enable-python-plugins 39CONFIGURE_ARGS+= --enable-python-plugins
32CONFIGURE_ARGS+= --enable-omemo 40CONFIGURE_ARGS+= --enable-omemo
33 41
34.include "options.mk" 42.include "options.mk"
35 43
36pre-configure: 44pre-configure:
37 cd ${WRKSRC} && autoconf 45 cd ${WRKSRC} && autoconf
38 46
39BUILDLINK_API_DEPENDS.libmesode+= libmesode>=0.9.1 47BUILDLINK_API_DEPENDS.libmesode+= libmesode>=0.9.1
40.include "../../chat/libmesode/buildlink3.mk" 48.include "../../chat/libmesode/buildlink3.mk"
41.include "../../chat/libotr/buildlink3.mk" 49.include "../../chat/libotr/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/chat/profanity/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/profanity/distinfo 2021/01/14 12:50:25 1.3
+++ pkgsrc/chat/profanity/distinfo 2021/01/23 11:43:40 1.4
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.3 2021/01/14 12:50:25 nia Exp $ 1$NetBSD: distinfo,v 1.4 2021/01/23 11:43:40 nia Exp $
2 2
3SHA1 (profanity-0.9.5.tar.gz) = 88f3bcb483f25710cb35ab3e3f227f11b5d1225a 3SHA1 (profanity-0.9.5.tar.gz) = 88f3bcb483f25710cb35ab3e3f227f11b5d1225a
4RMD160 (profanity-0.9.5.tar.gz) = 39c0a1b7f50e5000bfc649a0461d7f2d45230b16 4RMD160 (profanity-0.9.5.tar.gz) = 39c0a1b7f50e5000bfc649a0461d7f2d45230b16
5SHA512 (profanity-0.9.5.tar.gz) = 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898 5SHA512 (profanity-0.9.5.tar.gz) = 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
6Size (profanity-0.9.5.tar.gz) = 830966 bytes 6Size (profanity-0.9.5.tar.gz) = 830966 bytes
7SHA1 (patch-configure.ac) = d7d07f7c62755bc46e318df216932d7273a0c34c 7SHA1 (patch-configure.ac) = d7d07f7c62755bc46e318df216932d7273a0c34c
 8SHA1 (patch-src_config_preferences.c) = e6e43149d37fbc6fa1483d68b079f3d138bf128e
8SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80 9SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80
9SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2 10SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2
10SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2 11SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2
File Added: pkgsrc/chat/profanity/patches/patch-src_config_preferences.c
$NetBSD: patch-src_config_preferences.c,v 1.1 2021/01/23 11:43:40 nia Exp $

Set paths for security/mozilla-rootcerts.

--- src/config/preferences.c.orig	2020-07-01 16:49:19.000000000 +0000
+++ src/config/preferences.c
@@ -527,20 +527,8 @@ prefs_get_tls_certpath(void)
     }
 
     if (setting == NULL) {
-        if (g_file_test("/etc/ssl/certs",  G_FILE_TEST_IS_DIR)) {
-            return strdup("/etc/ssl/certs");
-        }
-        if (g_file_test("/etc/pki/tls/certs",  G_FILE_TEST_IS_DIR)) {
-            return strdup("/etc/pki/tls/certs");
-        }
-        if (g_file_test("/etc/ssl",  G_FILE_TEST_IS_DIR)) {
-            return strdup("/etc/ssl");
-        }
-        if (g_file_test("/etc/pki/tls",  G_FILE_TEST_IS_DIR)) {
-            return strdup("/etc/pki/tls");
-        }
-        if (g_file_test("/system/etc/security/cacerts",  G_FILE_TEST_IS_DIR)) {
-            return strdup("/system/etc/security/cacerts");
+        if (g_file_test("@PREFIX@/share/mozilla-rootcerts",  G_FILE_TEST_IS_DIR)) {
+            return strdup("@PREFIX@/share/mozilla-rootcerts");
         }
 
         return NULL;