CVS commit: pkgsrc/chat/irssi

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jan 19 22:15:43 UTC 2022

Modified Files:
        pkgsrc/chat/irssi: Makefile distinfo
Added Files:
        pkgsrc/chat/irssi/patches: patch-src_otr_otr.c

Log Message:
irssi: fix building on Solaris 10

PR pkg/56632


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/chat/irssi/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/chat/irssi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/irssi/patches/patch-src_otr_otr.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/irssi/Makefile
diff -u pkgsrc/chat/irssi/Makefile:1.103 pkgsrc/chat/irssi/Makefile:1.104
--- pkgsrc/chat/irssi/Makefile:1.103    Wed Dec  8 16:03:28 2021
+++ pkgsrc/chat/irssi/Makefile  Wed Jan 19 22:15:43 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2021/12/08 16:03:28 adam Exp $
+# $NetBSD: Makefile,v 1.104 2022/01/19 22:15:43 nia Exp $
 
 DISTNAME=              ${IRSSI_DISTNAME}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            chat
 EXTRACT_SUFX=          ${IRSSI_EXTRACT_SUFX}
 

Index: pkgsrc/chat/irssi/distinfo
diff -u pkgsrc/chat/irssi/distinfo:1.56 pkgsrc/chat/irssi/distinfo:1.57
--- pkgsrc/chat/irssi/distinfo:1.56     Tue Oct 26 10:05:16 2021
+++ pkgsrc/chat/irssi/distinfo  Wed Jan 19 22:15:43 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.56 2021/10/26 10:05:16 nia Exp $
+$NetBSD: distinfo,v 1.57 2022/01/19 22:15:43 nia Exp $
 
 BLAKE2s (irssi-1.2.3.tar.gz) = 7ac7c6a1e29a75c19faf86dc80ccbf54a2cbc5f93beef251874a39fd51135766
 SHA512 (irssi-1.2.3.tar.gz) = 7e4c8dc2d8e3532f26775702254339ba92e276c82b5a7041756574096928e25f2614d04a1cfa091ba90bc3e5a0d552578b80bc89c3c87c6d48722139c2ae47ff
 Size (irssi-1.2.3.tar.gz) = 1824077 bytes
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
 SHA1 (patch-src_fe-text_terminfo-core.c) = 4f0af35b0288db4615e147211ca6e47b2383669d
+SHA1 (patch-src_otr_otr.c) = f9edabefd97e92f7a4c3db69741b35afdb825f8d

Added files:

Index: pkgsrc/chat/irssi/patches/patch-src_otr_otr.c
diff -u /dev/null pkgsrc/chat/irssi/patches/patch-src_otr_otr.c:1.1
--- /dev/null   Wed Jan 19 22:15:43 2022
+++ pkgsrc/chat/irssi/patches/patch-src_otr_otr.c       Wed Jan 19 22:15:43 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_otr_otr.c,v 1.1 2022/01/19 22:15:43 nia Exp $
+
+Fix building on Solaris 10
+Upstream commit: 58c9aecf86425630f043f554f0d11b625ed88be0
+PR pkg/56632
+
+--- src/otr/otr.c.orig 2021-04-08 13:42:24.000000000 +0000
++++ src/otr/otr.c
+@@ -643,7 +643,7 @@ static enum otr_msg_status enqueue_otr_f
+                * Dup the string with enough space for the NULL byte since we are
+                * about to free it before passing it to the caller.
+                */
+-              *full_msg = strndup(opc->full_msg, opc->msg_len + 1);
++              *full_msg = g_strndup(opc->full_msg, opc->msg_len + 1);
+               /* Reset everything. */
+               free(opc->full_msg);
+               opc->full_msg = NULL;