summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-05 02:33:41 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-05 02:33:41 +0000
commit9ebc77668efc39352054c3bf44c7af79cb0d6439 (patch)
tree0a3bb2079cd2f021b6d61ab276d8a40a9d4630d6 /package
parenta1cd2822b2fd2e8e7b5db00c7069bef5a819dc8e (diff)
[package] lua: add zlib build dependency, fix inaccuracy in gzip loader
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15109 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/lua/Makefile2
-rw-r--r--package/lua/patches-host/040-gzip-source-loader.patch10
-rw-r--r--package/lua/patches/040-gzip-source-loader.patch10
3 files changed, 13 insertions, 9 deletions
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 689b845d55..69d39601ba 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -20,7 +20,7 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150
HOST_PATCH_DIR=./patches-host
-PKG_BUILD_DEPENDS:=lua/host
+PKG_BUILD_DEPENDS:=lua/host zlib
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
diff --git a/package/lua/patches-host/040-gzip-source-loader.patch b/package/lua/patches-host/040-gzip-source-loader.patch
index 6fbafa206d..8214ae9f87 100644
--- a/package/lua/patches-host/040-gzip-source-loader.patch
+++ b/package/lua/patches-host/040-gzip-source-loader.patch
@@ -12,7 +12,7 @@ diff -ur lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile
MYLDFLAGS=
diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
--- lua-5.1.4.orig/src/lauxlib.c 2009-04-04 23:06:04.000000000 +0200
-+++ lua-5.1.4/src/lauxlib.c 2009-04-05 00:03:33.000000000 +0200
++++ lua-5.1.4/src/lauxlib.c 2009-04-05 03:35:24.000000000 +0200
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -34,7 +34,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
static const char *getF (lua_State *L, void *ud, size_t *size) {
LoadF *lf = (LoadF *)ud;
-@@ -550,6 +557,26 @@
+@@ -550,6 +557,28 @@
}
@@ -47,7 +47,9 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
+ if (*size > 0) {
+ if (lf->first_chunk) {
+ lf->first_chunk = 0;
-+ if (strstr(lf->buffer, "#!") && (sp=strstr(lf->buffer, "\n")) != NULL) {
++ if ((lf->buffer[0] == '#') && (lf->buffer[1] == '!') &&
++ (sp=strstr(lf->buffer, "\n")) != NULL)
++ {
+ *size -= ((uint)sp - (uint)lf->buffer);
+ return sp;
+ }
@@ -61,7 +63,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
static int errfile (lua_State *L, const char *what, int fnameindex) {
const char *serr = strerror(errno);
const char *filename = lua_tostring(L, fnameindex) + 1;
-@@ -560,6 +587,31 @@
+@@ -560,6 +589,31 @@
LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
diff --git a/package/lua/patches/040-gzip-source-loader.patch b/package/lua/patches/040-gzip-source-loader.patch
index 6fbafa206d..8214ae9f87 100644
--- a/package/lua/patches/040-gzip-source-loader.patch
+++ b/package/lua/patches/040-gzip-source-loader.patch
@@ -12,7 +12,7 @@ diff -ur lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile
MYLDFLAGS=
diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
--- lua-5.1.4.orig/src/lauxlib.c 2009-04-04 23:06:04.000000000 +0200
-+++ lua-5.1.4/src/lauxlib.c 2009-04-05 00:03:33.000000000 +0200
++++ lua-5.1.4/src/lauxlib.c 2009-04-05 03:35:24.000000000 +0200
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -34,7 +34,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
static const char *getF (lua_State *L, void *ud, size_t *size) {
LoadF *lf = (LoadF *)ud;
-@@ -550,6 +557,26 @@
+@@ -550,6 +557,28 @@
}
@@ -47,7 +47,9 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
+ if (*size > 0) {
+ if (lf->first_chunk) {
+ lf->first_chunk = 0;
-+ if (strstr(lf->buffer, "#!") && (sp=strstr(lf->buffer, "\n")) != NULL) {
++ if ((lf->buffer[0] == '#') && (lf->buffer[1] == '!') &&
++ (sp=strstr(lf->buffer, "\n")) != NULL)
++ {
+ *size -= ((uint)sp - (uint)lf->buffer);
+ return sp;
+ }
@@ -61,7 +63,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c
static int errfile (lua_State *L, const char *what, int fnameindex) {
const char *serr = strerror(errno);
const char *filename = lua_tostring(L, fnameindex) + 1;
-@@ -560,6 +587,31 @@
+@@ -560,6 +589,31 @@
LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {