X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bdba5787663bee20325cabd76ed4661ee8c8dd96..4613d8680684a15dbe9ca30f5fb69e0c55f1de2d:/package/lua/patches/030-archindependent-bytecode.patch

diff --git a/package/lua/patches/030-archindependent-bytecode.patch b/package/lua/patches/030-archindependent-bytecode.patch
index 4ba58ebfb..8dfef85d0 100644
--- a/package/lua/patches/030-archindependent-bytecode.patch
+++ b/package/lua/patches/030-archindependent-bytecode.patch
@@ -1,7 +1,6 @@
-diff -ur lua-5.1.3-pt2/src/ldump.c lua-5.1.3-pt3/src/ldump.c
---- lua-5.1.3-pt2/src/ldump.c	2008-04-05 14:25:13.000000000 +0200
-+++ lua-5.1.3-pt3/src/ldump.c	2008-04-05 14:28:27.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)
   {
@@ -16,10 +15,9 @@ diff -ur lua-5.1.3-pt2/src/ldump.c lua-5.1.3-pt3/src/ldump.c
    DumpVar(size,D);
    DumpBlock(getstr(s),size,D);
   }
-diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
---- lua-5.1.3-pt2/src/lundump.c	2008-04-05 14:25:13.000000000 +0200
-+++ lua-5.1.3-pt3/src/lundump.c	2008-04-05 14:28:27.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;
@@ -27,7 +25,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
  } LoadState;
  
  #ifdef LUAC_TRUST_BINARIES
-@@ -40,7 +41,6 @@
+@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
  }
  #endif
  
@@ -35,7 +33,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/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)
-@@ -52,6 +52,49 @@
+@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
   IF (r!=0, "unexpected end");
  }
  
@@ -85,7 +83,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
  static int LoadChar(LoadState* S)
  {
   char x;
-@@ -83,7 +126,7 @@
+@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
  
  static TString* LoadString(LoadState* S)
  {
@@ -94,7 +92,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
   LoadVar(S,size);
   if (size==0)
    return NULL;
-@@ -194,6 +237,7 @@
+@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
   char s[LUAC_HEADERSIZE];
   luaU_header(h);
   LoadBlock(S,s,LUAC_HEADERSIZE);
@@ -102,7 +100,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
   IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
  }
  
-@@ -228,7 +272,7 @@
+@@ -230,7 +274,7 @@ void luaU_header (char* h)
   *h++=(char)LUAC_FORMAT;
   *h++=(char)*(char*)&x;				/* endianness */
   *h++=(char)sizeof(int);