CVS commit: pkgsrc/chat/profanity

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jan 23 11:43:40 UTC 2021

Modified Files:
        pkgsrc/chat/profanity: Makefile distinfo
Added Files:
        pkgsrc/chat/profanity/patches: patch-src_config_preferences.c

Log Message:
profanity: Add explicit dependency on mozilla-rootcerts

Point profanity at the certificates directory installed by the package.

Should help with PR pkg/55949


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/chat/profanity/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/profanity/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/profanity/patches/patch-src_config_preferences.c

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

Modified files:

Index: pkgsrc/chat/profanity/Makefile
diff -u pkgsrc/chat/profanity/Makefile:1.6 pkgsrc/chat/profanity/Makefile:1.7
--- pkgsrc/chat/profanity/Makefile:1.6  Thu Jan 14 12:50:25 2021
+++ pkgsrc/chat/profanity/Makefile      Sat Jan 23 11:43:40 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/01/14 12:50:25 nia Exp $
+# $NetBSD: Makefile,v 1.7 2021/01/23 11:43:40 nia Exp $
 
 DISTNAME=      profanity-0.9.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
 MASTER_SITES=  https://profanity-im.github.io/
 
@@ -10,6 +10,8 @@ HOMEPAGE=     https://profanity-im.github.io
 COMMENT=       Console based XMPP client inspired by irssi
 LICENSE=       gnu-gpl-v3
 
+DEPENDS+=      mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
+
 USE_TOOLS+=    autoconf pkg-config
 
 AUTOCONF_REQD= 2.69
@@ -26,6 +28,12 @@ SUBST_STAGE.python=  pre-configure
 SUBST_FILES.python=    configure.ac
 SUBST_SED.python=      -e 's,python-config,python${PYVERSSUFFIX}-config,g'
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Fixing absolute paths.
+SUBST_FILES.paths=     src/config/preferences.c
+SUBST_VARS.paths=      PREFIX
+
 CONFIGURE_ARGS+=       --enable-plugins
 CONFIGURE_ARGS+=       --enable-c-plugins
 CONFIGURE_ARGS+=       --enable-python-plugins

Index: pkgsrc/chat/profanity/distinfo
diff -u pkgsrc/chat/profanity/distinfo:1.3 pkgsrc/chat/profanity/distinfo:1.4
--- pkgsrc/chat/profanity/distinfo:1.3  Thu Jan 14 12:50:25 2021
+++ pkgsrc/chat/profanity/distinfo      Sat Jan 23 11:43:40 2021
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2021/01/14 12:50:25 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/01/23 11:43:40 nia Exp $
 
 SHA1 (profanity-0.9.5.tar.gz) = 88f3bcb483f25710cb35ab3e3f227f11b5d1225a
 RMD160 (profanity-0.9.5.tar.gz) = 39c0a1b7f50e5000bfc649a0461d7f2d45230b16
 SHA512 (profanity-0.9.5.tar.gz) = 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
 Size (profanity-0.9.5.tar.gz) = 830966 bytes
 SHA1 (patch-configure.ac) = d7d07f7c62755bc46e318df216932d7273a0c34c
+SHA1 (patch-src_config_preferences.c) = e6e43149d37fbc6fa1483d68b079f3d138bf128e
 SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80
 SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2
 SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2

Added files:

Index: pkgsrc/chat/profanity/patches/patch-src_config_preferences.c
diff -u /dev/null pkgsrc/chat/profanity/patches/patch-src_config_preferences.c:1.1
--- /dev/null   Sat Jan 23 11:43:40 2021
+++ pkgsrc/chat/profanity/patches/patch-src_config_preferences.c        Sat Jan 23 11:43:40 2021
@@ -0,0 +1,29 @@
+$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;