iup: only whitespace changes

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dafaf749e89d1efaa7eb02709a3c0ef3e813c052
+PKG_SOURCE_VERSION:=ace6a3dcb6aa463cf5a34ad39ac37a5bc7d4ce5e
 PKG_NAME:=dectmngr2
 
 

endptmngr/Makefile

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

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.1.1
-PKG_RELEASE:=
-PKG_VERSION:=$(BASE_PKG_VERSION)$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.0.3
+PKG_RELEASE:=RC5
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=e8bf50630e6ba12dc2d223112643077c4db49189
+PKG_SOURCE_VERSION:=a7f40bfd47d0ce3f3c002460e3c83ffc821ac1e4
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

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-04-20
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d22821b251277584cfbcce98a98a4261813418ce
+PKG_SOURCE_VERSION:=1c6398191a9269c8e885ef78c21b4bd5b618a2fb
 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:=defec6849fb987619fc7fd9295895f4f0b9db5a9
 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/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=inteno-netmodes
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
+PKG_SOURCE_VERSION:=e43701f76ba2a8699df797d88fffc3895a3bfeb8
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
 

inteno-netmodes/files/etc/init.d/netmode

@@ -12,7 +12,7 @@ start_netmoded() {
 	procd_open_instance
 	procd_set_param command $NETMODED
 
-	procd_append_param command --verbose warning
+	procd_append_param command --verbose debug
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

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/start-netmode-conf

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-netmode-conf "$1" "$2" &

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

inteno-netmodes/files/usr/libexec/rpcd/repeater

@@ -129,12 +129,12 @@ case "$1" in
 				json_load "`cat $file`" || write_error "invalid file content"
 				json_select "wifi_ifaces" || write_error "invalid file content"
 
-				start-netmode-conf "$file" "$from_gui" >/dev/null 2>/dev/null
 
 				json_init
 				json_add_string "status" success
 				json_dump
 
+				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
 			;;
 		esac
 	;;

iop-lla-libs/Config.in

@@ -1,7 +0,0 @@
-menu "Library options"
-
-config IOP_LLA_LIBS_DEBUG
-	bool "Enable debug support"
-	default n
-
-endmenu

iop-lla-libs/Makefile

@@ -1,131 +0,0 @@
-#
-# Copyright (C) 2018 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iop-lla-libs
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cf38a6165251709c0d60b33eafd7f32dcc0675d7
-PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iop-lla-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=IOPSYS low level libraries
-  DEPENDS:=+libopenssl
-endef
-
-define Package/libwifi
-  $(call Package/iop-lla-libs)
-  TITLE:= WiFi library (libwifi)
-endef
-
-define Package/libdsl
-  $(call Package/iop-lla-libs)
-  TITLE:= XDSL library (libdsl)
-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
-  source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-  TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
-  TARGET_PLATFORM=LANTIQ
-  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
-else
-  $(info (UNEXPECTED CONFIG TARGET))
-endif
-
-ifdef CONFIG_IOP_LLA_LIBS_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(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)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	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/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
-	$(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
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwifi))
-$(eval $(call BuildPackage,libdsl))
-$(eval $(call BuildPackage,libethernet))

iop/configs/config

@@ -32,7 +32,6 @@ CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
@@ -114,7 +113,7 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-# CONFIG_PACKAGE_p910nd is not set
+CONFIG_PACKAGE_p910nd=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -131,7 +130,6 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_samba3=y
 CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
@@ -213,8 +211,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/build_branch.sh

@@ -6,7 +6,6 @@ function build_branch_usage {
 	echo "usage: $0 build_branch <branch> <board> [<customer>]"
 	echo "example: $0 build_branch devel-new ex400 DEV"
 	echo "example: $0 build_branch_sysupgrade devel-new ex400 DEV 192.168.1.1 -n"
-	set +x
 	exit 1
 }
 
@@ -18,7 +17,6 @@ function branch_exists {
 }
 
 function build_branch {
-	set -x
 	local branch=$1
 	local board=$2
 	local customer=$3
@@ -37,7 +35,6 @@ time {
 	./iop feeds_update || build_branch_usage
 	./iop genconfig -c $board $customer || build_branch_usage
 	make -j 8 || build_branch_usage
-	set +x
 }
 }
 

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"

iop/scripts/generate_tarballs.sh

@@ -14,7 +14,6 @@ build_bcmkernel_consumer() {
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
 	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "ln -s $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
 	rm -f $tarfile
 	cd $curdir
 }
@@ -120,8 +119,6 @@ function generate_tarballs {
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
-    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
     curdir=$(pwd)
 
 

iup/files/sbin/iup

@@ -71,8 +71,7 @@ reload ()
 	local pack
 	pack=$(get_packages $1)
 	v "Calling ubus call uci commit for $pack"
-	for packname in $pack
-	do
+	for packname in $pack ; do
 		ubus call uci commit '{"config":"'$packname'"}'
 		sleep 1
 	done
@@ -118,10 +117,12 @@ handle_provisioning() {
 		mkdir $IUPTEMP
 	fi
 	touch $IUPCONFFILES
+
 	config_get_bool enabled "$config" enabled "$default"
 	config_get_bool defaultreset "$config" defaultreset
 	config_get deckey "$config" deckey
-	if [ "$enabled" -eq 1	]; then
+
+	if [ "$enabled" -eq 1 ]; then
 		if [ "$config" == "iup" ]; then
 			v "Using url received in dhcp options"
 			config_get url "$config" urliup
@@ -131,26 +132,25 @@ handle_provisioning() {
 		url=${url//\$MAC/$MAC}
 		v "Downloading from url \"$url\""
 
-		while [ $retry -le $RETRYSTOP ]
-		do
-		  if [ ${url%%:*} == "tftp" ]; then
-			tftpfile=${url#*\/\/}
-			host=${tftpfile%%\/*}
-			tftpfile=${tftpfile#*\/}
+		while [ $retry -le $RETRYSTOP ]; do
+			if [ ${url%%:*} == "tftp" ]; then
+				tftpfile=${url#*\/\/}
+				host=${tftpfile%%\/*}
+				tftpfile=${tftpfile#*\/}
 
-			/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
-		  else
-			get_image "$url" "cat" > $IUPCONFFILES
-		  fi
-		  if [ -s $IUPCONFFILES ]; then
-			v "Download finished"
-			retry=$((RETRYSTOP + 1))
-		  else
-		  v "Download failed, retrying in $incsleep seconds"
-		  sleep $incsleep
-		  incsleep=$((incsleep * retry + number))
-		  retry=$((retry+1))
-		  fi
+				/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
+			else
+				get_image "$url" "cat" > $IUPCONFFILES
+			fi
+			if [ -s $IUPCONFFILES ]; then
+				v "Download finished"
+				retry=$((RETRYSTOP + 1))
+			else
+				v "Download failed, retrying in $incsleep seconds"
+				sleep $incsleep
+				incsleep=$((incsleep * retry + number))
+				retry=$((retry+1))
+			fi
 		done
 	fi
 	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
@@ -170,11 +170,11 @@ handle_Downloaded_file()
 	KEY=${DECKEY:-$DESKEY}
 	local img_type
 	case "$(get_image_type "$IUPCONFFILES")" in
-                "INTENO") img_type=2 ;;
-                "CFE+FS") img_type=1 ;;
-                "FS")     img_type=0 ;;
-                *)      img_type="UNKNOWN";;
-        esac
+		"INTENO") img_type=2 ;;
+		"CFE+FS") img_type=1 ;;
+		"FS")     img_type=0 ;;
+		*)      img_type="UNKNOWN";;
+		esac
 
         if [ "$img_type" == "UNKNOWN" ] ; then
 		case "$(hexdump -v -n 2 -e '1/1 "%02x"' $IUPCONFFILES)" in
@@ -192,15 +192,13 @@ handle_Downloaded_file()
 					save_usercfg
 					cd $IUPTEMP
 					tar xvzf $IUPCONFFILES
-					for f in $CONFILESLURP
-					do
+					for f in $CONFILESLURP ; do
 						v "File to be applied $f and config $(cat $f)"
 						uci -f $f import
 					done
 					pack=$(get_packages $CONFILESLURP)
 					v "Packages to be commited: $pack"
-					for packname in $pack
-					do
+					for packname in $pack ; do
 						uci commit $packname
 					done
 					apply_usercfg
@@ -239,7 +237,7 @@ handle_Downloaded_file()
 		v "Downloaded file is a firmware, will start reflashing"
 		if [ "$defaultreset" -eq 1 ]; then
 			v "Not saving configuration over reflash"
-			 /sbin/sysupgrade -v -n $IUPCONFFILES
+			/sbin/sysupgrade -v -n $IUPCONFFILES
 		else
 			v "Saving configuration over reflash"
 			/sbin/sysupgrade -v $IUPCONFFILES
@@ -290,14 +288,14 @@ change_to_vlan() {
 
 	# loop through the string, remove any word close to "base_dev".
 	for word in ${wan_if}; do
-	#echo $word
-	case $word in
-		${base_dev}*) # don't add if.
-		;;
-		*)	new_wan_if=${word}' '${new_wan_if}  # add if.
-			#new_wan_if+=" ${word}"  # probably not working in ash.
-		;;
-	esac
+		#echo $word
+		case $word in
+			${base_dev}*) # don't add if.
+			;;
+			*)	new_wan_if=${word}' '${new_wan_if}  # add if.
+				#new_wan_if+=" ${word}"  # probably not working in ash.
+			;;
+		esac
 	done
 	# append new interface.
 	new_wan_if=${new_wan_if}${base_dev}.${1}
@@ -415,7 +413,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"
@@ -533,7 +530,6 @@ main()
 		touch $IUPMD5
 	fi
 
-
 	local iupurl
 	local configurl
 	local software

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;
 }

libpicoevent/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
+PKG_VERSION:=0.1
 PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aaf2a9ce72fe4cb84af9ce185728d35dde33d54d
+PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
 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'
 

voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE

@@ -1,2 +1,2 @@
-#exec echo 'register => |TRANSPORT|://|USER|@|DOMAIN|:'$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)'|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|'
+#exec echo "register => |TRANSPORT|://|USER|@|DOMAIN|:$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|"
 

voice-client/files/etc/init.d/voice_client

@@ -721,10 +721,6 @@ configure_sip_provider()
 	config_get transport $1 transport
 	config_get encryption $1 encryption
 
-	# This is a hack to fix security issue #14962
-	user=${user//"'"/}
-	authuser=${authuser//"'"/}
-
 	if [ -z "$transport" ] ; then 
 		transport="udp" 
 	fi

wifimngr/Makefile

@@ -1,53 +1,45 @@
 #
-# Copyright (C) 2018 Iopsys
+# Copyright (C) 2015 Inteno
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=2016-03-29
 
+PKG_SOURCE_VERSION:=9dae4438b781b0abb7ca9e16c37c0344b16ccf2a
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=29ac0e0361e20d21559e0f2f585e5220f048b9e0
 PKG_SOURCE_URL:=http://public.inteno.se:/wifimngr
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+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
 
+LDFLAGS+= \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-Wl,-rpath-link=$(STAGING_DIR)/lib
+
 define Package/wifimngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi status and configration utility
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
+	CATEGORY:=Network
+	DEPENDS:=+libpthread +libstdcpp +librt +libjson +alljoyn +alljoyn-about +ubus +libuci
+	TITLE:=WiFi Manager
 endef
 
 define Package/wifimngr/description
- This package can be used to configure and provide status about
- the WiFi modules through UBUS.
- It does this in an implementation agnostic manner through APIs
- exposed by the libwifi library.
+	wifimngr manages wireless driver
 endef
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-#MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)"
-
-#define Build/Compile
-#	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-#endef
-
 define Package/wifimngr/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/sbin/
+endef
+
+define Package/wifimngr/postinst
+	/etc/init.d/alljoyn restart
+	pidof alljoyn-daemon >/dev/null && wifimngr &
 endef
 
 $(eval $(call BuildPackage,wifimngr))