Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2015-09-03 17:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2015-07-05 17:50:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-09-03 17:58:00.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 18 09:01:11 UTC 2015 - [email protected] + +- add patch: rpm-4.12.0.1-lua-5.3.patch + * replace luaL_optint/luaL_checkint w/ (int)luaL_optinteger + (int)luaL_checkinteger for compatibility w/ lua 5.3 + +------------------------------------------------------------------- New: ---- rpm-4.12.0.1-lua-5.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-rpm.spec ++++++ --- /var/tmp/diff_new_pack.9YNexW/_old 2015-09-03 17:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.9YNexW/_new 2015-09-03 17:58:54.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua51-devel +BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: python3-devel rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.9YNexW/_old 2015-09-03 17:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.9YNexW/_new 2015-09-03 17:58:54.000000000 +0200 @@ -32,7 +32,7 @@ BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua51-devel +BuildRequires: lua-devel BuildRequires: make BuildRequires: ncurses-devel BuildRequires: patch @@ -131,6 +131,7 @@ Patch94: checksepwarn.diff Patch95: fixsizeforbigendian.diff Patch96: modalias-no-kgraft.diff +Patch97: rpm-4.12.0.1-lua-5.3.patch Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -224,6 +225,7 @@ %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 85 %patch -P 92 -P 93 -P 94 -P 95 -P 96 +%patch97 -p1 %ifarch aarch64 ppc64le %patch6464 ++++++ rpm-4.12.0.1-lua-5.3.patch ++++++ Index: rpm-4.12.0.1/luaext/lposix.c =================================================================== --- rpm-4.12.0.1.orig/luaext/lposix.c +++ rpm-4.12.0.1/luaext/lposix.c @@ -361,22 +361,35 @@ static int Pfork(lua_State *L) /** for static int Pwait(lua_State *L) /** wait([pid]) */ { +#if LUA_VERSION_NUM < 503 pid_t pid = luaL_optint(L, 1, -1); +#else + pid_t pid = (int)luaL_optinteger(L, 1, -1); +#endif return pushresult(L, waitpid(pid, NULL, 0), NULL); } static int Pkill(lua_State *L) /** kill(pid,[sig]) */ { +#if LUA_VERSION_NUM < 503 pid_t pid = luaL_checkint(L, 1); int sig = luaL_optint(L, 2, SIGTERM); +#else + pid_t pid = (int)luaL_checkinteger(L, 1); + int sig = (int)luaL_optinteger(L, 2, SIGTERM); +#endif return pushresult(L, kill(pid, sig), NULL); } static int Psleep(lua_State *L) /** sleep(seconds) */ { +#if LUA_VERSION_NUM < 503 unsigned int seconds = luaL_checkint(L, 1); +#else + unsigned int seconds = (int)luaL_checkinteger(L, 1); +#endif lua_pushnumber(L, sleep(seconds)); return 1; } @@ -529,7 +542,11 @@ static int Pgetprocessid(lua_State *L) static int Pttyname(lua_State *L) /** ttyname(fd) */ { +#if LUA_VERSION_NUM < 503 int fd=luaL_optint(L, 1, 0); +#else + int fd = (int)luaL_optinteger(L, 1, 0); +#endif lua_pushstring(L, ttyname(fd)); return 1; } @@ -879,8 +896,11 @@ static int exit_override(lua_State *L) { if (!have_forked) return luaL_error(L, "exit not permitted in this context"); - +#if LUA_VERSION_NUM < 503 exit(luaL_optint(L, 1, EXIT_SUCCESS)); +#else + exit((int)luaL_optinteger(L, 1, EXIT_SUCCESS)); +#endif } static const luaL_Reg os_overrides[] =
