CVS commit: pkgsrc/chat/srain

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 24 14:17:53 UTC 2020

Modified Files:
        pkgsrc/chat/srain: Makefile distinfo
Added Files:
        pkgsrc/chat/srain/patches: patch-src_lib_path.c

Log Message:
srain: Update to 1.1.3

Script(update): bump version to 1.1.3
Sui(fix): fix an use-after-free case

Core(fix): remove server when main loop is idle

Because server may be referenced after function returns.

Script(update): bump version to 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/chat/srain/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/srain/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/srain/patches/patch-src_lib_path.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/srain/Makefile
diff -u pkgsrc/chat/srain/Makefile:1.8 pkgsrc/chat/srain/Makefile:1.9
--- pkgsrc/chat/srain/Makefile:1.8      Thu Nov  5 09:07:36 2020
+++ pkgsrc/chat/srain/Makefile  Tue Nov 24 14:17:53 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/24 14:17:53 nia Exp $
 
-DISTNAME=      srain-1.1.1
-PKGREVISION=   2
+DISTNAME=      srain-1.1.3
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SrainApp/}
 
@@ -31,8 +30,12 @@ OWN_DIRS+=   ${PKG_SYSCONFDIR}/srain
 CONF_FILES+=   share/examples/srain/builtin.cfg \
                ${PKG_SYSCONFDIR}/srain/builtin.cfg
 
-# XXX xgettext: unknown option -- package-name=Srain
-_TOOLS_USE_PKGSRC.xgettext=    yes
+.include "../../mk/bsd.prefs.mk"
+
+# msgfmt: unknown option -- desktop
+.if ${OPSYS} == "NetBSD"
+TOOLS_PLATFORM.msgfmt=
+.endif
 
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/chat/srain/distinfo
diff -u pkgsrc/chat/srain/distinfo:1.5 pkgsrc/chat/srain/distinfo:1.6
--- pkgsrc/chat/srain/distinfo:1.5      Mon Jun 29 14:10:03 2020
+++ pkgsrc/chat/srain/distinfo  Tue Nov 24 14:17:53 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2020/06/29 14:10:03 nia Exp $
+$NetBSD: distinfo,v 1.6 2020/11/24 14:17:53 nia Exp $
 
-SHA1 (srain-1.1.1.tar.gz) = 63110b3c5631b2199a71c3e0a5d05985ca18a694
-RMD160 (srain-1.1.1.tar.gz) = 623278c9d1d6b9fae63960415fe062d5da82bc6a
-SHA512 (srain-1.1.1.tar.gz) = 1cd8604b79d03a054b6b785529feef9479836f5fdc406101f3e67bfcb6a400ab8dae2b1ac317fd92b491e60faae069c3a61f4997ae15b6c9b2373b20e8ab7ac0
-Size (srain-1.1.1.tar.gz) = 941824 bytes
+SHA1 (srain-1.1.3.tar.gz) = 14c8adbfca3be0edf053c903f64b4d5dbee16316
+RMD160 (srain-1.1.3.tar.gz) = 3225299417aa4bf38ce20a035e727904972f83f8
+SHA512 (srain-1.1.3.tar.gz) = ad1c47bb249dae27cea3d4a044bbd10c034f2bb44fbec34053eeb878405caf9cf6236a03a7ff922f4eb4c189e5ccab4a307c208569bf0fdeb654a9de03a6d4fe
+Size (srain-1.1.3.tar.gz) = 944319 bytes
 SHA1 (patch-data_Makefile) = 5bd5a47d58cf85e6fae220655d539fc2827a46ee
+SHA1 (patch-src_lib_path.c) = 7a329ff26699d4152de176138b8c44ae73f3717e

Added files:

Index: pkgsrc/chat/srain/patches/patch-src_lib_path.c
diff -u /dev/null pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.1
--- /dev/null   Tue Nov 24 14:17:53 2020
+++ pkgsrc/chat/srain/patches/patch-src_lib_path.c      Tue Nov 24 14:17:53 2020
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_lib_path.c,v 1.1 2020/11/24 14:17:53 nia Exp $
+
+Use the Linux code for finding the executable filename using
+/proc on other OSes too.
+
+--- src/lib/path.c.orig        2020-10-04 01:11:49.000000000 +0000
++++ src/lib/path.c
+@@ -48,7 +48,7 @@
+ #include <mach-o/dyld.h>
+ #include <unistd.h>
+ 
+-#elif defined __linux__
++#else
+ #include <limits.h>
+ #include <libgen.h>
+ #include <unistd.h>
+@@ -364,20 +364,6 @@ char *srn_get_executable_dir() {
+     return executableDir;
+ }
+ 
+-#elif defined __linux__
+-char *srn_get_executable_path() {
+-   char rawPathName[PATH_MAX];
+-   realpath(PROC_SELF_EXE, rawPathName);
+-   return g_build_filename(rawPathName, NULL);
+-}
+-
+-char *srn_get_executable_dir() {
+-    char *exePath = srn_get_executable_path();
+-    char *executableDir = g_path_get_dirname(exePath);
+-    g_free(exePath);
+-    return executableDir;
+-}
+-
+ #elif defined __APPLE__
+ char *srn_get_executable_path() {
+     char rawPathName[PATH_MAX];
+@@ -396,4 +382,18 @@ char *srn_get_executable_dir() {
+     g_free(executablePath);
+     return executableDir;
+ }
++
++#else
++char *srn_get_executable_path() {
++   char rawPathName[PATH_MAX];
++   realpath(PROC_SELF_EXE, rawPathName);
++   return g_build_filename(rawPathName, NULL);
++}
++
++char *srn_get_executable_dir() {
++    char *exePath = srn_get_executable_path();
++    char *executableDir = g_path_get_dirname(exePath);
++    g_free(exePath);
++    return executableDir;
++}
+ #endif