Your message dated Sat, 09 Jun 2012 15:47:54 +0000
with message-id <[email protected]>
and subject line Bug#674617: fixed in elinks 0.12~pre5-8
has caused the Debian Bug report #674617,
regarding elinks: Switch to Lua 5.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
674617: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674617
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: elinks
Source-Version: 0.12~pre5-7
Severity: normal
Tags: patch
Hi!
This is one of the only two remaining programs using Lua 5.0, it would
be nice to switch it to Lua 5.1 to reduce the amount of Lua instances
in the archive.
Attached a patch fixing this.
thanks,
guillem
>From 90ec58a744a970419bd2737558d0364640a95230 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Sat, 26 May 2012 01:46:40 +0200
Subject: [PATCH] Switch to use lua 5.1
---
configure.in | 10 ++++++++++
debian/control | 2 +-
src/scripting/lua/core.c | 10 +++-------
src/scripting/lua/hooks.c | 2 +-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/configure.in b/configure.in
index 155358e..56a4d9d 100644
--- a/configure.in
+++ b/configure.in
@@ -883,6 +883,16 @@ if test -z "$disable_lua"; then
if test ! -d "$withval"; then
withval="";
fi
+ if pkg-config lua5.1; then
+ LUA_CFLAGS=`pkg-config --cflags lua5.1`
+ LUA_LIBS=`pkg-config --libs lua5.1`
+
+ LIBS="$LUA_LIBS $LIBS_X"
+ CFLAGS="$CFLAGS_X $LUA_CFLAGS"
+ CPPFLAGS="$CPPFLAGS_X $LUA_CFLAGS"
+
+ cf_result=yes
+ fi
for luadir in "$withval" "" /usr /usr/local; do
for suffix in "" 50; do
if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \
diff --git a/debian/control b/debian/control
index 4881906..af082e2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Y Giridhar Appaji Nag <[email protected]>
Uploaders: Moritz Muehlenhoff <[email protected]>
Build-Depends: debhelper (>= 6.0.7~), libtre-dev, libgnutls-dev, libidn11-dev,
libfsplib-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- liblua50-dev, liblualib50-dev, libbz2-dev, libexpat1-dev (>= 1.95.6),
+ liblua5.1-dev, libbz2-dev, libexpat1-dev (>= 1.95.6),
libperl-dev, ruby, ruby1.8-dev, libkrb5-dev, gettext,
autotools-dev, python, xmlto, docbook-utils, pkg-config
Standards-Version: 3.9.2
diff --git a/src/scripting/lua/core.c b/src/scripting/lua/core.c
index 8aec3a9..2fc534c 100644
--- a/src/scripting/lua/core.c
+++ b/src/scripting/lua/core.c
@@ -658,7 +658,7 @@ do_hooks_file(LS, unsigned char *prefix, unsigned char *filename)
if (file_can_read(file)) {
int oldtop = lua_gettop(S);
- if (lua_dofile(S, file) != 0)
+ if (luaL_dofile(S, file) != 0)
sleep(3); /* Let some time to see error messages. */
lua_settop(S, oldtop);
}
@@ -671,11 +671,7 @@ init_lua(struct module *module)
{
L = lua_open();
- luaopen_base(L);
- luaopen_table(L);
- luaopen_io(L);
- luaopen_string(L);
- luaopen_math(L);
+ luaL_openlibs(L);
lua_register(L, LUA_ALERT, l_alert);
lua_register(L, "current_url", l_current_url);
@@ -780,7 +776,7 @@ handle_ret_eval(struct session *ses)
int oldtop = lua_gettop(L);
if (prepare_lua(ses) == 0) {
- lua_dostring(L, expr);
+ (void) luaL_dostring(L, expr);
lua_settop(L, oldtop);
finish_lua();
}
diff --git a/src/scripting/lua/hooks.c b/src/scripting/lua/hooks.c
index d79ad80..6613c50 100644
--- a/src/scripting/lua/hooks.c
+++ b/src/scripting/lua/hooks.c
@@ -200,7 +200,7 @@ static enum evhook_status
script_hook_quit(va_list ap, void *data)
{
if (!prepare_lua(NULL)) {
- lua_dostring(lua_state, "if quit_hook then quit_hook() end");
+ (void) luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
finish_lua();
}
--
1.7.10
--- End Message ---
--- Begin Message ---
Source: elinks
Source-Version: 0.12~pre5-8
We believe that the bug you reported is fixed in the latest version of
elinks, which is due to be installed in the Debian FTP archive:
elinks-data_0.12~pre5-8_all.deb
to main/e/elinks/elinks-data_0.12~pre5-8_all.deb
elinks-doc_0.12~pre5-8_all.deb
to main/e/elinks/elinks-doc_0.12~pre5-8_all.deb
elinks-lite_0.12~pre5-8_amd64.deb
to main/e/elinks/elinks-lite_0.12~pre5-8_amd64.deb
elinks_0.12~pre5-8.diff.gz
to main/e/elinks/elinks_0.12~pre5-8.diff.gz
elinks_0.12~pre5-8.dsc
to main/e/elinks/elinks_0.12~pre5-8.dsc
elinks_0.12~pre5-8_amd64.deb
to main/e/elinks/elinks_0.12~pre5-8_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Moritz Muehlenhoff <[email protected]> (supplier of updated elinks package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 27 May 2012 12:17:42 +0200
Source: elinks
Binary: elinks elinks-data elinks-doc elinks-lite
Architecture: source amd64 all
Version: 0.12~pre5-8
Distribution: unstable
Urgency: low
Maintainer: Y Giridhar Appaji Nag <[email protected]>
Changed-By: Moritz Muehlenhoff <[email protected]>
Description:
elinks - advanced text-mode WWW browser
elinks-data - advanced text-mode WWW browser - data files
elinks-doc - advanced text-mode WWW browser - documentation
elinks-lite - advanced text-mode WWW browser - lightweight version
Closes: 674617 676119
Changes:
elinks (0.12~pre5-8) unstable; urgency=low
.
* Apply patch from Guillem Jover to switch to Lua 5.1, thanks!
(Closes: #674617)
* Enable pie and znow
* Disable support for Ruby scripting, which is not yet compatible
with Ruby 1.9. This has always been an esoteric feature anyway
(Closes: #676119)
Checksums-Sha1:
bacb73a6174fa2be9558d8a998bb9923c22f0bc9 1597 elinks_0.12~pre5-8.dsc
262d59eebcfd575308612c465c284da1b0e1ec3f 37649 elinks_0.12~pre5-8.diff.gz
4807e9bc2cef4a1dcca5605f5f13e6b177f0da57 641530 elinks_0.12~pre5-8_amd64.deb
04713e77efa216055f4316a8afe7e44deea3908f 448844
elinks-lite_0.12~pre5-8_amd64.deb
7c0e35b0570814a033841c06be2227655c68ef3c 613560 elinks-data_0.12~pre5-8_all.deb
1a41a44fbd2d141c54c1d34af5dfe14065db9b0e 603880 elinks-doc_0.12~pre5-8_all.deb
Checksums-Sha256:
70b7111c713b5d6f3fb3c6ec6d2d6e8c3991fc553e3f7c6e393b2e123a582cad 1597
elinks_0.12~pre5-8.dsc
baa51fa28047456d8ab04a87238a5d91a48b9f3f66cff69a789d4488d4d3f685 37649
elinks_0.12~pre5-8.diff.gz
a141a2e911b37fee3b12161dc85a84f0ce39c3d72a5727186f2f5bcf1127f505 641530
elinks_0.12~pre5-8_amd64.deb
d25df8d9f5757e8e47341b69baa2dc95e79bf75167b0424f0ff06c47c105a027 448844
elinks-lite_0.12~pre5-8_amd64.deb
4645b099b9d0be5f21ea44a53bd908075d299538ec514e2d33a6a8485c30111b 613560
elinks-data_0.12~pre5-8_all.deb
e8c3aafaaa21c57803ce4b3b428ac355486a18792185f45679104c2b399537e3 603880
elinks-doc_0.12~pre5-8_all.deb
Files:
2078fa580305dc167f55202ab6052df3 1597 web optional elinks_0.12~pre5-8.dsc
66573ee7d35aa8215257c6bece5a6f15 37649 web optional elinks_0.12~pre5-8.diff.gz
acc077d232ffb29f1855dbaded936540 641530 web optional
elinks_0.12~pre5-8_amd64.deb
2e3bff1ec32cbadd64ba31403237efa1 448844 web extra
elinks-lite_0.12~pre5-8_amd64.deb
adee4f70beaf644b19c05ebf90293265 613560 web optional
elinks-data_0.12~pre5-8_all.deb
5a1fc04b83b6f4e2c9cde526e935a097 603880 doc optional
elinks-doc_0.12~pre5-8_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk/TbeUACgkQXm3vHE4uylp0MwCgs8bSSMwmzXd3Shr57JDYaFOw
Cp4AnRmNwCwpzNWT9M3c07HBdlKfcZG3
=DmWJ
-----END PGP SIGNATURE-----
--- End Message ---
