questd: remove uproxyd files

owsd/Config.in

@@ -1,9 +1,9 @@
 choice
-	prompt "Select Bus"
+	prompt "Select IPC Bus"
 	default OWSD_USE_UBUS
 	depends on PACKAGE_owsd
 	help
-		Select which bus to compile owsd for
+		Select which IPC bus to compile owsd for
 
 config OWSD_USE_DBUS
 	bool "Use DBUS"
@@ -15,3 +15,11 @@ config OWSD_USE_DBUS_UBUS
 	bool "Use UBUS and DBUS"
 
 endchoice
+
+config OWSD_UPROXYD
+	bool "Enable UBUS Proxy Daemon"
+	default y if OWSD_USE_UBUS || OWSD_USE_DBUS_UBUS
+        help
+          Enabling uproxyd automates detection of other
+	  UBUS-X enabled devices in the network
+

owsd/Makefile

@@ -5,25 +5,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owsd
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=f0eedeb6fd061edf3784d6bf86fa60b176bf3fe7
+PKG_SOURCE_VERSION:=930db7f4af821e91f46107c8a76b60f943ec7c3b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS
+PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS CONFIG_OWSD_UPROXYD
 
 USE_UBUS-y:=-DWSD_HAVE_UBUS=ON
 USE_DBUS-y:=-DWSD_HAVE_DBUS=ON
 USE_BOTH-y:=${USE_UBUS-y} ${USE_DBUS-y}
+USE_UPROXYD-y:=-DOWSD_UPROXYD=ON
 
 CMAKE_OPTIONS:=${USE_UBUS-${CONFIG_OWSD_USE_UBUS}} \
 	${USE_DBUS-${CONFIG_OWSD_USE_DBUS}} \
-	${USE_BOTH-${CONFIG_OWSD_USE_DBUS_UBUS}}
+	${USE_BOTH-${CONFIG_OWSD_USE_DBUS_UBUS}} \
+	${USE_UPROXYD-${CONFIG_OWSD_UPROXYD}}
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -51,6 +53,8 @@ endef
 define Package/owsd/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owsd $(1)/usr/bin/owsd
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uproxyd $(1)/sbin/uproxyd
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/owsd.init $(1)/etc/init.d/owsd
 	$(INSTALL_DIR) $(1)/etc/config

owsd/files/owsd.init

@@ -301,11 +301,15 @@ start_service() {
 	procd_set_param respawn
 
 	procd_close_instance
-	# Start uproxyd
-	procd_open_instance
-	procd_set_param command $UPROXYD
-	procd_set_param respawn
-	procd_close_instance
+
+	if [ "${enable}" -eq 1 ]; then
+		# Start uproxyd
+		procd_open_instance
+		procd_set_param command $UPROXYD
+		procd_set_param respawn
+		procd_close_instance
+	fi
+
 }
 
 #stop_service()

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.0
 
-PKG_SOURCE_VERSION:=f354a1a9976c16bca2fb7d6cb61783ebdc650840
+PKG_SOURCE_VERSION:=fdd80766b50fce51f68ff675b0e5398e0d31d3bb
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -59,7 +59,6 @@ define Package/questd/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uproxyd $(1)/sbin/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
 endef