Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at 2016-01-08 15:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rrdtool (Old) and /work/SRC/openSUSE:Factory/.rrdtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool" Changes: -------- --- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2015-11-24 22:30:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2016-01-08 15:22:18.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Nov 25 12:40:01 UTC 2015 - a...@ajaissle.de + +- Update to 1.5.5 + + Bugfixes + * fix JSON output in xport with legend and gprint blocks + * fix parse_time mutex unlocking in the error case + * don't crash on invalid variable names in CDEF + * add mutex locking in rrdc_fetch + * fix buffer overflow in rrd_restore + * shorten test precision to 7 digits ... + * never exit from a library function + * buffer overflow in rrd_restore.c fixed #669 + +- Added rrdtool-1.5.4-lua-5.2.patch: lua >= 5.2 uses lua_callk + +------------------------------------------------------------------- Old: ---- rrdtool-1.5.4.tar.gz New: ---- rrdtool-1.5.4-lua-5.2.patch rrdtool-1.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.HBcKV3/_old 2016-01-08 15:22:19.000000000 +0100 +++ /var/tmp/diff_new_pack.HBcKV3/_new 2016-01-08 15:22:19.000000000 +0100 @@ -26,7 +26,7 @@ %bcond_with rados Name: rrdtool -Version: 1.5.4 +Version: 1.5.5 Release: 0 Summary: Round Robin Database Tool to store and display time-series data License: GPL-2.0+ and LGPL-2.0+ @@ -41,6 +41,8 @@ Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 Patch12: rrdtool-zero_vs_nothing.patch +# PATCH-FIX-UPSTREAM -- lua >= 5.2 uses lua_callk +Patch13: rrdtool-1.5.4-lua-5.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cairo-devel >= 1.2 @@ -121,7 +123,6 @@ Group: Development/Languages/Other BuildRequires: lua51-devel Requires: %{name} = %{version}-%{release} -Requires: lua %description -n lua-%{name} RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -131,6 +132,7 @@ This package contains the Lua bindings. %endif + %if %{with python} %package -n python-%{name} Summary: Python bindings for RRDtool @@ -143,6 +145,7 @@ Python RRDtool bindings. %endif + %if %{with ruby} %package -n ruby-%{name} Summary: Ruby bindings for RRDtool @@ -159,6 +162,7 @@ This package contains the Ruby bindings. %endif + %if %{with tcl} %package -n tcl-%{name} Summary: Tcl bindings for RRDtool @@ -175,6 +179,7 @@ This package contains the Tcl bindings. %endif + %package cached %define rrdcached_user rrdcached %define rrdcached_group rrdcached @@ -196,6 +201,7 @@ %setup -q %patch3 %patch12 -p1 +%patch13 -p1 # rrd_tool/rrd_cgi: use the date of the last change modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" ++++++ rrdtool-1.5.4-lua-5.2.patch ++++++ diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c index bfbc174..b54f787 100644 --- a/bindings/lua/rrdlua.c +++ b/bindings/lua/rrdlua.c @@ -350,7 +350,7 @@ set_info (lua_State * L) /**********************************************************/ -static const struct luaL_reg rrd[] = { +static const struct luaL_Reg rrd[] = { {"create", lua_rrd_create}, {"dump", lua_rrd_dump}, {"fetch", lua_rrd_fetch}, diff --git a/configure.ac b/configure.ac index 1a84037..4575f00 100644 --- a/configure.ac +++ b/configure.ac @@ -813,7 +813,12 @@ LUA_EOF LIBS= lua_havelib=no LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51 - AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua, + if test "$lua_vndot" -ge "52"; then + CALL_FUNC=lua_callk + else + CALL_FUNC=lua_call + fi + AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua, [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua, [lua_havelib=LUA$lua_vndot], [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib, ++++++ rrdtool-1.5.4.tar.gz -> rrdtool-1.5.5.tar.gz ++++++ ++++ 5375 lines of diff (skipped)