Update LuCI to master branch

patches/packages/luci/0002-modules-base-dispatcher-set-default-language-if-none-provided-by-the-browser-matches.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 19 Mar 2015 18:44:52 +0100
-Subject: modules/base: dispatcher: set default language if none provided by the browser matches
-
-diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
-index 25269501068dd26efe5b85706b555996d63b0f6d..be2fc3453f528853519649e4b64ecb3fd14d80be 100644
---- a/modules/luci-base/luasrc/dispatcher.lua
-+++ b/modules/luci-base/luasrc/dispatcher.lua
-@@ -182,6 +182,7 @@ function dispatch(request)
- 	assert(conf.main,
- 		"/etc/config/luci seems to be corrupt, unable to find section 'main'")
- 
-+	local i18n = require "luci.i18n"
- 	local lang = conf.main.lang or "auto"
- 	if lang == "auto" then
- 		local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
-@@ -193,7 +194,10 @@ function dispatch(request)
- 			end
- 		end
- 	end
--	require "luci.i18n".setlanguage(lang)
-+	if lang == "auto" then
-+		lang = i18n.default
-+	end
-+	i18n.setlanguage(lang)
- 
- 	local c = ctx.tree
- 	local stat

patches/packages/luci/0003-luci-lib-jsonc-Ignore-non-string-or-number-keys-in-tables.patch

-From: Jan-Philipp Litza <janphilipp@litza.de>
-Date: Sun, 30 Aug 2015 15:42:52 +0200
-Subject: luci-lib-jsonc: Ignore non-string-or-number keys in tables
-
-Previously, the following caused a segmentation fault:
-
-    json.stringify({[{}] = true})
-
-This was caused by lua_tostring() returning NULL for anything but
-strings and numbers, letting json_object_object_add crash.
-
-This patch makes jsonc ignore all keys which have no string
-representation altogether.
-
-Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
-
-diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
-index 49cb21f5bcb2817792d0eef8dc5cd567bc6d86bc..827fde8843082e956b0c89b5855feeabd790e880 100644
---- a/libs/luci-lib-jsonc/src/jsonc.c
-+++ b/libs/luci-lib-jsonc/src/jsonc.c
-@@ -286,8 +286,9 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
- 			lua_pushvalue(L, -2);
- 			key = lua_tostring(L, -1);
- 
--			json_object_object_add(obj, key,
--								   _lua_to_json(L, lua_gettop(L) - 1));
-+			if (key)
-+				json_object_object_add(obj, key,
-+				                       _lua_to_json(L, lua_gettop(L) - 1));
- 
- 			lua_pop(L, 2);
- 		}

patches/packages/luci/0004-luci-lib-jsonc-allow-encoding-empty-lists.patch

-From: Jan-Philipp Litza <janphilipp@litza.de>
-Date: Sun, 30 Aug 2015 15:45:49 +0200
-Subject: luci-lib-jsonc: allow encoding empty lists
-
-To be consistent with the behavior of luci-lib-json, an empty Lua table
-should be encoded to an empty JSON list, not an empty JSON object.
-
-To still allow encoding empty JSON objects, the usage of anything other
-than a number or a string as a key (for example an empty table or a
-function) can be used to force encoding as an object:
-
-    json.stringify({})                  -- "[]"
-    json.stringify({[{}] = true})       -- "{}"
-
-Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
-
-diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
-index 827fde8843082e956b0c89b5855feeabd790e880..971fb122f7655b379e717ef78a5417032ead9a57 100644
---- a/libs/luci-lib-jsonc/src/jsonc.c
-+++ b/libs/luci-lib-jsonc/src/jsonc.c
-@@ -222,7 +222,7 @@ static int _lua_test_array(lua_State *L, int index)
- 
- out:
- 		lua_pop(L, 2);
--		return 0;
-+		return -1;
- 	}
- 
- 	/* check for holes */
-@@ -254,7 +254,7 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
- 	case LUA_TTABLE:
- 		max = _lua_test_array(L, index);
- 
--		if (max > 0)
-+		if (max >= 0)
- 		{
- 			obj = json_object_new_array();
- 

patches/packages/luci/0005-luci-lib-jsonc-Fix-memory-leak-in-stringify.patch

-From: Jan-Philipp Litza <janphilipp@litza.de>
-Date: Mon, 31 Aug 2015 19:52:36 +0200
-Subject: luci-lib-jsonc: Fix memory leak in stringify()
-
-diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
-index 971fb122f7655b379e717ef78a5417032ead9a57..b857c979e93bec395bca164a4f144c7c69005bec 100644
---- a/libs/luci-lib-jsonc/src/jsonc.c
-+++ b/libs/luci-lib-jsonc/src/jsonc.c
-@@ -106,6 +106,7 @@ static int json_stringify(lua_State *L)
- 		flags |= JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED;
- 
- 	lua_pushstring(L, json_object_to_json_string_ext(obj, flags));
-+	json_object_put(obj);
- 	return 1;
- }
- 

patches/packages/luci/0006-luci-lib-jsonc-Add-ltn12-compatible-sink-factory.patch

-From: Jan-Philipp Litza <janphilipp@litza.de>
-Date: Tue, 1 Sep 2015 16:17:23 +0200
-Subject: luci-lib-jsonc: Add ltn12-compatible sink factory
-
-To use the luci-lib-jsonc parser as sink for an ltn12 pump (for example
-from stdin), the following code will now do:
-
-    require 'luci.ltn12'
-    require 'luci.jsonc'
-
-    local parser = luci.jsonc.new()
-    luci.ltn12.pump.all(luci.ltn12.source.file(io.input()), parser:sink())
-    print(parser:get())
-
-Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
-
-diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
-index b857c979e93bec395bca164a4f144c7c69005bec..ef1110166055a78bf32cf1a6fbbd3e356b2bce3f 100644
---- a/libs/luci-lib-jsonc/src/jsonc.c
-+++ b/libs/luci-lib-jsonc/src/jsonc.c
-@@ -328,6 +328,76 @@ static int json_parse_set(lua_State *L)
- 	return 0;
- }
- 
-+static int json_parse_sink_closure(lua_State *L)
-+{
-+	bool finished = lua_toboolean(L, lua_upvalueindex(2));
-+	if (lua_isnil(L, 1))
-+	{
-+		// no more data available
-+		if (finished)
-+		{
-+			// we were finished parsing
-+			lua_pushboolean(L, true);
-+			return 1;
-+		}
-+		else
-+		{
-+			lua_pushnil(L);
-+			lua_pushstring(L, "Incomplete JSON data");
-+			return 2;
-+		}
-+	}
-+	else
-+	{
-+		if (finished)
-+		{
-+			lua_pushnil(L);
-+			lua_pushstring(L, "Unexpected data after complete JSON object");
-+			return 2;
-+		}
-+		else
-+		{
-+			// luci.jsonc.parser.chunk()
-+			lua_pushcfunction(L, json_parse_chunk);
-+			// parser object from closure
-+			lua_pushvalue(L, lua_upvalueindex(1));
-+			// chunk
-+			lua_pushvalue(L, 1);
-+			lua_call(L, 2, 2);
-+
-+			if (lua_isnil(L, -2))
-+			{
-+				// an error occurred, leave (nil, errmsg) on the stack and return it
-+				return 2;
-+			}
-+			else if (lua_toboolean(L, -2))
-+			{
-+				// finished reading, set finished=true and return nil to prevent further input
-+				lua_pop(L, 2);
-+				lua_pushboolean(L, true);
-+				lua_replace(L, lua_upvalueindex(2));
-+				lua_pushnil(L);
-+				return 1;
-+			}
-+			else
-+			{
-+				// not finished reading, return true
-+				lua_pop(L, 2);
-+				lua_pushboolean(L, true);
-+				return 1;
-+			}
-+		}
-+	}
-+}
-+
-+static int json_parse_sink(lua_State *L)
-+{
-+	luaL_checkudata(L, 1, LUCI_JSONC_PARSER);
-+	lua_pushboolean(L, false);
-+	lua_pushcclosure(L, json_parse_sink_closure, 2);
-+	return 1;
-+}
-+
- static int json_tostring(lua_State *L)
- {
- 	struct json_state *s = luaL_checkudata(L, 1, LUCI_JSONC_PARSER);
-@@ -367,6 +437,7 @@ static const luaL_reg jsonc_parser_methods[] = {
- 	{ "parse",			json_parse_chunk  },
- 	{ "get",			json_parse_get    },
- 	{ "set",			json_parse_set    },
-+	{ "sink",			json_parse_sink   },
- 	{ "stringify",		json_tostring     },
- 
- 	{ "__gc",			json_gc           },
-diff --git a/libs/luci-lib-jsonc/src/jsonc.luadoc b/libs/luci-lib-jsonc/src/jsonc.luadoc
-index 2ee9cebdc889242595f5281228783df15b9b8dcd..720b17d1eb76d8eb9a8b47939ac724891cfb3886 100644
---- a/libs/luci-lib-jsonc/src/jsonc.luadoc
-+++ b/libs/luci-lib-jsonc/src/jsonc.luadoc
-@@ -121,10 +121,22 @@ parser:set({ "some", "data" })`
- ]]
- 
- ---[[
--Serialize current parser state as JSON.
-+Generate an ltn12-compatible sink.
- 
- @class function
- @sort 4
-+@name parser.sink
-+@return Returns a function that can be used as an ltn12 sink.
-+@usage `parser = luci.jsonc.new()
-+ltn12.pump.all(ltn12.source.file(io.input()), parser:sink())
-+print(parser:get())`
-+]]
-+
-+---[[
-+Serialize current parser state as JSON.
-+
-+@class function
-+@sort 5
- @name parser.stringify
- @param pretty A boolean value indicating whether the resulting JSON should be pretty printed.
- @return Returns the serialized JSON data of this parser instance.

patches/packages/luci/0008-Move-rpcd-dependency-from-luci-base-to-luci-mode-rpc.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 6 Sep 2015 01:27:06 +0200
-Subject: Move rpcd dependency from luci-base to luci-mode-rpc
-
-LuCI's authentication won't work without rpcd, but we aren't using the
-authentication anyways. Users who need it can just install rpcd explicitly.
-
-diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
-index 54506b023a728e071b8fb4983ef614897363c0ec..4457034ada02972908a68f7c9c54352e7ac3c054 100644
---- a/modules/luci-base/Makefile
-+++ b/modules/luci-base/Makefile
-@@ -12,7 +12,7 @@ LUCI_TYPE:=mod
- LUCI_BASENAME:=base
- 
- LUCI_TITLE:=LuCI core libraries
--LUCI_DEPENDS:=+lua +libuci-lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua
-+LUCI_DEPENDS:=+lua +libuci-lua +luci-lib-nixio +luci-lib-ip +libubus-lua
- 
- PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
- PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
-diff --git a/modules/luci-mod-rpc/Makefile b/modules/luci-mod-rpc/Makefile
-index e64c86c6283a5a7d1181816e9f148d78d15c7dd8..5f64a14d48ef1f74435e151bc03a2377239be1f8 100644
---- a/modules/luci-mod-rpc/Makefile
-+++ b/modules/luci-mod-rpc/Makefile
-@@ -7,7 +7,7 @@
- include $(TOPDIR)/rules.mk
- 
- LUCI_TITLE:=LuCI RPC - JSON-RPC API
--LUCI_DEPENDS:=+luci-lib-json
-+LUCI_DEPENDS:=+luci-lib-json +rpcd
- 
- include ../../luci.mk
-