samba: security fixes for refs #17088 refs #17090

This reverts commit a5b1a612c2.

ated/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/ated
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

dectmngr2/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=ace6a3dcb6aa463cf5a34ad39ac37a5bc7d4ce5e
 PKG_NAME:=dectmngr2

endptmngr/Makefile

@@ -18,7 +18,7 @@ PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=endptmngr-open
 else
-PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr

eventlog/Makefile

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eventlog
-PKG_VERSION:=0.2.9
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libeventlog
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A new API to format and send structured log messages.
-endef
-
-define Package/eventlog/description
-  A new API to format and send structured log messages. It supports multiple message
-  representations (plain, XML attributes and XML tags) and multiple output methods
-  (local syslogd).
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libeventlog/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libeventlog))

gigaset-elements/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=gigaset-elements
 PKG_VERSION:=2.4.2
 # PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)

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.0.3
-PKG_RELEASE:=RC5
+BASE_PKG_VERSION:=5.3.6
+PKG_RELEASE:=
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=a7f40bfd47d0ce3f3c002460e3c83ffc821ac1e4
+PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
 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/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-04-20
+PKG_VERSION:=4.0-2018-12-28
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1c6398191a9269c8e885ef78c21b4bd5b618a2fb
+PKG_SOURCE_VERSION:=942ff9d7fc177bcd19f5aeee612f814e8d6632d4
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -37,6 +37,19 @@ define Package/libdatamodel
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
+
+define Package/icwmp_xmpp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+endef
 
 define Package/icwmp/Default
   SECTION:=utils
@@ -170,6 +183,24 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -203,4 +234,6 @@ endef
 
 $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
+$(eval $(call BuildPackage,icwmp_stun))
+$(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp-zstream))

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

@@ -6,7 +6,15 @@
 
 [ -f /etc/config/cwmp ] || exit 0
 
-handle_icwmp_reload() {
+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
+
 	local islan="$(uci -q get network.$INTERFACE.is_lan)"
 	[ "$islan" == "1" ] && exit 0
 
@@ -48,10 +56,32 @@ handle_icwmp_reload() {
 	network_get_dnsserver curdnsservers $INTERFACE
 	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
 
-	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" -a "$prevdnsservers" = "$curdnsservers" ] && exit 0
+	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
+
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
 
 	/etc/init.d/icwmpd reload &
 }
 
-handle_icwmp_reload
-
+handle_icwmp_restart

imonitor/Makefile

@@ -11,7 +11,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

inbd/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f81c146f0b07540877545e5ab644ec8e29905a4d
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/inbd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

iop/configs/config

@@ -3,7 +3,7 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
@@ -32,8 +32,9 @@ 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_icwmp_stun=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_inteno-netmodes=y
+CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
@@ -113,7 +114,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=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -155,6 +156,7 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
@@ -210,6 +212,8 @@ 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_mips/eg200/config

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

iop/configs/target/iopsys_ramips/config

@@ -8,7 +8,7 @@
 # CONFIG_PACKAGE_mtd-utils-nanddump is not set
 CONFIG_PACKAGE_mtd-utils-nandwrite=y
 CONFIG_PACKAGE_mtk-bndstrg=y
-CONFIG_PACKAGE_omcproxy=y
+CONFIG_PACKAGE_igmpproxy=y
 CONFIG_PACKAGE_kmod-nf-nathelper=y
 CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
 # CONFIG_PACKAGE_endptmngr is not set

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }

iop/scripts/feeds_update.sh

@@ -28,15 +28,14 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p feed_inteno_openwrt -a
-		./scripts/feeds install -f -p feed_inteno_lede -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
     ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+
     # install all packages
     ./scripts/feeds install -a 
 

iop/scripts/genconfig.sh

@@ -7,14 +7,14 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop/configs"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	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"
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
 	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400 sdx810_ap"
 	ramips="mt7621"
@@ -299,7 +299,7 @@ function genconfig {
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/feed_inteno_juci/juci/Makefile
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets

iup/files/sbin/iup

@@ -269,19 +269,20 @@ change_to_vlan() {
 	base_dev=$(echo ${base_dev} | cut -d. -f1)
 
 	# add "VLAN interface" to the "end of the file".
-	uci add layer2_interface_vlan vlan_interface
-	uci set layer2_interface_vlan.@vlan_interface[-1].name=${name}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021q=${1}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021p=${2}
-	uci set layer2_interface_vlan.@vlan_interface[-1].ifname="${base_dev}.${1}"
-	uci set layer2_interface_vlan.@vlan_interface[-1].baseifname=${base_dev}
+	uci add network device
+	uci rename network.@device[-1]=${name}
+	uci set network.@device[-1].type=8021q
+	uci set network.@device[-1].ifname=${base_dev}
+	uci set network.@device[-1].name="${base_dev}.${1}"
+	uci set network.@device[-1].vid=${1}
+	uci set network.@device[-1].priority=${2}
 	# and commit the change.
-	uci commit layer2_interface_vlan
-	v "option 132: committed update to file layer2_interface_vlan"
+	uci commit network
+	v "option 132: committed update to file network"
 
 	# reload configuration files.
 	/etc/init.d/layer2_interface_vlan reload
-	v "option 132: reload layer2_interface_vlan config"
+	v "option 132: reload network config"
 
 	# replace old interface (like eth0.1 with new eth0.101).
 	wan_if=$(uci get network.$3.ifname)
@@ -414,6 +415,7 @@ 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"
@@ -567,7 +569,7 @@ main()
 	        if [ "$filesystem" == "JFFS2" ] ; then
 	                firmware=$firmware.w
 		else
-			firmware=$firmware.y
+			firmware=$firmware.y3
 		fi
 		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
 			v "Software \"$software\""

libpicoevent/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.1
-PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
 PKG_NAME:=libpicoevent

loop-detector/Makefile

@@ -5,7 +5,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/loop-detector
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

mtk-bndstrg/Makefile

@@ -1,41 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mtk-bndstrg
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=a67f5ccdf9bc6810f15f1ece9edaad5e89cad0f7
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/mtk-bndstrg
-
-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/mtk-bndstrg
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpthread +librt
-  TITLE:=Band steering daemon for Mediatek
-endef
-
-define Package/mtk-bndstrg/description
- Band steering for Mediatek
-endef
-
-#define Build/Compile
-#endef
-
-define Build/Configure
-  #$(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
-endef
-
-define Package/mtk-bndstrg/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bndstrg $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,mtk-bndstrg))

natalie-dect-h/Makefile

@@ -11,7 +11,7 @@ PKG_NAME:=natalie-dect-h
 PKG_VERSION:=12.26
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-h.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

natalie-dect/Makefile

@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26
+PKG_SOURCE_URL:=git@dev.iopsys.eu:dialog/natalie-dect-12.26
 PKG_SOURCE_PROTO:=git
 endif
 

netmode/Makefile

@@ -1,15 +1,11 @@
-#
-# Copyright (C) 2016 Inteno
-#
-
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=inteno-netmodes
+PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=e43701f76ba2a8699df797d88fffc3895a3bfeb8
+PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -17,20 +13,20 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/inteno-netmodes
+define Package/netmode
 	CATEGORY:=Base system
 	DEPENDS:=+fping +ubus +libubox +libuci
 	TITLE:=Predefined Network Modes
 endef
 
-define Package/inteno-netmodes/description
+define Package/netmode/description
 	Predefined Network Modes
 endef
 
-define Package/inteno-netmodes/install
+define Package/netmode/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
-$(eval $(call BuildPackage,inteno-netmodes))
+$(eval $(call BuildPackage,netmode))

netmode/files/etc/hotplug.d/iface/01-netmode-handler

@@ -38,7 +38,7 @@ case "$curmode" in
 			if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
 				wificontrol_takes_over || switch_netmode repeater
 			else
-				switch_netmode routed
+				/etc/init.d/netmode reload
 			fi
 		;;
 esac

netmode/files/etc/init.d/netmode

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

@@ -17,5 +17,5 @@
 	],
 	"uplink_band" : "b",
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

netmode/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS

@@ -17,5 +17,5 @@
 	],
 	"uplink_band" : "b",
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

netmode/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -13,5 +13,5 @@
 	],
 	"uplink_band" : 'b',
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

netmode/files/etc/netmodes/repeater_mtk_2g_up_dual_down/network

@@ -14,7 +14,7 @@ config interface 'wan'
 	option ifname 'eth0.2 eth0.1'
 	option proto 'dhcp'
 	option hostname 'Inteno-$BSSID4'
-	option reqopts '66 67 128 224'
+	option reqopts '66 67 128 224 225'
 	option igmp_snooping '0'
 
 config device 'wan_dev'

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS

@@ -14,5 +14,5 @@
 	"uplink_band" : 'a',
 	"downlink_band" : 'a b',
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/network

@@ -14,7 +14,7 @@ config interface 'wan'
 	option ifname 'eth0.2 eth0.1'
 	option proto 'dhcp'
 	option hostname 'Inteno-$BSSID4'
-	option reqopts '66 67 128 224'
+	option reqopts '66 67 128 224 225'
 	option igmp_snooping '0'
 
 config device 'wan_dev'

netmode/files/etc/netmodes/routed_mtk/network

@@ -12,6 +12,7 @@ config interface 'lan'
 	option netmask '255.255.255.0'
 	option ip6assign '60'
 	option ifname 'eth0.1'
+	option igmp_snooping '1'
 
 config device 'lan_dev'
 	option name 'eth0.1'

netmode/files/lib/functions/netmode.sh

@@ -91,17 +91,24 @@ correct_uplink() {
 		wetcfg="$(get_wifi_iface_cfgstr $WETIF)"
 		wetnet="$(uci -q get $wetcfg.network)"
 		wetmac="$(ifconfig $WETIF | grep HWaddr | awk '{print$NF}')"
+		ethwanmac="$(ifconfig $WANDEV | grep HWaddr | awk '{print$NF}')"
 		if [ -d /sys/class/net/br-$wetnet ]; then
-			ifconfig br-$wetnet hw ether $wetmac
+			if [ "$link" == "up" ]; then
+				ifconfig br-$wetnet hw ether $ethwanmac
+			else
+				ifconfig br-$wetnet hw ether $wetmac
+			fi
 			#touch -f /tmp/netmodes/uplink-macaddr-corrected
 		fi
 	fi
 
 	if [ "$link" == "up" ]; then
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":true}"
+		ifconfig $WETIF down
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":false}"
 	else
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":false}"
+		ifconfig $WETIF up
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		ubus call led.internet  set '{"state" : "notice"}'
 	fi
@@ -159,13 +166,6 @@ switch_netmode() {
 	rm -f /etc/config/DETAILS
 	sync
 
-	local reboot=$(uci -q get netmode.$curmode.reboot)
-
-	if [ "$reboot" != "0" ]; then
-		reboot &
-		exit
-	fi
-
 	/etc/init.d/environment reload
 	case "$curmode" in
 		repeater*)
@@ -173,6 +173,7 @@ switch_netmode() {
 			echo "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
+			[ -f /etc/init.d/igmpproxy ] && /etc/init.d/igmpproxy stop
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 			ubus call network reload
 			wifi reload nodat
@@ -392,7 +393,7 @@ populate_netmodes() {
 }
 
 start_netmode_tools() {
-	local curmode repeaterready
+	local curmode repeaterready ulcpid
 
 	killall -9 wificontrol >/dev/null 2>&1
 	killall -9 netmode-discover >/dev/null 2>&1
@@ -400,7 +401,11 @@ start_netmode_tools() {
 	config_load netmode
 	config_get_bool repeaterready setup repeaterready 0
 
+	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
+
 	[ $repeaterready -eq 1 ] && {
+		killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+		kill -SIGKILL $ulcpid >/dev/null 2>&1
 		/sbin/netmode-discover &
 		/sbin/wificontrol --repeater &
 		return
@@ -410,14 +415,21 @@ start_netmode_tools() {
 
 	case "$curmode" in
 		repeater*)
+			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+			kill -SIGKILL $ulcpid >/dev/null 2>&1
 			/sbin/netmode-discover &
 			/sbin/wificontrol --repeater &
 		;;
+		*)
+			pidof netmode-client-detect || /sbin/netmode-client-detect &
+		;;
 	esac
 }
 
 stop_netmode_tools() {
 	killall -9 netmode-discover >/dev/null 2>&1
 	killall -9 wificontrol >/dev/null 2>&1
+	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
+	kill -SIGKILL $ulcpid >/dev/null 2>&1
 }
-

netmode/files/sbin/netmode-conf

@@ -8,6 +8,18 @@ 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"
@@ -110,7 +122,7 @@ backup() {
 file="$1"
 from_gui="$2"
 
-[ -f "$file" ] || exit
+[ -f "$file" ] || cleanup
 
 # let netmode-handler up to 20 seconds to finish switching mode
 wait_for_netmode_handler
@@ -161,14 +173,14 @@ done
 
 [ "$apcliband" == "$band" -o "$band" == "" ] || {
 	[ "$from_gui" == "true" ] && restore "back"
-	exit
+	cleanup
 }
 
 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"
-	exit
+	cleanup
 }
 
 json_get_var ssid ssid
@@ -197,7 +209,7 @@ while json_get_var dummy $i; do
 		a_num=$((a_num+1))
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			exit
+			cleanup
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 		get_device "b" device
@@ -205,7 +217,7 @@ while json_get_var dummy $i; do
                 b_num=$((b_num+1))
                 [ -z $iface_num ] && {
                         [ "$from_gui" == "true" ] && restore "back"
-                        exit
+                        cleanup
                 }
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	else
@@ -222,7 +234,7 @@ while json_get_var dummy $i; do
 		esac
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			exit
+			cleanup
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	fi
@@ -269,7 +281,7 @@ if [ "$from_gui" == "true" ]; then
 		ping -w1 $ip
 		if [ $? -eq 0 ]; then
 			restore
-			exit
+			cleanup
 		else
 			i=$((i-10))
 			sleep 9
@@ -278,7 +290,7 @@ if [ "$from_gui" == "true" ]; then
 	restore "back"
 else
 	if [ "$state" == "exit" ]; then
-		return
+		cleanup
 	fi
 	ubus call leds set '{"state":"allflash"}'
 	if [ "$state" == "apply" ]; then
@@ -292,3 +304,5 @@ else
 	correct_uplink
 	ubus call leds set '{"state":"normal"}'
 fi
+
+cleanup

netmode/files/sbin/start-netmode-conf

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

netmode/files/sbin/testnet

@@ -49,8 +49,13 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		ping $ipaddr -I $device -W 3 -c 1 -q >/dev/null 2>&1
+		arping -f -q -c2 -w5 -I $device $ipaddr
 		[ $? -eq 1 ] && rv=0 || rv=1
+
+		if [ "$rv" == "0" ]; then
+			ping -c2 -w5 $ipaddr >/dev/null
+			[ $? -eq 1 ] && rv=0 || rv=1
+		fi
 	else
 		SLEEP_TIME=5
 		ubus call led.internet  set '{"state" : "off"}'
@@ -128,7 +133,8 @@ ping_uplink()
 	else
 		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -t "testnet" "Uplink connection is gained"
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
-		ubus call led.internet  set '{"state" : "eok"}'
+		leden="$(uci -q get leds.internet.enable)"
+		[ "$leden" == "1" ] && ubus call led.internet  set '{"state" : "eok"}'
 
 		SLEEP_TIME=5
 

netmode/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
 	;;

owsd/Makefile

@@ -12,8 +12,8 @@ PKG_VERSION:=1.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
-PKG_SOURCE_VERSION:=fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
+PKG_SOURCE_VERSION:=01a3dfce002514d18b7d3d0cb6b77e9edddc819a
 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>

peripheral_manager/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=fe43108d986a02d3a14f079d58bfa666c1089471
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

questd/Makefile

@@ -8,9 +8,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=d3a77faeadac7c7094fa084524d08e03c296bb56
+PKG_SOURCE_VERSION:=6159b68cc2d3fac70e5eec5555764c81b3b1675a
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/questd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

rulengd/Makefile

@@ -11,7 +11,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/rulengd.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
 PKG_SOURCE_VERSION:=99881f39232154530ac129dc2109d78963017ad1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

samba2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba2
-PKG_VERSION:=2.2.12.inteno
+PKG_VERSION:=2.2.12
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://public.inteno.se:/samba2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/samba2.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

samba3/files/samba.init

@@ -11,6 +11,11 @@ useradd()
 	local password
 	config_get user $1 user
 	config_get password $1 password
+
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$user" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$password" "$filter" 1)" = "" ] || return
+
 	if ! $(grep -rq "^$user:" /etc/passwd) ; then
 		echo "adding user $user"
 		adduser $user -s /bin/false -D -H -h /mnt/$user -g "samba,pass=$password" && smbpasswd $user $password
@@ -51,6 +56,29 @@ purgepasswd()
 	done
 }
 
+hex_filter() {
+	local string=$1
+	local hex_chars=$2
+	local wc_max=$3
+	local wc_tot=0
+
+	if [ -z "$string" -o -z "$hex_chars" -o -z "$wc_max" ]
+		then
+		return;
+	fi
+
+	dump=$(echo "$string" | hexdump -v -e '32/1 "%02X ""\n"')
+
+	IFS=';'
+	for i in $hex_chars; do
+		local wc
+		wc=$(echo "$dump" | grep -o "$i" | wc -w)
+		wc_tot=$((wc_tot+wc))
+	done
+
+	[ $wc_tot -gt $wc_max ] && echo "corrupt"
+}
+
 smb_header() {
 	local interface
 	config_get interface $1 interface
@@ -80,6 +108,13 @@ smb_header() {
 	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 	config_get charset     $1 charset     "UTF-8"
 
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$workgroup" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$description" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$interfaces" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$charset" "$filter" 1)" = "" ] || exit
+
 	mkdir -p /var/etc
 	sed -e "s#|NAME|#$name#g" \
 	    -e "s#|WORKGROUP|#$workgroup#g" \
@@ -138,6 +173,15 @@ smb_add_share() {
 	path=$(readlink -f $path)
 	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"
 
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$users" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$read_only" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$guest_ok" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$create_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$dir_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$browseable" "$filter" 1)" = "" ] || return
+
 	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
 	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
 	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf

tptest/Makefile

@@ -4,9 +4,9 @@ PKG_NAME:=tptest
 PKG_VERSION:=1.3
 PKG_RELEASE:=0
 
-PKG_SOURCE_VERSION:=57786908e7a0c790f303417b459c562887582384
+PKG_SOURCE_VERSION:=10685ce4c31a5b6bf582be19f4333aed273a54bf
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/tptest
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/tptest.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

tptest/files/etc/config/speedtest

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

tr064/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr064
 PKG_VERSION:=1.0
-PKG_SOURCE_URL:=git@public.inteno.se:tr064.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/suite/tr-064.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=e53d492a09c433718a520987c419cb6a4d4ae8dc
 PKG_RELEASE=$(PKG_SOURCE_VERSION)

uboot/Makefile

@@ -9,11 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.08
-PKG_RELEASE:=5
-PKG_SOURCE_URL:=http://public.inteno.se:/uboot
+PKG_RELEASE:=6
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=38f170244c587eb3eec37c4c033bf41c0abb89dc
-
+PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

ubus-mqtt/Makefile

@@ -11,7 +11,7 @@ PKG_NAME:=ubus-mqtt
 PKG_VERSION:=14.20.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://public.inteno.se:/ubus-mqtt
+PKG_SOURCE_URL:=https://dev.iopsys.eu/3rdparty/ubus-mqtt.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

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,6 +721,10 @@ 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

voicesec/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=voicesec
 PKG_VERSION:=1.0
 
-PKG_SOURCE_URL:=git@private.inteno.se:voicesec
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/voicesec.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=661c0091e579e284712aeed892e921cc84a6f0bb
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

wlng/Makefile

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2017 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=wlng
-PKG_VERSION:=1.0.1
-
-PKG_SOURCE_VERSION:=e253b080baac1ab0c81f1aa2c8faada254fbe484
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/wlng
-
-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
-
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-WLNG_TARGET:=IOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-WLNG_TARGET:=IOPSYS_BROADCOM
-KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-WLNG_TARGET:=IOPSYS_BROADCOM
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export WLNG_TARGET
-export KERNEL_DIR
-
-define Package/wlng
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus
-	TITLE:=WiFiLife NextGen (802.11 kvr based client steering)
-endef
-
-define Package/wlng/description
-	wlng provides 802.11 kvr based AP assisted wifi client steering
-	service through UBUS.
-endef
-
-define Package/wlng/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwld $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,wlng))