diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-19 20:48:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-19 20:48:07 +0000 |
| commit | 95006024574dea263fdec13922aa3f57e61cc0c0 (patch) | |
| tree | 18bf30148431667b8986b330ca8c097ce0080768 | |
| parent | 4d465f4036d1bafe2c82998c106a5e52dbf66897 (diff) | |
| download | upstream-95006024574dea263fdec13922aa3f57e61cc0c0.tar.gz upstream-95006024574dea263fdec13922aa3f57e61cc0c0.tar.bz2 upstream-95006024574dea263fdec13922aa3f57e61cc0c0.zip | |
uci: use latest git, fixes reorder operation and incorperates nested delete patch
SVN-Revision: 25048
| -rw-r--r-- | package/uci/Makefile | 8 | ||||
| -rw-r--r-- | package/uci/patches/130-lua_fix_nested_foreach_delete.patch | 20 |
2 files changed, 4 insertions, 24 deletions
diff --git a/package/uci/Makefile b/package/uci/Makefile index c9fc6a63c4..78b3fa8e3a 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 70c23ad7b7..0000000000 --- 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++; |