Switch to "official" LuCi git mirror on git.openwrt.org and update to current master

modules

@@ -8,11 +8,11 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f
 PACKAGES_OPENWRT_BRANCH=for-14.07
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=1628f219607339492b00fb921757ac8716d1358b
+PACKAGES_GLUON_COMMIT=1eff492575007ff8d7eb7d079a6cbd2c8979c6b7
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2
 PACKAGES_ROUTING_BRANCH=for-14.07
 
-PACKAGES_LUCI_REPO=git://github.com/freifunk-gluon/luci.git
-PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003
+PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git
+PACKAGES_LUCI_COMMIT=834961d9f34f5282f98a480196924a42541d1474

patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch

@@ -2,10 +2,10 @@ From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 May 2014 10:57:26 +0200
 Subject: libs/web: rename template_parser field "mmap" to the more generic "data"
 
-diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c
+diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c
 index 6054451..fc8607b 100644
---- a/libs/web/src/template_parser.c
-+++ b/libs/web/src/template_parser.c
+--- a/modules/base/src/template_parser.c
++++ b/modules/base/src/template_parser.c
 @@ -82,15 +82,15 @@ struct template_parser * template_open(const char *file)
  		goto err;
  
@@ -91,10 +91,10 @@ index 6054451..fc8607b 100644
  		if (*ptr == '\n')
  			line++;
  
-diff --git a/libs/web/src/template_parser.h b/libs/web/src/template_parser.h
+diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h
 index d1c6062..ad03cbc 100644
---- a/libs/web/src/template_parser.h
-+++ b/libs/web/src/template_parser.h
+--- a/modules/base/src/template_parser.h
++++ b/modules/base/src/template_parser.h
 @@ -58,7 +58,7 @@ struct template_chunk {
  struct template_parser {
  	int fd;

patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch

@@ -2,10 +2,10 @@ From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 May 2014 11:29:22 +0200
 Subject: libs/web: remove strange 'static' on variable declaration
 
-diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c
+diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c
 index fc8607b..1aa5131 100644
---- a/libs/web/src/template_parser.c
-+++ b/libs/web/src/template_parser.c
+--- a/modules/base/src/template_parser.c
++++ b/modules/base/src/template_parser.c
 @@ -66,7 +66,7 @@ static char *strfind(char *haystack, int hslen, const char *needle, int ndlen)
  struct template_parser * template_open(const char *file)
  {

patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch

@@ -2,10 +2,10 @@ From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 May 2014 11:37:21 +0200
 Subject: libs/web: add support for string templates to the template parser
 
-diff --git a/libs/web/src/template_lualib.c b/libs/web/src/template_lualib.c
+diff --git a/modules/base/src/template_lualib.c b/modules/base/src/template_lualib.c
 index 0d43641..1035611 100644
---- a/libs/web/src/template_lualib.c
-+++ b/libs/web/src/template_lualib.c
+--- a/modules/base/src/template_lualib.c
++++ b/modules/base/src/template_lualib.c
 @@ -18,10 +18,8 @@
  
  #include "template_lualib.h"
@@ -59,10 +59,10 @@ index 0d43641..1035611 100644
  	{ "utf8",				template_L_utf8 },
  	{ "pcdata",				template_L_pcdata },
  	{ "striptags",			template_L_striptags },
-diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c
+diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c
 index 1aa5131..c263fbf 100644
---- a/libs/web/src/template_parser.c
-+++ b/libs/web/src/template_parser.c
+--- a/modules/base/src/template_parser.c
++++ b/modules/base/src/template_parser.c
 @@ -100,6 +100,36 @@ err:
  	return NULL;
  }
@@ -128,10 +128,10 @@ index 1aa5131..c263fbf 100644
  
  	lua_pushnil(L);
  	lua_pushinteger(L, line + chunkline);
-diff --git a/libs/web/src/template_parser.h b/libs/web/src/template_parser.h
+diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h
 index ad03cbc..a3200a2 100644
---- a/libs/web/src/template_parser.h
-+++ b/libs/web/src/template_parser.h
+--- a/modules/base/src/template_parser.h
++++ b/modules/base/src/template_parser.h
 @@ -71,6 +71,7 @@ struct template_parser {
  };
  

patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch

@@ -2,10 +2,10 @@ From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 May 2014 11:48:42 +0200
 Subject: libs/web: add support for string templates to luci.template module
 
-diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
+diff --git a/modules/base/luasrc/template.lua b/modules/base/luasrc/template.lua
 index 72127d1..ea01d3c 100644
---- a/libs/web/luasrc/template.lua
-+++ b/libs/web/luasrc/template.lua
+--- a/modules/base/luasrc/template.lua
++++ b/modules/base/luasrc/template.lua
 @@ -50,6 +50,13 @@ function render(name, scope)
  	return Template(name):render(scope or getfenv(2))
  end