Merge branch 'v2.16.09'

luci-bwc/Makefile → juci-bwc/Makefile

@@ -7,40 +7,40 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=luci-bwc
+PKG_NAME:=juci-bwc
 PKG_VERSION:=2015-01-10
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/mkschreder/luci-bwc.git
-PKG_SOURCE_VERSION:=105d5b36ce5c3e75891c30cd67722372bce997ab
+PKG_SOURCE_URL:=https://github.com/mkschreder/juci-bwc.git
+PKG_SOURCE_VERSION:=8ebc015cde4bcdccb2d5f8413244d3838cdd29f6
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Martin K. Schröder <[email protected]>
 
-PKG_LICENSE:=ISC
+PKG_LICENSE:=ASL
 PKG_LICENSE_FILES:=
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/luci-bwc
+define Package/juci-bwc
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Realtime Graphs utility
-  DEPENDS:=+libiwinfo
+  DEPENDS:=+libiwinfo +librt +libpthread
 endef
 
-define Package/luci-bwc/description
-This package provides the binary luci-bwc utility for juci. 
+define Package/juci-bwc/description
+This package provides the binary juci-bwc utility for juci. 
 endef
 
-define Package/luci-bwc/install
+define Package/juci-bwc/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/luci-bwc $(1)/usr/bin/luci-bwc
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/juci-bwc $(1)/usr/bin/juci-bwc
 endef
 
-$(eval $(call BuildPackage,luci-bwc))
+$(eval $(call BuildPackage,juci-bwc))
 

juci/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=juci
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mkschreder/juci.git
-PKG_SOURCE_VERSION:=89c48fdf3609d9612d53d2a4f7658accd165e21d
+PKG_SOURCE_VERSION:=d5d3d2b8537d830756eae2a6c895f83c2329f35a
 PKG_VERSION:=2.16.09
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -61,7 +61,7 @@ export CONFIG_PACKAGE_$(2):=$(CONFIG_PACKAGE_$(2))
 define Package/$(2)
 	SECTION:=juci
 	CATEGORY:=JUCI
-	URL:=https://github.com/mkschreder/luci-express
+	URL:=https://github.com/mkschreder/juci.git
 	MAINTAINER:=Martin K. Schröder <[email protected]>
 	SUBMENU:=$(1)
 	TITLE:=$(if $(3),$(3),JUCI $(2) plugin)
@@ -92,7 +92,7 @@ $(eval $(call RegisterAddon,Plugins,juci-event, JUCI Event Subsystem ))
 $(eval $(call RegisterAddon,Plugins,juci-firewall-fw3, FW3 Firewall Configuration /etc/config/firewall ))
 $(eval $(call RegisterAddon,Plugins,juci-igmpinfo, IGMP Snooping Info through kernel snooping tables ))
 $(eval $(call RegisterAddon,Plugins,juci-jquery-console, Quake Style Dropdown Console for JUCI in browser))
-$(eval $(call RegisterAddon,Plugins,juci-realtime-graphs,Realtime Graphs based on luci-bwc,+luci-bwc))
+$(eval $(call RegisterAddon,Plugins,juci-realtime-graphs,Realtime Graphs based on juci-bwc,+luci-bwc))
 $(eval $(call RegisterAddon,Plugins,juci-macdb, MAC Address to Manufacturer Name resolution for juci))
 $(eval $(call RegisterAddon,Plugins,juci-minidlna, MiniDLNA Configuration))
 $(eval $(call RegisterAddon,Plugins,juci-mod-status, Deprecated JUCI Status Reporting Module))

libblobpack/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libblobpack
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/mkschreder/libblobpack.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4bb494cf13581c20e86981321470aa46dad46aa3
-PKG_VERSION=1.0.2-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://github.com/mkschreder/libblobpack.git
+PKG_SOURCE_VERSION:=a024c6e3a2512741d94e3a48d72e734de7f73ff3
+PKG_VERSION=2.16.09-$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_INSTALL:=1

libusys/Makefile

@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libusys
-PKG_VERSION:=27c5f81c80a3ea113378f56d4fc0e8fd903e7abe
+PKG_VERSION:=dd7b53bf45baa1765f2163a81fd53a422e3b4fa8
 PKG_RELEASE:=1.0.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

libutype/Makefile

@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libutype
-PKG_VERSION:=7350bb28e7c96db2c4e3c7722e71f383a84881a2
+PKG_VERSION:=0cfa35bbb4948d6926aa85d3e48f2318b9166486
 PKG_RELEASE:=1.0.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

orange-rpcd/Config.in

@@ -0,0 +1,4 @@
+config ORANGE_PARALLEL
+	depends on PACKAGE_orange-rpcd
+	bool "Enable parallel processing of requests"
+	default y

orange-rpcd/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=orange-rpcd
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mkschreder/orangerpcd.git
-PKG_SOURCE_VERSION:=ae41b9aae88e002511f80607f2526403b786ed98
+PKG_SOURCE_VERSION:=326c72fa702939c33e0207a2b5e7bff2b0bbee8d
 PKG_VERSION:=2.16.08-$(PKG_SOURCE_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -33,35 +33,46 @@ define Package/orange-rpcd
   TITLE:=Websocket RPC server for OpenWRT
   #DEPENDS:=+BUSYBOX_DEFAULT_SHA1SUM <<- this one is necessary but it is not easily selectable TODO: fix it 
   DEPENDS+=+iwinfo +rpcd +lua +liborange +libuci-lua +libubus-lua +libubox-lua +luaposix33 +libblobpack +libuci +libusys +libutype +liblua +libwebsockets
+  MENU=1
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default)
+	$(call Build/Configure/Default,\
+		$(if $(CONFIG_ORANGE_PARALLEL),--enable-parallel,--disable-parallel)\
+	)
 endef
 
 define Package/liborange/install
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/src/.libs/*.so* $(1)/usr/lib/
 endef
 
+define Package/orange-rpcd/config
+	source "$(SOURCE)/Config.in"
+endef
+
 define Package/orange-rpcd/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/src/.libs/orangerpcd $(1)/usr/bin/
+
 	$(INSTALL_DIR) $(1)/usr/lib/orange/api/
 	$(CP) $(PKG_BUILD_DIR)/plugins/* $(1)/usr/lib/orange/api/
+
 	$(INSTALL_DIR) $(1)/usr/lib/orange/acl/
 	$(INSTALL_DIR) $(1)/usr/lib/orange/lib/
 	$(CP) $(PKG_BUILD_DIR)/lualib/* $(1)/usr/lib/orange/lib/
+
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/orange.init $(1)/etc/init.d/orange
+
+	$(INSTALL_DIR) $(1)/etc/orange/
+	touch $(1)/etc/orange/shadow
+
 	$(INSTALL_DIR) $(1)/etc/config/
 	$(INSTALL_BIN) ./files/orange.config $(1)/etc/config/orange
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/orangectl.sh $(1)/usr/bin/orangectl
+
 	$(INSTALL_DIR) $(1)/usr/lib/orange/hooks/
-	$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d/
-	$(INSTALL_DATA) ./files/access.json $(1)/usr/share/rpcd/acl.d/orange.json
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(INSTALL_DATA) ./files/uci-defaults.sh $(1)/etc/uci-defaults/00-orange-rpcd.sh
 endef
 
 $(eval $(call BuildPackage,liborange))

speedtest-cpp/files/speedtest.lua

@@ -13,8 +13,9 @@ local function speedtest_status(opts)
 	local status = core.shell("speedtest status"); 
 	local time = core.shell("date '+%s'", "%s"); 
 	local result = {}; 
-	if( not status or status == "" ) then 
-		result["status"] = "Could not retreive speedtest status!"; 
+	if( not status or status == "" or status:match("No (.*)")) then 
+		result["status"] = status or "Could not retreive speedtest status!"; 
+		return result; 
 	end
 	for line in status:gmatch("[^\r\n]+") do
 		local key, value = line:match("(%S+)%s+(.+)"); 
@@ -35,7 +36,7 @@ local function speedtest_run(opts)
 	local prev = speedtest_status(opts); 
 	local result = core.shell("speedtest run"); 	
 	local ret = speedtest_status(opts); 
-	if(ret.age < prev.age and (ret.download_mbits == nil or ret.upload_mbits == nil)) then 
+	if((ret.age and prev.age and (ret.age < prev.age)) and (ret.download_mbits == nil or ret.upload_mbits == nil)) then 
 		ret.error = "Was unable to measure speed at this time!"; 
 	end
 	return ret;