From 95006024574dea263fdec13922aa3f57e61cc0c0 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 19 Jan 2011 20:48:07 +0000
Subject: uci: use latest git, fixes reorder operation and incorperates nested
 delete patch

SVN-Revision: 25048
---
 package/uci/Makefile                                 |  8 ++++----
 .../patches/130-lua_fix_nested_foreach_delete.patch  | 20 --------------------
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 package/uci/patches/130-lua_fix_nested_foreach_delete.patch

(limited to 'package/uci')

diff --git a/package/uci/Makefile b/package/uci/Makefile
index c9fc6a6..78b3fa8 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -7,13 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=2010-09-28
-UCI_RELEASE=2
+UCI_VERSION=2011-01-19
+UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
-PKG_RELEASE:=2
-PKG_REV:=3fa65a20ae0fc77b951515bc5de7a0041adc9be1
+PKG_RELEASE:=1
+PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/uci.git
diff --git a/package/uci/patches/130-lua_fix_nested_foreach_delete.patch b/package/uci/patches/130-lua_fix_nested_foreach_delete.patch
deleted file mode 100644
index 70c23ad..0000000
--- a/package/uci/patches/130-lua_fix_nested_foreach_delete.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/lua/uci.c
-+++ b/lua/uci.c
-@@ -266,7 +266,7 @@ uci_lua_foreach(lua_State *L)
- {
- 	struct uci_context *ctx;
- 	struct uci_package *p;
--	struct uci_element *e;
-+	struct uci_element *e, *tmp;
- 	const char *package, *type;
- 	bool ret = false;
- 	int offset = 0;
-@@ -287,7 +287,7 @@ uci_lua_foreach(lua_State *L)
- 	if (!p)
- 		goto done;
- 
--	uci_foreach_element(&p->sections, e) {
-+	uci_foreach_element_safe(&p->sections, tmp, e) {
- 		struct uci_section *s = uci_to_section(e);
- 
- 		i++;
-- 
cgit v1.1