X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Flua%2Fpatches-host%2F030-archindependent-bytecode.patch;fp=package%2Flua%2Fpatches-host%2F030-archindependent-bytecode.patch;h=8dfef85d0d7e654dd89835d77280958f1457ba08;hb=6d21323d98b8772b7144c5ee5dcb838d835bf3fa;hp=b27592fbd7e42350526eea0cef2e90366733247a;hpb=3cdcf8babba2cfa3547624e3209339ec7d47478f;p=openwrt%2Fstaging%2Fyousong.git

diff --git a/package/lua/patches-host/030-archindependent-bytecode.patch b/package/lua/patches-host/030-archindependent-bytecode.patch
index b27592fbd7..8dfef85d0d 100644
--- a/package/lua/patches-host/030-archindependent-bytecode.patch
+++ b/package/lua/patches-host/030-archindependent-bytecode.patch
@@ -1,8 +1,6 @@
-Index: lua-5.1.4/src/ldump.c
-===================================================================
---- lua-5.1.4.orig/src/ldump.c	2008-08-24 16:48:20.000000000 +0200
-+++ lua-5.1.4/src/ldump.c	2008-08-24 16:48:52.000000000 +0200
-@@ -67,12 +67,12 @@
+--- a/src/ldump.c
++++ b/src/ldump.c
+@@ -67,12 +67,12 @@ static void DumpString(const TString* s,
  {
   if (s==NULL || getstr(s)==NULL)
   {
@@ -17,11 +15,9 @@ Index: lua-5.1.4/src/ldump.c
    DumpVar(size,D);
    DumpBlock(getstr(s),size,D);
   }
-Index: lua-5.1.4/src/lundump.c
-===================================================================
---- lua-5.1.4.orig/src/lundump.c	2008-08-24 16:48:20.000000000 +0200
-+++ lua-5.1.4/src/lundump.c	2008-08-24 16:48:52.000000000 +0200
-@@ -25,6 +25,7 @@
+--- a/src/lundump.c
++++ b/src/lundump.c
+@@ -25,6 +25,7 @@ typedef struct {
   ZIO* Z;
   Mbuffer* b;
   const char* name;
@@ -29,7 +25,7 @@ Index: lua-5.1.4/src/lundump.c
  } LoadState;
  
  #ifdef LUAC_TRUST_BINARIES
-@@ -40,7 +41,6 @@
+@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
  }
  #endif
  
@@ -37,7 +33,7 @@ Index: lua-5.1.4/src/lundump.c
  #define	LoadByte(S)		(lu_byte)LoadChar(S)
  #define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
  #define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
-@@ -51,6 +51,49 @@
+@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
   IF (r!=0, "unexpected end");
  }
  
@@ -87,7 +83,7 @@ Index: lua-5.1.4/src/lundump.c
  static int LoadChar(LoadState* S)
  {
   char x;
-@@ -82,7 +125,7 @@
+@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
  
  static TString* LoadString(LoadState* S)
  {
@@ -96,7 +92,7 @@ Index: lua-5.1.4/src/lundump.c
   LoadVar(S,size);
   if (size==0)
    return NULL;
-@@ -196,6 +239,7 @@
+@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
   char s[LUAC_HEADERSIZE];
   luaU_header(h);
   LoadBlock(S,s,LUAC_HEADERSIZE);
@@ -104,7 +100,7 @@ Index: lua-5.1.4/src/lundump.c
   IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
  }
  
-@@ -230,7 +274,7 @@
+@@ -230,7 +274,7 @@ void luaU_header (char* h)
   *h++=(char)LUAC_FORMAT;
   *h++=(char)*(char*)&x;				/* endianness */
   *h++=(char)sizeof(int);