CVS commit: pkgsrc/sysutils/collectd

["Alexander Nasonov" <alnsn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   alnsn
Date:           Wed Jul 26 12:43:02 UTC 2017

Modified Files:
        pkgsrc/sysutils/collectd: distinfo
Added Files:
        pkgsrc/sysutils/collectd/patches: patch-src_lua.c

Log Message:
Make it possible to register more than one reader/writer in collectd-lua.

Not bumping PKGREVISION because the patch affects only one day old
sysutils/collectd-lua package. It's an overkill to bump several
collectd packages.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/collectd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd/patches/patch-src_lua.c

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

Modified files:

Index: pkgsrc/sysutils/collectd/distinfo
diff -u pkgsrc/sysutils/collectd/distinfo:1.37 pkgsrc/sysutils/collectd/distinfo:1.38
--- pkgsrc/sysutils/collectd/distinfo:1.37      Fri Jun 23 16:52:45 2017
+++ pkgsrc/sysutils/collectd/distinfo   Wed Jul 26 12:43:02 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.37 2017/06/23 16:52:45 kamil Exp $
+$NetBSD: distinfo,v 1.38 2017/07/26 12:43:02 alnsn Exp $
 
 SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0
 RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2
 SHA512 (collectd-5.7.2.tar.bz2) = 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
 Size (collectd-5.7.2.tar.bz2) = 1798777 bytes
 SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
-SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1
+SHA1 (patch-configure.ac) = 5a338ed47d07e49fc50272d95bc2974e00aafab9
 SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765
 SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
 SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66
@@ -15,6 +15,7 @@ SHA1 (patch-src_disk.c) = 1d458db9753be9
 SHA1 (patch-src_entropy.c) = 293e7105866b9b7c3eb5058dc314eaa510899843
 SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0
 SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e
+SHA1 (patch-src_lua.c) = 83e5db00adee0636c46b22541d7e016826c2fcd2
 SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7
 SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
 SHA1 (patch-src_processes.c) = 3dd8510bfd0d25051f30519f62d638536c45a6e2

Added files:

Index: pkgsrc/sysutils/collectd/patches/patch-src_lua.c
diff -u /dev/null pkgsrc/sysutils/collectd/patches/patch-src_lua.c:1.1
--- /dev/null   Wed Jul 26 12:43:02 2017
+++ pkgsrc/sysutils/collectd/patches/patch-src_lua.c    Wed Jul 26 12:43:02 2017
@@ -0,0 +1,47 @@
+$NetBSD: patch-src_lua.c,v 1.1 2017/07/26 12:43:02 alnsn Exp $
+
+Make it possible to register more than one reader/writer.
+Upstream request: https://github.com/collectd/collectd/pull/2379
+
+--- src/lua.c.orig     2017-06-06 18:13:54.000000000 +0000
++++ src/lua.c
+@@ -281,9 +281,6 @@ static int lua_cb_register_read(lua_Stat
+ 
+   luaL_checktype(L, 1, LUA_TFUNCTION);
+ 
+-  char function_name[DATA_MAX_NAME_LEN];
+-  ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
+-
+   int callback_id = clua_store_callback(L, 1);
+   if (callback_id < 0)
+     return luaL_error(L, "%s", "Storing callback function failed");
+@@ -298,6 +295,9 @@ static int lua_cb_register_read(lua_Stat
+   if (cb == NULL)
+     return luaL_error(L, "%s", "calloc failed");
+ 
++  char function_name[DATA_MAX_NAME_LEN];
++  ssnprintf(function_name, sizeof(function_name), "lua/%p", thread);
++
+   cb->lua_state = thread;
+   cb->callback_id = callback_id;
+   cb->lua_function_name = strdup(function_name);
+@@ -324,9 +324,6 @@ static int lua_cb_register_write(lua_Sta
+ 
+   luaL_checktype(L, 1, LUA_TFUNCTION);
+ 
+-  char function_name[DATA_MAX_NAME_LEN] = "";
+-  ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
+-
+   int callback_id = clua_store_callback(L, 1);
+   if (callback_id < 0)
+     return luaL_error(L, "%s", "Storing callback function failed");
+@@ -341,6 +338,9 @@ static int lua_cb_register_write(lua_Sta
+   if (cb == NULL)
+     return luaL_error(L, "%s", "calloc failed");
+ 
++  char function_name[DATA_MAX_NAME_LEN];
++  ssnprintf(function_name, sizeof(function_name), "lua/%p", thread);
++
+   cb->lua_state = thread;
+   cb->callback_id = callback_id;
+   cb->lua_function_name = strdup(function_name);