profanity: update to 0.11.1

Some pkgsrc patches were upstreamed.

Changes:

- Fix typo in shade color theme
- Fix memory leaks
- Fix buffer overread
- Don't handle /me in the middle of a message with mentions
- Explicitly check for curl version
- Fix OMEMO devicelist access model by reconfiguring it
- Cosmetic cleanup
- Change attentionflag shortcut from alt-f to alt+v
- Update man page and /help information
- Enable whole word only notifications by default

8 files changed, 118 insertions, 170 deletions

diff --git a/chat/profanity/Makefile b/chat/profanity/Makefile
index 762c1fc4159..f694dd62c89 100644
--- a/chat/profanity/Makefile
+++ b/chat/profanity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2021/12/08 16:03:31 adam Exp $
+# $NetBSD: Makefile,v 1.13 2022/03/04 09:16:05 nia Exp $
 
-DISTNAME=	profanity-0.9.5
-PKGREVISION=	8
+DISTNAME=	profanity-0.11.1
 CATEGORIES=	chat
-MASTER_SITES=	https://profanity-im.github.io/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=profanity-im/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://profanity-im.github.io/
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--enable-omemo
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-BUILDLINK_API_DEPENDS.libmesode+=	libmesode>=0.9.1
+BUILDLINK_API_DEPENDS.libmesode+=	libmesode>=0.10.0
 .include "../../chat/libmesode/buildlink3.mk"
 .include "../../chat/libotr/buildlink3.mk"
 .include "../../chat/libsignal-protocol-c/buildlink3.mk"
diff --git a/chat/profanity/PLIST b/chat/profanity/PLIST
index d7bf8781d5c..091907abd83 100644
--- a/chat/profanity/PLIST
+++ b/chat/profanity/PLIST
@@ -1,7 +1,105 @@
-@comment $NetBSD: PLIST,v 1.1 2020/09/04 10:15:17 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/03/04 09:16:05 nia Exp $
 bin/profanity
 include/profapi.h
 lib/libprofanity.la
+man/man1/profanity-about.1
+man/man1/profanity-account.1
+man/man1/profanity-affiliation.1
+man/man1/profanity-alias.1
+man/man1/profanity-autoaway.1
+man/man1/profanity-autoconnect.1
+man/man1/profanity-autoping.1
+man/man1/profanity-avatar.1
+man/man1/profanity-ban.1
+man/man1/profanity-beep.1
+man/man1/profanity-blocked.1
+man/man1/profanity-bookmark.1
+man/man1/profanity-caps.1
+man/man1/profanity-carbons.1
+man/man1/profanity-changepassword.1
+man/man1/profanity-charset.1
+man/man1/profanity-clear.1
+man/man1/profanity-close.1
+man/man1/profanity-cmd.1
+man/man1/profanity-color.1
+man/man1/profanity-connect.1
+man/man1/profanity-console.1
+man/man1/profanity-correct.1
+man/man1/profanity-correction.1
+man/man1/profanity-disco.1
+man/man1/profanity-disconnect.1
+man/man1/profanity-editor.1
+man/man1/profanity-executable.1
+man/man1/profanity-export.1
+man/man1/profanity-flash.1
+man/man1/profanity-form.1
+man/man1/profanity-gone.1
+man/man1/profanity-help.1
+man/man1/profanity-history.1
+man/man1/profanity-info.1
+man/man1/profanity-inpblock.1
+man/man1/profanity-inputwin.1
+man/man1/profanity-intype.1
+man/man1/profanity-invite.1
+man/man1/profanity-join.1
+man/man1/profanity-kick.1
+man/man1/profanity-lastactivity.1
+man/man1/profanity-log.1
+man/man1/profanity-logging.1
+man/man1/profanity-mainwin.1
+man/man1/profanity-mam.1
+man/man1/profanity-msg.1
+man/man1/profanity-nick.1
+man/man1/profanity-notify.1
+man/man1/profanity-occupants.1
+man/man1/profanity-omemo.1
+man/man1/profanity-os.1
+man/man1/profanity-otr.1
+man/man1/profanity-outtype.1
+man/man1/profanity-ox.1
+man/man1/profanity-paste.1
+man/man1/profanity-pgp.1
+man/man1/profanity-ping.1
+man/man1/profanity-plugins.1
+man/man1/profanity-prefs.1
+man/man1/profanity-presence.1
+man/man1/profanity-priority.1
+man/man1/profanity-privileges.1
+man/man1/profanity-quit.1
+man/man1/profanity-receipts.1
+man/man1/profanity-reconnect.1
+man/man1/profanity-reload.1
+man/man1/profanity-resource.1
+man/man1/profanity-role.1
+man/man1/profanity-room.1
+man/man1/profanity-rooms.1
+man/man1/profanity-roster.1
+man/man1/profanity-save.1
+man/man1/profanity-script.1
+man/man1/profanity-sendfile.1
+man/man1/profanity-serversoftware.1
+man/man1/profanity-silence.1
+man/man1/profanity-slashguard.1
+man/man1/profanity-software.1
+man/man1/profanity-splash.1
+man/man1/profanity-states.1
+man/man1/profanity-status.1
+man/man1/profanity-statusbar.1
+man/man1/profanity-sub.1
+man/man1/profanity-subject.1
+man/man1/profanity-theme.1
+man/man1/profanity-time.1
+man/man1/profanity-titlebar.1
+man/man1/profanity-tls.1
+man/man1/profanity-tray.1
+man/man1/profanity-url.1
+man/man1/profanity-vercheck.1
+man/man1/profanity-who.1
+man/man1/profanity-win.1
+man/man1/profanity-wins.1
+man/man1/profanity-wintitle.1
+man/man1/profanity-wrap.1
+man/man1/profanity-xmlconsole.1
 man/man1/profanity.1
 share/profanity/icons/proIcon.png
 share/profanity/icons/proIconMsg.png
diff --git a/chat/profanity/distinfo b/chat/profanity/distinfo
index 0d573f5dff1..0b8afd6b443 100644
--- a/chat/profanity/distinfo
+++ b/chat/profanity/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:05:22 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/03/04 09:16:05 nia Exp $
 
-BLAKE2s (profanity-0.9.5.tar.gz) = 02fbe554fbfad83ec2b334c3ada5211ddc4e885dc79e3e5f63e9dca01e2c002a
-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) = 165ef4c3c9ba6ae1a46f45ffb23ab91b7e8697a0
-SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80
-SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2
-SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2
+BLAKE2s (profanity-0.11.1.tar.gz) = 4cea0de13a5a851dd1b128bf00e1a37658da48d5f7ea5507acdf93aae689de26
+SHA512 (profanity-0.11.1.tar.gz) = 8ba627c8c5390414d2afdf31f3ff82821db108f952d562529c28b23f2d1904014c683b016ddef5a4d90ae50ac5cff8e46eab31aab517bbe02042d6837af7bb2c
+Size (profanity-0.11.1.tar.gz) = 888794 bytes
+SHA1 (patch-src_config_preferences.c) = 17bf3adea60a4934a655e59a48551724506e158b
diff --git a/chat/profanity/patches/patch-configure.ac b/chat/profanity/patches/patch-configure.ac
deleted file mode 100644
index 7f013ab206f..00000000000
--- a/chat/profanity/patches/patch-configure.ac
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2021/01/14 12:50:25 nia Exp $
-
-- Add NetBSD as a non-libdl platform.
-- Fix == usage.
-- Remove hardcoded homebrew path on macOS.
-- Add NetBSD as a libnotify platform.
-
---- configure.ac.orig	2020-09-19 01:06:20.595094431 +0000
-+++ configure.ac
-@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
- PLATFORM="unknown"
- AS_CASE([$host_os],
-     [freebsd*], [PLATFORM="freebsd"],
-+    [netbsd*], [PLATFORM="netbsd"],
-     [openbsd*], [PLATFORM="openbsd"],
-     [darwin*], [PLATFORM="osx"],
-     [cygwin], [PLATFORM="cygwin"],
-@@ -81,7 +82,7 @@ elif test "x$enable_python_plugins" != x
-         rm -f Python.framework
-         ln -s $PYTHON_FRAMEWORK Python.framework ])
-     AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no)
--    if test "$PYTHON_CONFIG_EXISTS" == "yes"; then
-+    if test "$PYTHON_CONFIG_EXISTS" = "yes"; then
-         AX_PYTHON_DEVEL
-         AM_CONDITIONAL([BUILD_PYTHON_API], [true])
-         AC_DEFINE([HAVE_PYTHON], [1], [Python support])
-@@ -108,7 +109,7 @@ else
-     elif test "x$enable_c_plugins" != xno; then
-         # libdl doesn't exist as a separate library in OpenBSD/FreeBSD and is
-         # provided in the standard libraries.
--        AS_IF([test "x$PLATFORM" = xopenbsd -o "x$PLATFORM" = xfreebsd],
-+        AS_IF([test "x$PLATFORM" = xopenbsd -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xnetbsd],
-             [AM_CONDITIONAL([BUILD_C_API], [true]) AC_DEFINE([HAVE_C], [1], [C support])],
-             [AC_CHECK_LIB([dl], [main],
-                 [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
-@@ -214,15 +215,7 @@ AS_IF([test "x$enable_icons_and_clipboar
-             [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
-             [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])])
- 
--AS_IF([test "x$PLATFORM" = xosx],
--    [AC_CHECK_FILE([/usr/local/opt/readline/lib],
--        [LIBS="-lreadline $LIBS"
--            AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS"
--            AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS"
--            AC_SUBST(AM_LDFLAGS)],
--        [AC_MSG_ERROR([libreadline is required for profanity])])],
--
--      [test "x$PLATFORM" = xopenbsd],
-+AS_IF([test "x$PLATFORM" = xopenbsd],
-       [AC_CHECK_FILE([/usr/local/include/ereadline],
-           [LIBS="-lereadline $LIBS"
-               AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"
-@@ -246,7 +239,7 @@ AS_IF([test "x$PLATFORM" = xosx],
-                     [AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
-                     [AC_MSG_NOTICE([Desktop notifications not supported.])])],
-                 [AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
--    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
-+    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xnetbsd],
-         [AS_IF([test "x$enable_notifications" != xno],
-             [PKG_CHECK_MODULES([libnotify], [libnotify],
-                 [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],
diff --git a/chat/profanity/patches/patch-src_config_preferences.c b/chat/profanity/patches/patch-src_config_preferences.c
index f130f15953e..c168d1e4bd5 100644
--- a/chat/profanity/patches/patch-src_config_preferences.c
+++ b/chat/profanity/patches/patch-src_config_preferences.c
@@ -1,28 +1,28 @@
-$NetBSD: patch-src_config_preferences.c,v 1.2 2021/01/23 13:08:11 nia Exp $
+$NetBSD: patch-src_config_preferences.c,v 1.3 2022/03/04 09:16:05 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.orig	2021-09-08 10:03:47.000000000 +0000
 +++ src/config/preferences.c
-@@ -527,20 +527,8 @@ prefs_get_tls_certpath(void)
+@@ -636,20 +636,8 @@ prefs_get_tls_certpath(void)
      }
  
      if (setting == NULL) {
--        if (g_file_test("/etc/ssl/certs",  G_FILE_TEST_IS_DIR)) {
+-        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)) {
+-        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)) {
+-        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)) {
+-        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)) {
+-        if (g_file_test("/system/etc/security/cacerts", G_FILE_TEST_IS_DIR)) {
 -            return strdup("/system/etc/security/cacerts");
-+        if (g_file_test("@SSLCERTS@",  G_FILE_TEST_IS_DIR)) {
++        if (g_file_test("@SSLCERTS@", G_FILE_TEST_IS_DIR)) {
 +            return strdup("@SSLCERTS@");
          }
  
diff --git a/chat/profanity/patches/patch-src_ui_inputwin.c b/chat/profanity/patches/patch-src_ui_inputwin.c
deleted file mode 100644
index e8d5205d235..00000000000
--- a/chat/profanity/patches/patch-src_ui_inputwin.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_ui_inputwin.c,v 1.1 2020/09/04 10:15:17 nia Exp $
-
-Prevent NetBSD libcurses from dereferencing a null pointer.
-
---- src/ui/inputwin.c.orig	2020-06-29 15:43:33.000000000 +0000
-+++ src/ui/inputwin.c
-@@ -307,7 +307,9 @@ _inp_win_update_virtual(void)
- {
-     int wcols = getmaxx(stdscr);
-     int row = screen_inputwin_row();
--    pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
-+    if (inp_win != NULL) {
-+        pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
-+    }
- }
- 
- static void
diff --git a/chat/profanity/patches/patch-src_ui_rosterwin.c b/chat/profanity/patches/patch-src_ui_rosterwin.c
deleted file mode 100644
index 78b5de15248..00000000000
--- a/chat/profanity/patches/patch-src_ui_rosterwin.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-src_ui_rosterwin.c,v 1.1 2020/09/04 10:15:17 nia Exp $
-
-Prevent NetBSD libcurses from dereferencing a null pointer.
-
---- src/ui/rosterwin.c.orig	2020-06-25 13:59:14.000000000 +0000
-+++ src/ui/rosterwin.c
-@@ -95,7 +95,10 @@ rosterwin_roster(void)
- 
-     ProfLayoutSplit *layout = (ProfLayoutSplit*)console->layout;
-     assert(layout->memcheck == LAYOUT_SPLIT_MEMCHECK);
--    werase(layout->subwin);
-+
-+    if (layout->subwin != NULL) {
-+        werase(layout->subwin);
-+    }
- 
-     char *roomspos = prefs_get_string(PREF_ROSTER_ROOMS_POS);
-     if (prefs_get_boolean(PREF_ROSTER_ROOMS) && (g_strcmp0(roomspos, "first") == 0)) {
-@@ -1105,9 +1108,11 @@ _rosterwin_contacts_header(ProfLayoutSpl
- 
-     gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP);
- 
--    wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
--    win_sub_print(layout->subwin, header->str, FALSE, wrap, 1);
--    wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+    if (layout->subwin != NULL) {
-+        wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+        win_sub_print(layout->subwin, header->str, FALSE, wrap, 1);
-+        wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+    }
- 
-     g_string_free(header, TRUE);
- }
-@@ -1165,9 +1170,11 @@ _rosterwin_rooms_header(ProfLayoutSplit 
- 
-     gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP);
- 
--    wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
--    win_sub_print(layout->subwin, header->str, FALSE, wrap, 1);
--    wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+    if (layout->subwin != NULL) {
-+        wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+        win_sub_print(layout->subwin, header->str, FALSE, wrap, 1);
-+        wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
-+    }
- 
-     g_string_free(header, TRUE);
- }
diff --git a/chat/profanity/patches/patch-src_ui_window.c b/chat/profanity/patches/patch-src_ui_window.c
deleted file mode 100644
index 43203651cfc..00000000000
--- a/chat/profanity/patches/patch-src_ui_window.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_ui_window.c,v 1.1 2020/09/04 10:15:17 nia Exp $
-
-Prevent NetBSD libcurses from dereferencing a null pointer.
-
---- src/ui/window.c.orig	2020-07-01 16:49:19.000000000 +0000
-+++ src/ui/window.c
-@@ -1858,7 +1858,12 @@ win_sub_print(WINDOW *win, char *msg, gb
- void
- win_sub_newline_lazy(WINDOW *win)
- {
--    int curx = getcurx(win);
-+    int curx;
-+
-+    if (win == NULL) {
-+        return;
-+    }
-+    curx = getcurx(win);
-     if (curx > 0) {
-         int cury = getcury(win);
-         wmove(win, cury+1, 0);