libmobile: update hash & comment dongle_nl package

Add default value to debug so that an extra check whether debug has been initiated is not required prior to checking if it is greater than 0.

dectmngr2/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.2.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dafaf749e89d1efaa7eb02709a3c0ef3e813c052
+PKG_SOURCE_VERSION:=cbe2bd27df151be073cf88e8550bbb39c6cd29d8
 PKG_NAME:=dectmngr2
 
 

endptmngr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=0cb8accbac3355b97a17064ec7da010a2c42db7b
+PKG_SOURCE_VERSION:=dec85d5beabcb0d01f5a5583e3940c9dc922ea03
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

icwmp/Config_cwmp.in

@@ -27,9 +27,5 @@ config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
-config LIBDATAMODEL_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_Inteno_SE_"
-    
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-07-16
+PKG_VERSION:=4.0-2018-05-23
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d22821b251277584cfbcce98a98a4261813418ce
+PKG_SOURCE_VERSION:=3320a6234403802647df9d8df485cd8a2754dac0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -82,8 +82,6 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -6,15 +6,7 @@
 
 [ -f /etc/config/cwmp ] || exit 0
 
-handle_icwmp_restart() {
-	[ -f /tmp/switching_mode ] && exit 0
-	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
-
-	[ "$INTERFACE" == "loopback" ] && exit 0
-
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
-
+handle_icwmp_reload() {
 	local islan="$(uci -q get network.$INTERFACE.is_lan)"
 	[ "$islan" == "1" ] && exit 0
 
@@ -56,22 +48,10 @@ handle_icwmp_restart() {
 	network_get_dnsserver curdnsservers $INTERFACE
 	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
 
-	local prevdev=""
-	local curdev=""
-	local devfile=/tmp/ipv4/$INTERFACE-dev
-	prevdev=$(cat $devfile 2>/dev/null)
-	network_get_device curdev $INTERFACE
-	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
-
-	[ \
-		"$prevdev" == "$curdev" -a \
-		"$previpaddr" = "$curipaddr" -a \
-		"$prevgateway" = "$curgateway" -a \
-		"$prevsubnets" = "$cursubnets" -a \
-		"$prevdnsservers" = "$curdnsservers" \
-	] && exit 0
+	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" -a "$prevdnsservers" = "$curdnsservers" ] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }
 
-handle_icwmp_restart
+handle_icwmp_reload
+

imonitor/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
-PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
+PKG_SOURCE_VERSION:=7ad67946ff8d9701447e720242d42bca7e910a56
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

imonitor/files/etc/config/imonitor

@@ -1,9 +1,8 @@
 config monitor
-	option app 'test'
-	option test 'echo test'
-	option stream 'stdout'
-	option string_match 'TEST'
-	option execute 'echo executing test'
-	option interval '10'
-	option nr_tests '2'
-
+   option app 'test'
+   option test 'echo test'
+   option stream 'stdout'
+   option string_match 'test'
+   option execute 'echo executing'
+   option interval '10'
+   option nr_tests '2'

inteno-netmodes/files/sbin/netmode-conf

@@ -8,18 +8,6 @@ state="exit"
 TMPPATH="/tmp/netmode_config_backup"
 CURMODE=""
 SLEEPTIME=300
-pid_file=/tmp/netmode-conf.pid
-
-echo "$$" >$pid_file
-
-cleanup(){
-	rm -rf $pid_file
-	# we need to trigger a reload of icwmp but ONLY if ip or device has changed
-	[ -f "/etc/hotplug.d/iface/90-icwmp" ] && INTERFACE=wan ACTION=ifup sh /etc/hotplug.d/iface/90-icwmp
-	exit
-}
-
-trap cleanup SIGHUP SIGINT SIGTERM SIGSTOP
 
 set_wireless_values() {
 	local iface_num="$1"
@@ -122,7 +110,7 @@ backup() {
 file="$1"
 from_gui="$2"
 
-[ -f "$file" ] || cleanup
+[ -f "$file" ] || exit
 
 # let netmode-handler up to 20 seconds to finish switching mode
 wait_for_netmode_handler
@@ -173,14 +161,14 @@ done
 
 [ "$apcliband" == "$band" -o "$band" == "" ] || {
 	[ "$from_gui" == "true" ] && restore "back"
-	cleanup
+	exit
 }
 
 repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
 
 [ -z "$repeater_iface_num" ] && {
 	[ "$from_gui" == "true" ] && restore "back"
-	cleanup
+	exit
 }
 
 json_get_var ssid ssid
@@ -209,7 +197,7 @@ while json_get_var dummy $i; do
 		a_num=$((a_num+1))
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
+			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 		get_device "b" device
@@ -217,7 +205,7 @@ while json_get_var dummy $i; do
                 b_num=$((b_num+1))
                 [ -z $iface_num ] && {
                         [ "$from_gui" == "true" ] && restore "back"
-                        cleanup
+                        exit
                 }
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	else
@@ -234,7 +222,7 @@ while json_get_var dummy $i; do
 		esac
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
+			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	fi
@@ -281,7 +269,7 @@ if [ "$from_gui" == "true" ]; then
 		ping -w1 $ip
 		if [ $? -eq 0 ]; then
 			restore
-			cleanup
+			exit
 		else
 			i=$((i-10))
 			sleep 9
@@ -290,7 +278,7 @@ if [ "$from_gui" == "true" ]; then
 	restore "back"
 else
 	if [ "$state" == "exit" ]; then
-		cleanup
+		return
 	fi
 	ubus call leds set '{"state":"allflash"}'
 	if [ "$state" == "apply" ]; then
@@ -304,5 +292,3 @@ else
 	correct_uplink
 	ubus call leds set '{"state":"normal"}'
 fi
-
-cleanup

inteno-netmodes/files/sbin/testnet

@@ -49,7 +49,7 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		arping -f -q -c1 -w3 -I $device $ipaddr
+		ping $ipaddr -I $device -W 3 -c 1 -q >/dev/null 2>&1
 		[ $? -eq 1 ] && rv=0 || rv=1
 	else
 		SLEEP_TIME=5

iop-lla-libs/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=iop-lla-libs
 PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cf38a6165251709c0d60b33eafd7f32dcc0675d7
+PKG_SOURCE_VERSION:=1b863569ba4ed64d7fdbc4e05d4abf6597aa257e
 PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
@@ -37,7 +37,6 @@ endef
 define Package/libethernet
   $(call Package/iop-lla-libs)
   TITLE:= Ethernet library (libethernet)
-DEPENDS:=+TARGET_iopsys_ramips:swconfig
 endef
 
 define Package/iop-lla-libs/config
@@ -73,10 +72,6 @@ subdirs := \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
 	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -85,7 +80,6 @@ MAKE_FLAGS += \
 	subdirs="$(subdirs)"
 
 define Build/InstallDev/libwifi
-	echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX $(1)"
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
@@ -99,14 +93,6 @@ define Build/InstallDev/libdsl
 	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
 endef
 
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef

iop/configs/config

@@ -213,8 +213,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -1,4 +1,3 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -1,4 +1,3 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -1,7 +1,5 @@
 CONFIG_BCM_I2C=y
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
-
 CONFIG_TARGET_NO_DSL=y
 

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -1,6 +1,4 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
-
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -1,6 +1,4 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
-
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,5 +1,3 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
-
 CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -1,3 +1,4 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
+CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -1,3 +1,4 @@
 CONFIG_BCM_I2C=y
 CONFIG_TARGET_NO_DECT=y
+CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -1,2 +1,3 @@
 CONFIG_BCM_I2C=y
+CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/eg200/config

@@ -1,5 +0,0 @@
-CONFIG_BCM_I2C=y
-CONFIG_TARGET_NO_DECT=y
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_ENDPOINT_MODULE=y
-

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -1,3 +1,4 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
+CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -1,4 +1,5 @@
 CONFIG_TARGET_NO_DHD=y
 CONFIG_TARGET_NO_VOICE=y
 CONFIG_BCM_I2C=y
+CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/scripts/annexconfig.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-function disable_add_config () {
-	local COPTION="$1"
-
-	HAVE_OPTION=`grep $COPTION .config | wc -l`
-	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
-	if [ "$HAVE_OPTION" = "1" ]
-	then
-		if [ "$HAVE_OPTION_DISABLED" = "0" ]
-		then
-			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
-		fi
-	else
-		echo "# $COPTION is not set" >> .config
-	fi
-}
-
-function enable_option () {
-	local COPTION="$1"
-#	cat .config| grep DSL
-	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
-#	cat .config| grep DSL
-}
-
-function annexconfig {
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	local ANNEX="$1"
-
-	disable_add_config CONFIG_TARGET_NO_DSL
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
-	disable_add_config CONFIG_TARGET_DSL_SADSL
-	disable_add_config CONFIG_TARGET_DSL_GFAST
-
-
-	if [ "$ANNEX" = "no" ]
-	then
-		echo "No DSL"
-		enable_option CONFIG_TARGET_NO_DSL
-	elif [ "$ANNEX" = "a" ]
-	then
-		echo "Annex A"
-		enable_option CONFIG_TARGET_DSL_ANNEX_A
-	elif [ "$ANNEX" = "b" ]
-	then
-		echo "Annex B"
-		enable_option CONFIG_TARGET_DSL_ANNEX_B
-	elif [ "$ANNEX" = "c" ]
-	then
-		echo "Annex C"
-		enable_option CONFIG_TARGET_DSL_ANNEX_C
-	elif [ "$ANNEX" = "sadsl" ]
-	then
-		echo "sadsl"
-		enable_option CONFIG_TARGET_DSL_SADSL
-	elif [ "$ANNEX" = "gfast" ]
-	then
-		echo "G.fast"
-		enable_option CONFIG_TARGET_DSL_GFAST
-	else
-		echo "Only option no,a,b,c,sadsl,gfast supported"
-	fi
-
-}
-
-register_command "annexconfig" "Select configuration annex"

iop/scripts/genconfig.sh

@@ -14,7 +14,7 @@ function genconfig {
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
 	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400 sdx810_ap"
 	ramips="mt7621"

iup/files/sbin/iup

@@ -415,7 +415,6 @@ parse_dhcp_options()
 		v "dhcp option 43 tr69 url $vendorspecinf"
 		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
 		provisioningcode=${rest%%,*};
-		[ -f /etc/config/cwmp ] && uci_set_state cwmp acs dhcp_url "$url"
 		uci_set_state provisioning iup urlcwmp "$url"
 		uci_set_state provisioning iup url "$url"
 		uci_set_state provisioning iup provisioningcode "$provisioningcode"

iwatchdog/src/src/watchdog.c

@@ -5,22 +5,15 @@
 #include <unistd.h>
 
 const char *watchdog_file = "/proc/watchdog";
-const char *watchdog_file_nvram = "/proc/nvram/watchdog";
 const char *init_string   = "1 5000000 1 4";
 const char *kicker        = "OK";
 
 int main(int argc, char **argv)
 {
-	int ret = 0;
-	char *wdt_string_prt = watchdog_file;
-        int fd = open(wdt_string_prt, O_WRONLY);
+        int fd = open(watchdog_file, O_WRONLY);
         if (fd < 0) {
-		wdt_string_prt = watchdog_file_nvram;
-		fd = open(wdt_string_prt, O_WRONLY);
-		if (fd < 0) {
-			perror("Open watchdog file");
-			exit(1);
-		}
+                perror("Open watchdog file");
+                exit(1);
         }
 
         /* init */
@@ -30,17 +23,14 @@ int main(int argc, char **argv)
                 perror("Error init watchdog");
                 exit(1);
         }
-	close(fd);
 
         while (1) {
-		fd = open(wdt_string_prt, O_WRONLY);
                 sleep(1);
                 res = write (fd, kicker, strlen(init_string) + 1);
 
                 if (res < 0 ){
                         perror("Error kicking watchdog");
                 }
-		close(fd);
         }
         return 0;
 }

libmobile/Makefile

@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2013 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=libmobile
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=62db19a67357473f1f8eb7b36c5c48a0baad55c6
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@public.inteno.se:mobile-api.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmobile
+	CATEGORY:=Libraries
+	DEPENDS:=+libubox +ubus +libcurl +libxml2
+	TITLE:=package for 4g dongle stuff
+endef
+
+
+define Package/mdmngr
+	CATEGORY:=Utilities
+	DEPENDS:=+libubox +ubus +libmobile
+	TITLE:=application package for 4g dongle stuff
+endef
+
+#define Package/dongle_nl
+#	CATEGORY:=Utilities
+#	TITLE:=Dongle Netlink
+#	URL:=
+#	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
+#endef
+
+define Package/libmobile/description
+	a library to communicate with dongles through HTTP requests
+endef
+
+define Package/mdmngr/description
+	application using libmobile to communicate with a 4g dongle
+endef
+
+#define Package/dongle_nl/description
+#	Dongle application handling netlink messages from kernel and sending them out on ubus.
+#endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libmobile.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libmobile.so $(1)/usr/lib/
+endef
+
+define	Package/libmobile/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libmobile.so $(1)/usr/lib/
+endef
+
+define	Package/mdmngr/install
+	$(CP) ./files/* $(1)/ # copy from files to final image
+	$(INSTALL_DIR) $(1)/sbin # make the dir
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdmngr $(1)/sbin/ # copy binaries to new directory
+endef
+
+#define Package/dongle_nl/install
+#	$(INSTALL_BIN) $(1)/sbin # make the dir
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_nl $(1)/sbin/
+#endef
+
+$(eval $(call BuildPackage,libmobile))
+$(eval $(call BuildPackage,mdmngr))
+#$(eval $(call BuildPackage,dongle_nl))

libmobile/files/etc/config/mdmngr

@@ -0,0 +1,2 @@
+config mdmngr mdmngr
+	option debug 1

libmobile/files/etc/hotplug.d/iface/99-mdmngr

@@ -0,0 +1,8 @@
+if echo $DEVICE | grep "eth";then
+	ubus call dongle refresh
+fi
+
+if echo $DEVICE | grep "usb";then
+	ubus call dongle refresh
+fi
+

libmobile/files/etc/hotplug.d/usb/99-mdmngr

@@ -0,0 +1,17 @@
+DEV_MOUNTPATH=`echo "$DEVPATH" | cut -d'/' -f 1-7`
+JUNK=`echo "$DEVPATH" | cut -d'/' -f 8`
+
+case "$ACTION" in
+	add)
+		if [ -z "$JUNK" ];then
+			#ubus call dongle alert '{"path":"/sys'${DEV_MOUNTPATH}'"}'
+			ubus call dongle refresh
+		fi
+		;;
+	remove)
+		ubus call dongle refresh
+		;;
+	*)
+		;;
+esac
+

libmobile/files/etc/init.d/mdmngr

@@ -0,0 +1,34 @@
+#!/bin/sh /etc/rc.common
+
+START=14
+STOP=96
+
+USE_PROCD=1
+NAME=dongled
+
+start_service() {
+	procd_open_instance
+	config_load mdmngr
+	config_get debug mdmngr debug 0
+	procd_set_param command "/sbin/mdmngr"
+
+#	procd_append_param command --debug "$debug"
+	if [ "$debug" -gt 0 ]
+	then
+		procd_append_param command --debug "$debug"
+	fi
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger mdmngr
+}
+
+reload_service() {
+	stop
+	start
+}

libpicoevent/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=0.2
 PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aaf2a9ce72fe4cb84af9ce185728d35dde33d54d
+PKG_SOURCE_VERSION:=e374bb2e848ab4002d13a02b6375974e155ba37e
 PKG_NAME:=libpicoevent
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

owsd/Makefile

@@ -1,5 +1,8 @@
 #
-# Copyright (C) 2018 Inteno
+# Copyright (C) 2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
@@ -10,7 +13,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
-PKG_SOURCE_VERSION:=372743e4c905c9d51988742442b375f0b2bab8db
+PKG_SOURCE_VERSION:=fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

owsd/files/owsd.config

@@ -11,7 +11,6 @@ config ubusproxy 'ubusproxy'
 #	list peer 'wss://192.168.1.101/'
 #	list object 'router.*'
 #	list object 'system'
-#	option prefix 'ip' # 'ip' or 'mac'
 #	option peer_cert '/etc/ssl/certs/owsd-repeater-control-cert.pem'
 #	option peer_key '/etc/ssl/private/owsd-repeater-control-key.pem'
 #	option peer_ca '/etc/ssl/certs/owsd-server-ca.pem'
@@ -53,8 +52,6 @@ config owsd-listen 'lan_8080'
 #	option ca '/etc/ssl/certs/owsd-ca-for-clients.pem'
 #	option whitelist_interface_as_origin '1'
 #	list origin '*'
-#	list ubusx_acl 'netmode'
-#	list ubusx_acl 'router.*'
 
 config owsd-listen 'wan'
 	option port '80'

owsd/files/owsd.init

@@ -110,7 +110,6 @@ validate_owsd_ubusproxy() {
 		'enable:bool:1' \
 		'peer:list(string)' \
 		'object:list(string)' \
-		'prefix:string' \
 		'peer_key:file' \
 		'peer_cert:file' \
 		'peer_ca:file' \
@@ -157,7 +156,6 @@ validate_owsd_iface() {
 		'key:file' \
 		'ca:file' \
 		'restrict_to_user:list(string)' \
-		'ubusx_acl:list(string)' \
 		&&
 	[ -n "${port}" ]
 }
@@ -166,7 +164,6 @@ parse_owsd_iface() {
 	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
-	local ubusx_acl
 
 	validate_owsd_iface "$1" || {
 		echo "Validation failed"
@@ -186,9 +183,6 @@ parse_owsd_iface() {
 		[ -n "${restrict_to_user}" ] && procd_append_param command -u"${restrict_to_user}"
 
 		[ -n "$2" ] && procd_append_param command -i"$2"
-
-		[ -n "${ubusx_acl}" ] && procd_append_param command -X"${ubusx_acl}"
-
 	}
 
 	append_whitelists () {
@@ -291,8 +285,6 @@ start_service() {
 
 		config_list_foreach "ubusproxy" "peer" append_peer
 		config_list_foreach "ubusproxy" "object" append_object
-
-		[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
 	fi
 
 	config_foreach parse_owsd_iface "owsd-listen"

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=3f6f5e56ebd11862c0255a05e733f7fe08e1ceb0
+PKG_SOURCE_VERSION:=d3a77faeadac7c7094fa084524d08e03c296bb56
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

rtl_433/Makefile

@@ -1,40 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rtl_433
-PKG_VERSION:=18.05
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/rtl_433-$(PKG_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/merbanan/rtl_433.git
-PKG_SOURCE_DATE:=2018-05-02
-PKG_SOURCE_VERSION:=5dce4f275b7e53e14043da685590514a992c38e4
-PKG_MIRROR_HASH:=7219b2d612959ef299bf692e3eef53735193f8c0817d229a8a40c732ab047ac5
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rtl_433
-  SECTION:=base
-  CATEGORY:=Utilities
-  TITLE:=turns your Realtek RTL2832 based DVB dongle into a 433.92MHz generic data receiver
-  URL:=https://github.com/merbanan/rtl_433
-  DEPENDS:= +librtlsdr +libusb
-endef
-
-define Package/rtl_433/description
- rtl_433 turns your Realtek RTL2832 based DVB dongle into a 433.92MHz generic data receiver
-endef
-
-define Build/Configure
-  $(call Build/Configure/Default,)
-endef
-
-define Package/rtl_433/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rtl_433 $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,rtl_433))

tptest/files/etc/config/speedtest

@@ -1,5 +1,5 @@
 
 config testserver '1'
 	option server 'referens.sth.ip-performance.se'
-	option port '1641'
+	option port '1642'
 

wifimngr/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=29ac0e0361e20d21559e0f2f585e5220f048b9e0
+PKG_SOURCE_VERSION:=fa0c6298ed8e47ac2979d51e0697e41bcaa3a055
 PKG_SOURCE_URL:=http://public.inteno.se:/wifimngr
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>