[package] uhttpd: cope with DES crypted passwd entries by not relying on a leading...

[openwrt.git] / package / libubox / Makefile

diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index 808a1a0..83abacc 100644 (file)
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,14 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2011-02-11
-PKG_RELEASE:=1
+PKG_VERSION:=2011-10-27
+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:=83037e345dd702f2a013322139ef0b7bab7e170f
+PKG_SOURCE_VERSION:=fc20c7a0314afa07f4f873f1a2f1f0095bf8e519
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=b942331d2161cb57926619ccfe96613a
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,7 +22,6 @@ define Package/libubox
   DEPENDS:=
 endef
 
-
 define Package/libblobmsg-json
   SECTION:=libs
   CATEGORY:=Libraries
@@ -29,6 +29,16 @@ define Package/libblobmsg-json
   DEPENDS:=+libjson
 endef
 
+define Package/jshn
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson
+  TITLE:=JSON SHell Notation
+endef
+
+define Package/jshn/description
+  Library for parsing and generating JSON from shell scripts
+endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
@@ -42,6 +52,13 @@ define Package/libblobmsg-json/install
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
 endef
 
+define Package/jshn/install
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/libubox
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jshn $(1)/usr/bin
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox
+endef
+
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
+$(eval $(call BuildPackage,jshn))