[packages/rpm] - fix a regression in rpmlua where it no longer overrides the luaB_print() function with the one

baggins baggins at pld-linux.org
Tue Aug 13 20:16:39 CEST 2013


commit 7d3aa0602e6ac8be81dc3cd869cd707a6dc3b4f6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 13 20:03:52 2013 +0200

    - fix a regression in rpmlua where it no longer overrides the  luaB_print()
      function with the one provided by rpm_print()

 rpm-5.4.12-fix-rpmlua-print.patch | 22 ++++++++++++++++++++++
 rpm.spec                          |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 4b6eeef..6763d70 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -268,6 +268,7 @@ Patch1041:	%{name}-5.4.9-disable-l10ndir.patch
 Patch1042:	%{name}-5.4.9-fix-rpm_qa-pattern.patch
 # warning: introduces memory leak
 Patch1043:	%{name}-5.4.12-copy-Value-string.patch
+Patch1044:	%{name}-5.4.12-fix-rpmlua-print.patch
 
 URL:		http://rpm5.org/
 BuildRequires:	%{reqdb_pkg}-devel >= %{reqdb_pkgver}
@@ -941,6 +942,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1041 -p1
 %patch1042 -p1
 %patch1043 -p1
+%patch1044 -p1
 %patch68 -p1
 %patch69 -p1
 
diff --git a/rpm-5.4.12-fix-rpmlua-print.patch b/rpm-5.4.12-fix-rpmlua-print.patch
new file mode 100644
index 0000000..4129ec4
--- /dev/null
+++ b/rpm-5.4.12-fix-rpmlua-print.patch
@@ -0,0 +1,22 @@
+--- rpm-5.4.12/misc/librpmmisc.vers.rpmluaprint~	2013-08-08 18:23:58.367842414 +0200
++++ rpm-5.4.12/misc/librpmmisc.vers	2013-08-08 18:20:25.019996866 +0200
+@@ -36,6 +36,7 @@ LIBRPMMISC_0
+     lua_gettop;
+     lua_isnumber;
+     lua_isstring;
++    lua_setglobal;
+     luaL_argerror;
+     luaL_checklstring;
+     luaL_error;
+--- rpm-5.4.12/rpmio/rpmlua.c.rpmluaprint~	2013-08-08 18:23:06.755942297 +0200
++++ rpm-5.4.12/rpmio/rpmlua.c	2013-08-08 18:23:32.325390087 +0200
+@@ -207,8 +207,8 @@ rpmlua rpmluaNew(void)
+ #else
+     lua_pushglobaltable(L);
+ #endif
+-    lua_pushliteral(L, "print");
+     lua_pushcfunction(L, rpm_print);
++    lua_setglobal(L, "print");
+ 
+ #if defined(LUA_GLOBALSINDEX)
+     lua_rawset(L, LUA_GLOBALSINDEX);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f12f8a526cb287a152637d49fc4faa6d41ae3a14



More information about the pld-cvs-commit mailing list