From aee71bbafb9977d9d64a2d506005c4504ebb18aa Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 11 Jun 2013 12:56:04 +0000
Subject: AA: backport libjson-c, libubox and uci from trunk

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36917 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/libjson-c/Makefile | 18 ++++++++++++------
 package/libubox/Makefile   |  4 ++--
 package/uci/Makefile       |  8 ++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index afd409b8e9..cc82df48fe 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -8,16 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=json-c
-PKG_VERSION:=0.9
+PKG_VERSION:=0.11
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://oss.metaparadigm.com/json-c/
-PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae
+PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
+PKG_MD5SUM:=aa02367d2f7a830bf1e3376f77881e98
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
 include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += $(FPIC)
@@ -36,15 +41,16 @@ endef
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json-c.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libjson/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libjson))
diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index 9865dc2bef..14927ab3af 100644
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2013-04-15
+PKG_VERSION:=2013-06-11
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=dcf93f332270bdaddb5d24fdba6e3eb5b1f7d80a
+PKG_SOURCE_VERSION:=ae40b6613019f02e856b4b1ccc2712984506152e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 CMAKE_INSTALL:=1
diff --git a/package/uci/Makefile b/package/uci/Makefile
index bdd9ab3880..54ad80bda9 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -7,20 +7,19 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=2013-05-26
+UCI_VERSION=2013-06-11
 UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
-PKG_REV:=9ef6964362f917ba035020d439d05b36abfe5bb9
+PKG_REV:=c9c9d5cb085acc58b6579ace83fb79c085a9db27
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/uci.git
 PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_MD5SUM:=05585c577ae39173920d0a44bda9537a
 
 PKG_LICENSE:=LGPLv2.1 GPLv2
 PKG_LICENSE_FILES:=
@@ -39,6 +38,7 @@ define Package/libuci
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)
+  DEPENDS:=+libubox
 endef
 
 define Package/uci
@@ -81,7 +81,7 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
-- 
cgit v1.2.3