Merge remote-tracking branch 'origin/devel' into ronny_gigaset

Conflicts:
	dectmngr2/Makefile

iop/configs/config

@@ -104,6 +104,7 @@ CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_multiwan=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netcheck=y
+CONFIG_PACKAGE_nmap=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y

iop/scripts/genconfig.sh

@@ -39,7 +39,6 @@ function genconfig {
 	for p in $iopsys_ramips; do
             if [ $p == $profile ]; then
 		target="iopsys_ramips"
-		masterconfig=0
 		return
             fi
 	done

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.17
+PKG_VERSION:=3.1.18
 
-PKG_SOURCE_VERSION:=fea81608c6e9df3a8ebe1ee5e2b7721a0467aee2
+PKG_SOURCE_VERSION:=d3e6930c8d7172e5ceed107c25644f8a813766ef
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 
@@ -49,7 +49,6 @@ define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/
 endef
 

questd/files/etc/init.d/quest

@@ -11,16 +11,10 @@ start_service() {
 	procd_set_param command "/sbin/questd"
 	procd_set_param respawn
 	procd_close_instance
-
-	procd_open_instance
-	procd_set_param command "/sbin/uscriptd"
-	procd_set_param respawn
-	procd_close_instance
 }
 
 stop() {
 	service_stop /sbin/questd
-	service_stop /sbin/uscriptd
 }
 
 service_triggers()