pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/chat/profanity



Module Name:    pkgsrc
Committed By:   ktnb
Date:           Tue Nov 17 22:09:41 UTC 2026

Modified Files:
        pkgsrc/chat/profanity: Makefile distinfo
        pkgsrc/chat/profanity/patches: patch-meson.build
            patch-src_config_preferences.c patch-src_ui_core.c

Log Message:
profanity: fixed accidental removing of SSL SUBST


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/chat/profanity/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/chat/profanity/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/profanity/patches/patch-meson.build
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/chat/profanity/patches/patch-src_config_preferences.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/profanity/patches/patch-src_ui_core.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.55 pkgsrc/chat/profanity/Makefile:1.56
--- pkgsrc/chat/profanity/Makefile:1.55 Tue Nov 17 21:42:57 2026
+++ pkgsrc/chat/profanity/Makefile      Tue Nov 17 22:09:41 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2026/11/17 21:42:57 ktnb Exp $
+# $NetBSD: Makefile,v 1.56 2026/11/17 22:09:41 ktnb Exp $
 
 DISTNAME=      profanity-0.19.0
 CATEGORIES=    chat
@@ -21,6 +21,12 @@ SUBST_FILES.python=  meson.build
 SUBST_SED.python+=     -e 's,'python-embed','python-${PYVERSSUFFIX}-embed',g'
 SUBST_SED.python+=     -e 's,'python3-embed','python-${PYVERSSUFFIX}-embed',g'
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Setting path to OpenSSL certificates.
+SUBST_FILES.paths=     src/config/preferences.c
+SUBST_VARS.paths=      SSLCERTS
+
 MESON_ARGS+=           -Dpython-plugins=enabled
 MESON_ARGS+=           -Dc-plugins=enabled
 MESON_ARGS+=           -Domemo=enabled

Index: pkgsrc/chat/profanity/distinfo
diff -u pkgsrc/chat/profanity/distinfo:1.13 pkgsrc/chat/profanity/distinfo:1.14
--- pkgsrc/chat/profanity/distinfo:1.13 Tue Nov 17 21:42:57 2026
+++ pkgsrc/chat/profanity/distinfo      Tue Nov 17 22:09:41 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2026/11/17 21:42:57 ktnb Exp $
+$NetBSD: distinfo,v 1.14 2026/11/17 22:09:41 ktnb Exp $
 
 BLAKE2s (profanity-0.19.0.tar.xz) = 1f96cab534e1c62659e1a2649768b19d6a3fcb7824670f768eee4dc3a6e60a98
 SHA512 (profanity-0.19.0.tar.xz) = 4886d5d5bc3d8b39a8a449fc0a86338b5c77ce51a61a79297706489fbac8501fb7de0bfa5e7fab4536acbe08c089126744899dede89e1364ad682e1e22032732
 Size (profanity-0.19.0.tar.xz) = 454992 bytes
-SHA1 (patch-meson.build) = c43185679743ab0f823a96dee3151996a1cd4512
-SHA1 (patch-src_config_preferences.c) = dd1011db67bc4cef0ac33ab9164d918ba3dba97d
+SHA1 (patch-meson.build) = cfe32b799f19d78b2f2058d5a2d9217b475286b4
+SHA1 (patch-src_config_preferences.c) = 17bf3adea60a4934a655e59a48551724506e158b
 SHA1 (patch-src_ui_core.c) = 305dade110c4afd5e83590132a1410b1f8ff73fe

Index: pkgsrc/chat/profanity/patches/patch-meson.build
diff -u pkgsrc/chat/profanity/patches/patch-meson.build:1.1 pkgsrc/chat/profanity/patches/patch-meson.build:1.2
--- pkgsrc/chat/profanity/patches/patch-meson.build:1.1 Tue Nov 17 21:42:57 2026
+++ pkgsrc/chat/profanity/patches/patch-meson.build     Tue Nov 17 22:09:41 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-meson.build,v 1.1 2026/11/17 21:42:57 ktnb Exp $
+$NetBSD: patch-meson.build,v 1.2 2026/11/17 22:09:41 ktnb Exp $
 
 Added NetBSD to the libnotify section
 
---- meson.build.orig   2026-11-17 21:14:45.990130389 +0000
+--- meson.build.orig   2026-10-15 13:56:02.000000000 +0000
 +++ meson.build
 @@ -184,7 +184,7 @@ if get_option('notifications').enabled()
      terminal_notifier = find_program('terminal-notifier', required: true)

Index: pkgsrc/chat/profanity/patches/patch-src_config_preferences.c
diff -u pkgsrc/chat/profanity/patches/patch-src_config_preferences.c:1.4 pkgsrc/chat/profanity/patches/patch-src_config_preferences.c:1.5
--- pkgsrc/chat/profanity/patches/patch-src_config_preferences.c:1.4    Tue Nov 17 21:42:57 2026
+++ pkgsrc/chat/profanity/patches/patch-src_config_preferences.c        Tue Nov 17 22:09:41 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_config_preferences.c,v 1.4 2026/11/17 21:42:57 ktnb Exp $
+$NetBSD: patch-src_config_preferences.c,v 1.5 2026/11/17 22:09:41 ktnb Exp $
 
 Set paths for security/mozilla-rootcerts.
 
---- src/config/preferences.c.orig      2026-10-15 13:56:02.000000000 +0000
+--- src/config/preferences.c.orig      2021-09-08 10:03:47.000000000 +0000
 +++ src/config/preferences.c
-@@ -707,20 +707,8 @@ prefs_get_tls_certpath(void)
+@@ -636,20 +636,8 @@ prefs_get_tls_certpath(void)
      }
  
      if (setting == NULL) {
@@ -22,8 +22,8 @@ Set paths for security/mozilla-rootcerts
 -        }
 -        if (g_file_test("/system/etc/security/cacerts", G_FILE_TEST_IS_DIR)) {
 -            return strdup("/system/etc/security/cacerts");
-+        if (g_file_test("/etc/openssl/certs", G_FILE_TEST_IS_DIR)) {
-+            return strdup("/etc/openssl/certs");
++        if (g_file_test("@SSLCERTS@", G_FILE_TEST_IS_DIR)) {
++            return strdup("@SSLCERTS@");
          }
  
          return NULL;

Index: pkgsrc/chat/profanity/patches/patch-src_ui_core.c
diff -u pkgsrc/chat/profanity/patches/patch-src_ui_core.c:1.2 pkgsrc/chat/profanity/patches/patch-src_ui_core.c:1.3
--- pkgsrc/chat/profanity/patches/patch-src_ui_core.c:1.2       Tue Nov 17 21:42:57 2026
+++ pkgsrc/chat/profanity/patches/patch-src_ui_core.c   Tue Nov 17 22:09:41 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_ui_core.c,v 1.2 2026/11/17 21:42:57 ktnb Exp $
+$NetBSD: patch-src_ui_core.c,v 1.3 2026/11/17 22:09:41 ktnb Exp $
 
 sys/termios.h is needed for TIOCGWINZ on Solaris/Illumos
 



Home | Main Index | Thread Index | Old Index