il y a 8 ans · d84028301e
--- a/modules
+++ b/modules
@@ -14,5 +14,5 @@ PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
 
				 PACKAGES_ROUTING_COMMIT=ae65d4fe027592652376f8dbd3ff2ef37f5a84bc
			
 
				 
			
 
				 PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
			
 
				-PACKAGES_LUCI_COMMIT=8832d534e96d3a934bd02711884371fc78a0d506
			
 
				+PACKAGES_LUCI_COMMIT=cdcdfd2594634804ab09dc8105e46116edce0cd6
			
 
				 PACKAGES_LUCI_BRANCH=for-15.05
			
--- a/patches/packages/luci/0003-luci-base-depend-on-libubus-lua.patch
+++ b/patches/packages/luci/0003-luci-base-depend-on-libubus-lua.patch
@@ -1,17 +0,0 @@
 
				-From: Matthias Schiffer <mschiffer@universe-factory.net>
			
 
				-Date: Thu, 21 May 2015 02:34:01 +0200
			
 
				-Subject: luci-base: depend on libubus-lua
			
 
				-
			
 
				-diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
			
 
				-index 80bbda1..55c21eb 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
			
 
				-+LUCI_DEPENDS:=+lua +libuci-lua +libubus-lua +luci-lib-nixio +luci-lib-ip +rpcd
			
 
				- 
			
 
				- PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
			
 
				- PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
			
--- a/patches/packages/luci/0003-luci-lib-jsonc-Ignore-non-string-or-number-keys-in-tables.patch
+++ b/patches/packages/luci/0003-luci-lib-jsonc-Ignore-non-string-or-number-keys-in-tables.patch
--- a/patches/packages/luci/0004-luci-lib-jsonc-allow-encoding-empty-lists.patch
+++ b/patches/packages/luci/0004-luci-lib-jsonc-allow-encoding-empty-lists.patch
--- a/patches/packages/luci/0005-luci-lib-jsonc-Fix-memory-leak-in-stringify.patch
+++ b/patches/packages/luci/0005-luci-lib-jsonc-Fix-memory-leak-in-stringify.patch
--- a/patches/packages/luci/0006-luci-lib-jsonc-Add-ltn12-compatible-sink-factory.patch
+++ b/patches/packages/luci/0006-luci-lib-jsonc-Add-ltn12-compatible-sink-factory.patch
--- a/patches/packages/luci/0007-model.uci-add-add_to_set-remove_from_set.patch
+++ b/patches/packages/luci/0007-model.uci-add-add_to_set-remove_from_set.patch
--- a/patches/packages/luci/0008-Move-rpcd-dependency-from-luci-base-to-luci-mode-rpc.patch
+++ b/patches/packages/luci/0008-Move-rpcd-dependency-from-luci-base-to-luci-mode-rpc.patch
@@ -6,15 +6,15 @@ 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 55c21eb..7a1009c 100644
			
 
				+index 54506b0..4457034 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 +libubus-lua +luci-lib-nixio +luci-lib-ip +rpcd
			
 
				-+LUCI_DEPENDS:=+lua +libuci-lua +libubus-lua +luci-lib-nixio +luci-lib-ip
			
 
				+-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