Event catch for Led blinking

Telia Eesti-Make tone Configurable adding the tonetypes
Telia Eesti-Make tone Configurable
2025-12-24 19:14:05 +08:00 · 2019-10-08 15:21:51 +02:00 · 2019-09-05 09:49:57 +02:00 · 2019-09-05 09:47:50 +02:00 · 2019-08-21 10:08:05 +02:00 · 2019-08-19 10:29:29 +02:00
83 changed files with 1600 additions and 1060 deletions
--- a/ated/Makefile
+++ b/ated/Makefile
@@ -1,16 +1,9 @@
-/* 
- * Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
+#
+# Copyright (C) 2016 inteno
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -27,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 #PKG_BUILD_PARALLEL:=1

--- a/bashdb/Makefile
+++ b/bashdb/Makefile
@@ -13,9 +13,6 @@ PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -1,27 +0,0 @@
-if PACKAGE_libbbfdm
-
-config LIBBBFDM_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
-
-config BBF_TR181
-	bool "Compile with tr181 device features"
-	default y
-
-config BBF_TR104
-	bool "Compile with tr104 voice features"
-	default y
-
-config BBF_TR143
-	bool "Compile with tr143 diagnostics features"
-	default y
-
-config BBF_TR157
-	bool "Compile with tr157 bulkdata collector features"
-	default y
-	
-config BBF_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-10-01
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b3bae9df19df35075ac52f53758288d8e0573790
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-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)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbbfdm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
-endef
-
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
-endef
-
-define Package/libbbfdm/description
- Test description will update later.
-endef
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_BBF_TR181),y)
-CONFIGURE_ARGS += \
-	--enable-tr181
-endif
-
-ifeq ($(CONFIG_BBF_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
-endif
-
-ifeq ($(CONFIG_BBF_TR143),y)
-CONFIGURE_ARGS += \
-	--enable-tr143
-endif
-
-ifeq ($(CONFIG_BBF_TR157),y)
-CONFIGURE_ARGS += \
-	--enable-tr157
-endif
-
-ifeq ($(CONFIG_BBF_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
-define Package/libbbfdm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbfdm))
--- a/bbk_cli/Makefile
+++ b/bbk_cli/Makefile
@@ -1,42 +0,0 @@
-#
-# Copright (C) 2018 The Internet Foundation In Sweden
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bbk_cli
-PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bbk_cli
-	CATEGORY:=Utilities
-	DEPENDS:=+libpthread +libstdcpp
-	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
-endef
-
-define Package/bbk_cli/description
-	To measure connection speed in an environment that is missing a web browser, 
-	for example, in a server, you can use our command line interface bbk_cli, 
-	which is available for some of the most common operating systems.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
-endef
-
-define Package/bbk_cli/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
-endef
-
-$(eval $(call BuildPackage,bbk_cli))
--- a/bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch
+++ b/bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch
@@ -1,25 +0,0 @@
-diff --git a/src/framework/engine.h b/src/framework/engine.h
-index 57a48ad..9e1bc36 100644
--- a/src/framework/engine.h
-+++ b/src/framework/engine.h
-@@ -10,6 +10,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include <sys/select.h>
- 
- #include "logger.h"
- 
-diff --git a/src/framework/mk.inc b/src/framework/mk.inc
-index 793e211..13275be 100644
--- a/src/framework/mk.inc
-+++ b/src/framework/mk.inc
-@@ -7,7 +7,7 @@ OS:=$(shell uname)
- CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
- 
- ifeq ($(OS),Linux)
-CXX = g++
-+CXX = $(CROSS_COMPILE)g++
- endif
- 
- ifeq ($(OS),Darwin)
--- a/bootchart2/Makefile
+++ b/bootchart2/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/bootchart2
--- a/catv/Makefile
+++ b/catv/Makefile
@@ -1,19 +1,9 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/catv
--- a/crashlog/Makefile
+++ b/crashlog/Makefile
@@ -1,18 +1,9 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none

 include $(INCLUDE_DIR)/package.mk

--- a/dectmngr2/Makefile
+++ b/dectmngr2/Makefile
@@ -1,20 +1,19 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2006-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_RELEASE:=1
 PKG_VERSION:=1.3.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
+PKG_SOURCE_VERSION:=5a5c94b289c79bc3a635b8d742dd9b73dcc0615f
 PKG_NAME:=dectmngr2

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE

 RSTRIP:=true
 export BUILD_DIR
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-

 include $(INCLUDE_DIR)/package.mk

--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -1,29 +1,19 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-qos
-PKG_VERSION:=1.1
+PKG_VERSION:=1.0
 PKG_RELEASE:=0

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/easy-qos
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
 endef

 define Package/easy-qos/description
-	This package contains Easy QoS utility
+	This package contains Easy QoS utitie
 endef

 define Build/Prepare
@@ -39,11 +29,7 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
-else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef
--- a/easy-qos/files/etc/init.d/easy_qos.classcfg
+++ b/easy-qos/files/etc/init.d/easy_qos.classcfg
@@ -1,165 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-RULE_LIST="/tmp/easy_qos_rule.list"
-BRIDGE_INTF=""
-
-[ -f /etc/profile.d/intel.sh ] && {
-	. /etc/profile.d/intel.sh
-	sh /etc/profile.d/intel.sh
-}
-
-log() {
-	echo "${@}"|logger -t easy_qos_class -p debug
-}
-
-exec_log() {
-	${@} |grep -i successful
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-		return 1
-	fi
-	return 0
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 8;;
-		"low")
-			echo 7;;
-		"besteffort")
-			echo 6;;
-		"normal")
-			echo 5;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 3;;
-		"high")
-			echo 2;;
-		"highest")
-			echo 1;;
-	esac
-}
-
-is_lan_bridge() {
-	local _section=$1
-	local _type
-	local _is_lan
-
-	config_get _type "$section" "type"
-	config_get _is_lan "$section" "is_lan"
-
-	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
-		BRIDGE_INTF="br-${_section}"
-	fi
-}
-
-get_bridge_interface() {
-	config_load network
-	config_foreach is_lan_bridge interface
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string:none' \
-		'macaddr:string:none' \
-		'proto:string:none' \
-		'port:list(uinteger):none' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	# execute the delete rules written onto a file then delete the file
-	[ -f ${RULE_LIST} ] || return 0
-
-	while read line
-	do
-		log "Deleting old classification rules"
-		exec_log classcfg -D ${line} -i ${BRIDGE_INTF}
-	done <${RULE_LIST}
-	sync
-
-	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
-}
-
-# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
-create_rule() {
-	local proto=$1; shift
-	local mac_addr=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-	# Rule name is uniqe, so we take hash of all the input as rule_name
-	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
-
-	cmd="-j mark --mark ${mark}";
-
-	if [ "${mac_addr}" != "none" ]; then
-		cmd="--smac ${mac_addr} ${cmd}";
-	fi
-	if [ "${ports}" != "none" ]; then
-		IFS=","
-		for port in ${ports};
-		do
-			cmd="--dport ${port}:${port} ${cmd}";
-		done
-		IFS=' '
-	fi
-	if [ "${proto}" != "none" ]; then
-		cmd="-p ${proto} $cmd"
-	fi
-	cmd="-i ${BRIDGE_INTF} $cmd"
-	cmd="-A ${rule_name} $cmd"
-
-	# Store the rule_names for cleanup on reload
-	exec_log classcfg ${cmd} 
-	[ $? -eq 0 ] && \
-		echo ${rule_name}  >> ${RULE_LIST}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${macaddr} ${prio_num} ${port_list}
-			create_rule udp ${macaddr} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	get_bridge_interface
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
-	reload_service
-	log "Easy QoS class installed"
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos" "network"
-}
-
--- a/easy-qos/files/etc/init.d/easy_qos.ebtables
+++ b/easy-qos/files/etc/init.d/easy_qos.ebtables
@@ -102,7 +102,7 @@ manage_rule() {
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; then
 				create_rule tcp ${macaddr} ${prio_num} ${p}
 				create_rule udp ${macaddr} ${prio_num} ${p}
 			else
@@ -111,7 +111,7 @@ manage_rule() {
 		done
 		# Create rule for all ports if port is not mentioned in uci
 		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else
--- a/easy-qos/files/etc/init.d/easy_qos.iptables
+++ b/easy-qos/files/etc/init.d/easy_qos.iptables
@@ -158,7 +158,7 @@ manage_rule() {
 	port_list=$(echo ${port}|sed 's/ /,/g')

 	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+		if [ "${proto}" == "none" ]; then
 			create_rule tcp ${ip} ${prio_num} ${port_list}
 			create_rule udp ${ip} ${prio_num} ${port_list}
 		else
--- a/easy-soc-libs.deprecated/Config.in
+++ b/easy-soc-libs.deprecated/Config.in
@@ -1,10 +0,0 @@
-if (PACKAGE_libwifix)
-menu "configurations"
-
-config LIBWIFIX_DEBUG
-	depends on PACKAGE_libwifix
-	bool "Enable wifi debugging"
-	default n
-
-endmenu
-endif
--- a/easy-soc-libs.deprecated/Makefile
+++ b/easy-soc-libs.deprecated/Makefile
@@ -1,108 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-soc-libs.deprecated
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b88afddd2f4cb216bfcd190f9096c138299c28e2
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-soc-libs.deprecated
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=IOPSYS easy SoC libraries (deprecated)
-  SUBMENU:=IOPSYS easy SoC libraries (deprecated)
-  DEPENDS:=+libopenssl
-  MENU:=1
-endef
-
-define Package/libwifix/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libwifix
-  $(call Package/easy-soc-libs.deprecated)
-  TITLE:= WiFi library for wifix (deprecated)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-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_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-ifdef CONFIG_LIBWIFIX_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libwifix),libwifix)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	subdirs="$(subdirs)"
-
-define Build/InstallDev/libwifix
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifix/wifi.h $(1)/usr/include/wifix.h
-	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default)
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-endef
-
-define Package/libwifix/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwifix))
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -1,29 +1,24 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2018 Iopsys
 #
-# This is free software, licensed under the GNU General Public License v2.
-# 

 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=2.4.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30f5527ae724d54537c803127e11992d1a5ae154
+PKG_SOURCE_VERSION:=4c204761a38a27ff9ff7021c3c34b92d7e3fdb84
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 define Package/easy-soc-libs
@@ -42,7 +37,7 @@ endef
 define Package/libwifi
  $(call Package/easy-soc-libs)
  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route
+  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
 endef

 define Package/libethernet
@@ -82,7 +77,7 @@ endif
 define Package/libdsl
  $(call Package/easy-soc-libs)
  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
 endef

 subdirs := \
@@ -112,7 +107,7 @@ define Build/InstallDev/libwifi
 	$(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/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef

 define Build/InstallDev/libdsl
@@ -142,7 +137,7 @@ endef

 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef

 define Package/libethernet/install
--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -1,9 +1,10 @@
 #
-# Copyright (C) 2018 IOPSYS Software Solutions AB
+# Copyright (C) 2006-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_RELEASE:=1
@@ -14,17 +15,13 @@ PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
 ifeq ($(CONFIG_ENDPT_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=endptmngr-open
 else
 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
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 endif

 RSTRIP:=true
--- a/fatrace/Makefile
+++ b/fatrace/Makefile
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v3.
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 #PKG_BUILD_PARALLEL:=1

--- a/gigaset-elements/.gitignore
+++ b/gigaset-elements/.gitignore
@@ -0,0 +1,3 @@
+
+git-src
+
--- a/gigaset-elements/Makefile
+++ b/gigaset-elements/Makefile
@@ -0,0 +1,65 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gigaset-elements
+
+PKG_VERSION:=2.4.2
+# PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+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)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
+
+
+PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+######################################################
+
+define Package/gigaset-elements
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson-c +libcurl +libpthread
+  TITLE:=Gigaset elements
+endef
+
+######################################################
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+endef
+
+
+
+define Package/gigaset-elements/install
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
+endef
+
+
+
+define Package/gigaset-elements/preinst
+#!/bin/sh
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
+endef
+
+
+define Package/gigaset-elements/postrm
+#!/bin/sh
+rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
+rm -rf /usr/share/gigaset
+endef
+
+
+######################################################
+
+$(eval $(call BuildPackage,gigaset-elements))
+
--- a/gryphon-led-module/Makefile
+++ b/gryphon-led-module/Makefile
@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=GPLv2
+  PKG_LICENSE:=Genexis
  PKG_LICENSE_URL:=
 endef

--- a/ice-client/Config.in
+++ b/ice-client/Config.in
@@ -0,0 +1,4 @@
+
+config ICE_OPEN
+       bool "Use pre-compiled version for Open SDK"
+       default n
--- a/ice-client/Makefile
+++ b/ice-client/Makefile
--- a/ice-client/files/ice-client.uci_default
+++ b/ice-client/files/ice-client.uci_default
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+grep -rq "^ice:" /etc/passwd || {
+	adduser -D -H -s /bin/false ice
+}
+
+uci -q delete passwords.ice
+uci -q set passwords.ice=usertype
+uci -q set passwords.ice.password="\$WPAKEY"
+uci -q del_list passwords.ice._access_w=root
+uci -q add_list passwords.ice._access_w=root
+uci -q del_list passwords.ice._access_r=root
+uci -q add_list passwords.ice._access_r=root
+uci -q commit passwords
+
+uci show rpcd | grep username=.*ice.* >/dev/null || {
+cat >> /etc/config/rpcd << EOF
+
+config login
+	option username 'ice'
+	option password '\$p\$ice'
+	list _access_w 'none'
+	list write 'user-user'
+	list write 'juci-broadcom-dsl'
+	list write 'juci-broadcom-dsl-admin'
+	list write 'juci-broadcom-ethernet'
+	list write 'juci-broadcom-iptv'
+	list write 'juci-broadcom-vlan'
+	list write 'juci-broadcom-vlan-admin'
+	list write 'juci-wireless'
+	list write 'juci-wireless-admin'
+	list write 'juci-catv'
+	list write 'juci-ddns'
+	list write 'juci-diagnostics'
+	list write 'juci-dnsmasq-dhcp'
+	list write 'juci-dropbear'
+	list write 'juci-ethernet'
+	list write 'juci-event'
+	list write 'juci-firewall-fw3'
+	list write 'juci-iconnect'
+	list write 'juci-igmpinfo'
+	list write 'juci-inteno-backup'
+	list write 'juci-inteno-multiwan'
+	list write 'juci-inteno-provisioning'
+	list write 'juci-inteno-qos'
+	list write 'juci-inteno-voice-client'
+	list write 'juci-minidlna'
+	list write 'juci-mod-status'
+	list write 'juci-mod-system'
+	list write 'juci-natalie-dect'
+	list write 'juci-netmode'
+	list write 'juci-network-netifd'
+	list write 'juci-owsd'
+	list write 'juci-printer'
+	list write 'juci-realtime-graphs'
+	list write 'juci-samba'
+	list write 'juci-sfp'
+	list write 'juci-snmpd'
+	list write 'juci-sysupgrade'
+	list write 'juci-uhttpd'
+	list write 'juci-upnp'
+	list write 'juci-usb'
+	list write 'core'
+	list write 'unauthenticated'
+
+EOF
+}
+
+uci -q del_list dhcp.@domain[0].name="inteno.lan"
+uci -q add_list dhcp.@domain[0].name="inteno.lan"
+uci -q commit dhcp
+
+exit 0
+
--- a/icgroupd/Makefile
+++ b/icgroupd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2016 Inteno Broadband AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -19,9 +19,17 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y

+config XMPP_ENABLE
+	bool "enable xmpp feature"
+	default n
+
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
+
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
    
 endif

--- a/icwmp/Config_datamodel.in
+++ b/icwmp/Config_datamodel.in
@@ -0,0 +1,7 @@
+if PACKAGE_libdatamodel
+
+config UPNP_TR064
+	bool "Compile with tr064 features"
+	default n
+
+endif
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-10-01
+PKG_VERSION:=4.0-2019-08-17
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
+PKG_SOURCE_VERSION:=17b9e07a38753eab3964dffd0b0cc7da3118840a
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING

 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -32,6 +30,13 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)

 include $(INCLUDE_DIR)/package.mk

+define Package/libdatamodel
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+endef
+
 define Package/icwmp_stun
 	SECTION:=utils
 	CATEGORY:=Utilities
@@ -60,18 +65,11 @@ define Package/icwmp_udpechoserver
 	DEPENDS:=+libuci
 endef

-define Package/icwmp_bulkdata
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=TR-069 BulkData Collection
- DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
-endef
-
 define Package/icwmp/Default
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +(PACKAGE_libtr098):libtr098
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
 endef

 define Package/icwmp/description
@@ -96,6 +94,10 @@ define Package/icwmp-zstream/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef

+define Package/libdatamodel/config
+	source "$(SOURCE)/Config_datamodel.in"
+endef
+
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -107,6 +109,8 @@ 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

@@ -127,6 +131,16 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 	
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-upnptr064
+endif
+	
+ifeq ($(CONFIG_XMPP_ENABLE),y)
+CONFIGURE_ARGS += \
+	--enable-xmpp
+endif
+	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -158,23 +172,18 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif

-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-CONFIGURE_ARGS += \
-	--enable-tr098
-endif
-
-CONFIGURE_ARGS += \
-	--enable-tr181
+define Package/libdatamodel/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
+endef

 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
-endif
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -227,15 +236,17 @@ define Package/icwmp_twamp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
 endef

-define Package/icwmp_bulkdata/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
+	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
+	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
 endef

+
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -255,10 +266,11 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef

+
 $(eval $(call BuildPackage,icwmp-curl))
+$(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
-$(eval $(call BuildPackage,icwmp_bulkdata))
 $(eval $(call BuildPackage,icwmp-zstream))
--- a/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
+++ b/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
@@ -41,14 +41,4 @@ set_cwmp_reqopts() {
 	fi
 }

-regenerate_ssl_link(){
-	local cert_dir="/etc/ssl/certs"
-	local all_file=$(ls $cert_dir/*.pem)
-	for cfile in $all_file
-	do
-		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
-	done
-}
-
 set_cwmp_reqopts
-regenerate_ssl_link
--- a/ifbt/Makefile
+++ b/ifbt/Makefile
@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=ifbt
-PKG_VERSION:=0.2
+PKG_VERSION:=0.1

-PKG_SOURCE_VERSION:=f6edff47b6c0a154ab892301acf767d19ac8ad73
+PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git

@@ -16,9 +16,6 @@ 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)

-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=README
-
 include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
--- a/ifsi/Makefile
+++ b/ifsi/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2015 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ifsi
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+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/ifsi
+  CATEGORY:=Utilities
+  DEPENDS:=+ubus +libubox
+  TITLE:=Inteno Functional Script Interface
+endef
+
+define Package/ifsi/description
+	Inteno Functional Script Interface
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/ifsi/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifsi $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ifsi))
--- a/ifsi/src/Makefile
+++ b/ifsi/src/Makefile
@@ -0,0 +1,17 @@
+CC		= gcc
+CFLAGS		= -g -Wall
+LOCLIBS		= 
+LIBS		= -lubus -lubox -lblobmsg_json
+OBJS		= ifsi.o
+SRCS		= ifsi.c
+LIBSRCS		= 
+ISRCS		= 
+
+all: ifsi
+
+ifsi: ${OBJS}
+	${CC} ${LDFLAGS} ${LIBSRCS} -o ifsi ${OBJS} ${LIBS}
+
+clean:
+	rm -f ifsi *.o
+
--- a/ifsi/src/ifsi.c
+++ b/ifsi/src/ifsi.c
@@ -0,0 +1,74 @@
+/*
+ * ifsi -- Inteno functional script interface
+ *
+ * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
+ *
+ * Author: dev@inteno.se
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <unistd.h>
+
+#include <libubox/blobmsg.h>
+#include <libubox/blobmsg_json.h>
+#include <libubox/uloop.h>
+
+#include <libubus.h>
+
+static struct ubus_context *ctx;
+static struct ubus_event_handler event_listener;
+static struct blob_buf b;
+
+
+static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
+			  const char *type, struct blob_attr *msg)
+{
+	char *str;
+	uint32_t id;
+
+	str = blobmsg_format_json(msg, true);
+	fprintf(stdout, "I got %s event %s\n", type, str);
+	free(str);
+}
+
+int main(int argc, char **argv)
+{
+	const char *ubus_socket = NULL;
+	int ret;
+
+	uloop_init();
+
+	ctx = ubus_connect(ubus_socket);
+	if (!ctx) {
+		fprintf(stderr, "Failed to connect to ubus\n");
+		return 1;
+	}
+
+	ubus_add_uloop(ctx);
+
+	event_listener.cb = receive_event;
+	ret = ubus_register_event_handler(ctx, &event_listener, "*");
+	if (ret)
+		fprintf(stderr, "Couldn't register to router events\n");
+
+	uloop_run();
+
+	ubus_free(ctx);
+	uloop_done();
+
+	return 0;
+}
+
--- a/imonitor/Makefile
+++ b/imonitor/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
+PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/inotify-tools/Makefile
+++ b/inotify-tools/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/iop/Makefile
+++ b/iop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
-PKG_LICENSE:=GPLv2

 include $(INCLUDE_DIR)/package.mk

--- a/iop/config
+++ b/iop/config
@@ -14,7 +14,6 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_easy-qos=y
 CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
@@ -37,7 +36,6 @@ CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
-CONFIG_PACKAGE_juci-easyqos=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
 CONFIG_PACKAGE_juci-icwmp=y
@@ -80,7 +78,6 @@ CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
@@ -117,14 +114,11 @@ CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
-CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
-CONFIG_PACKAGE_libwifix=y
-CONFIG_PACKAGE_wifixd=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -139,6 +139,7 @@ function genconfig {
 		DEVELOPER=1

 		bcmAllowed=0
+		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
@@ -149,6 +150,7 @@ function genconfig {
 		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
+		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}

 	v() {
@@ -354,6 +356,7 @@ function genconfig {
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
+			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
@@ -361,6 +364,7 @@ function genconfig {
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
+			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
--- a/iop/scripts/generate_tarballs.sh
+++ b/iop/scripts/generate_tarballs.sh
@@ -59,6 +59,23 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }

+build_ice_consumer() {
+	# create ice-client open version tar file
+	local iceversion icebasever icerelease icecommith
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	iceversion=$icebasever$icerelease
+	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
+	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
+	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
+	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	cd "$curdir"
+}
+
 build_wifilife_consumer() {
 	local ver commit
 	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
@@ -112,8 +129,8 @@ function print_usage {

 function generate_tarballs {

-    SERVER="god@download.iopsys.eu"
-    FPATH="/var/www/html/iopsys/opensdk"
+    SERVER="god@software.inteno.se"
+    FPATH="/var/www/html/iopsys/consumer"

    set -e
    git remote -v | grep -q http && return # do not continue if this is an open SDK environment
@@ -152,9 +169,11 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
+		build_ice_consumer
 		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
+		build_ice_consumer		
 		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
--- a/iopupgrade/Makefile
+++ b/iopupgrade/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/iopupgrade/files/sbin/iopu
+++ b/iopupgrade/files/sbin/iopu
@@ -164,7 +164,7 @@ trap finish EXIT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE

-while getopts "nrxbh" opt; do
+while getopts "nrxb" opt; do
    case $opt in
 	n)
 	    upd_noreboot=1
@@ -184,7 +184,7 @@ while getopts "nrxbh" opt; do
 	    exit 0
 	    ;;
 	h)
-	    usage
+	    upd_usage
 	    exit 1
 	    ;;
    esac
--- a/iwatchdog/Makefile
+++ b/iwatchdog/Makefile
@@ -1,9 +1,6 @@
-# Copyright (C) 2019 iopsys
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2013 Inteno
 #
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

@@ -11,9 +8,6 @@ PKG_NAME:=iwatchdog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

@@ -28,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/iwatchdog
  CATEGORY:=Utilities
-  TITLE:=IOPSYS watchdog
+  TITLE:=Inteno watchdog
 endef

 define Package/iwatchdog/description
--- a/json-editor/Makefile
+++ b/json-editor/Makefile
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2008-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:=json-editor
-PKG_RELEASE:=1.0.0
-
-PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/json-editor
-  SECTION:=base
-  CATEGORY:=Libraries
-  DEPENDS:=+libjson-c +libblobmsg_json
-  TITLE:=JSON-editor
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,json-editor))
--- a/libjwt/Makefile
+++ b/libjwt/Makefile
@@ -17,8 +17,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_FIXUP:=autoreconf

-PKG_LICENSE:=LGPLv3
-PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk

 define Package/libjwt
--- a/libtrace/Makefile
+++ b/libtrace/Makefile
@@ -12,9 +12,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf

--- a/lmbench/Makefile
+++ b/lmbench/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/lmbench/
 PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_DEPENDS:=librpc

 include $(INCLUDE_DIR)/package.mk
--- a/logrotate/Makefile
+++ b/logrotate/Makefile
@@ -19,9 +19,6 @@ PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk

 define Package/logrotate
--- a/loop-detector/Makefile
+++ b/loop-detector/Makefile
@@ -1,9 +1,3 @@
-# Copyright (C) 2019 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=loop-detector
@@ -17,9 +11,6 @@ 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)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk


--- a/ltq-nand/Makefile
+++ b/ltq-nand/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
 #PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
 #PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/host-build.mk


--- a/multiwan/Makefile
+++ b/multiwan/Makefile
@@ -11,8 +11,6 @@ PKG_NAME:=multiwan
 PKG_VERSION:=1.0.22
 PKG_RELEASE:=2

-PKG_LICENSE:=GPLv2
-
 include $(INCLUDE_DIR)/package.mk

 define Package/multiwan
--- a/natalie-dect-h/Makefile
+++ b/natalie-dect-h/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=PROPRIETARY
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/kernel.mk
--- a/natalie-dect/Makefile
+++ b/natalie-dect/Makefile
@@ -1,5 +1,8 @@
 #
-# Copyright (C) 2019 IOPSYS Software Solutions AB
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #

 include $(TOPDIR)/rules.mk
@@ -11,7 +14,7 @@ PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+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
@@ -22,8 +25,6 @@ endif
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1

-PKG_LICENSE:=PROPRIETARY
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/kernel.mk
--- a/ndisc/Makefile
+++ b/ndisc/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
 PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
--- a/ndt/Makefile
+++ b/ndt/Makefile
@@ -12,9 +12,6 @@ PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
 PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt

-PKG_LICENSE:=NONSTANDARD
-PKG_LICENSE_FILES:=COPYRIGHT
-
 include $(INCLUDE_DIR)/package.mk

 define Package/ndt
--- a/netmode/Makefile
+++ b/netmode/Makefile
@@ -1,10 +1,3 @@
-#
-# Copyright (C) 2019 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netmode
@@ -18,9 +11,6 @@ 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)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 define Package/netmode
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=obuspa
 PKG_VERSION:=1.0.0

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e2816ff39f654a191afd49c90a05f70e99259d8e
+PKG_SOURCE_VERSION:=014d7ec63331b3b745e8af53a4be1b52693e2a6f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

@@ -16,10 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_FIXUP:=autoreconf

-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-
 include $(INCLUDE_DIR)/package.mk

 define Package/obuspa
@@ -49,7 +45,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(CP) ./files/* $(1)/
 endef
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -11,5 +11,4 @@ config connection
 	option username 'username'
 	option password 'password'
 	option encryption 'false'
-	option interface 'wan'

--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -4,7 +4,6 @@ START=99
 USE_PROCD=1

 PROG=/usr/sbin/obuspa
-l3device=""

 CTRL_PATH="Device.LocalAgent.Controller.1."
 MTP_PATH="Device.LocalAgent.MTP.1."
@@ -39,8 +38,7 @@ validate_connection_section()
 		'host:string:"usp-controller.com"' \
 		'username:string:username' \
 		'password:string:password' \
-		'encryption:bool:true' \
-		'interface:string:wan'
+		'encryption:bool:true'
 }

 configure_controller() {
@@ -66,22 +64,12 @@ configure_mtp() {
 }

 configure_connection() {
-	local host username password encryption interface
+	local host username password encryption

 	validate_connection_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-
-	# Get wan L3 interface
-	json_load "$(ubus call network.interface.${interface} status)"
-	json_get_var l3device l3_device
-	echo "l3device ${l3device}">/dev/console
-	export USP_BOARD_IFNAME=${l3device}
-
-	# Set this variable for root user
-	echo "export USP_BOARD_IFNAME=${l3device}">/root/.profile
-
 	db_set "${CONN_PATH}Host" ${host}
 	db_set "${CONN_PATH}Username" ${username}
 	db_set "${CONN_PATH}Password" ${password}
@@ -92,18 +80,14 @@ db_init() {
 	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db

 	config_load obuspa
-	config_foreach configure_connection connection
 	config_foreach configure_controller controller
 	config_foreach configure_mtp mtp
+	config_foreach configure_connection connection
 }
 start_service() {
 	db_init
+
 	procd_open_instance
-	procd_set_param env USP_BOARD_IFNAME=${l3device}
-	# Forward stdout of the command to logd
-	# procd_set_param stdout 1
-	# Same for stderr
-	# procd_set_param stderr 1
 	procd_set_param command ${PROG}
 	procd_append_param command -p -v 4
 	procd_set_param respawn
@@ -118,3 +102,4 @@ reload_service() {
 service_triggers() {
 	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
 }
+
--- a/owsd/Makefile
+++ b/owsd/Makefile
@@ -10,16 +10,13 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=8a2b9ba61be4f13111b32dbef9e97eb40aea5866
+PKG_SOURCE_VERSION:=f1d6bff1971640006b3137b342fafa1c40cfb835
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS CONFIG_OWSD_UPROXYD

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 USE_UBUS-y:=-DWSD_HAVE_UBUS=ON
 USE_DBUS-y:=-DWSD_HAVE_DBUS=ON
 USE_BOTH-y:=${USE_UBUS-y} ${USE_DBUS-y}
--- a/owsd/files/owsd.init
+++ b/owsd/files/owsd.init
@@ -66,8 +66,6 @@ rpcd_acl() {
 }

 handle_owsd_acl() {
-	[ -d /tmp/owsd ] || mkdir /tmp/owsd
-
 	config_load rpcd
 	config_foreach append_users "login"

@@ -79,9 +77,9 @@ handle_owsd_acl() {
 		config_foreach owsd_acl "owsd-listen" "$USR"
 		json_close_array
 	done
-	json_dump > /tmp/owsd/owsd_acl
+	json_dump > /tmp/owsd_acl

-	json_load "$(cat /tmp/owsd/owsd_acl)"
+	json_load "$(cat /tmp/owsd_acl)"
 	config_load rpcd
 	config_foreach rpcd_acl "login"
 	uci commit rpcd
@@ -128,8 +126,8 @@ validate_owsd_global() {

 }

-append_str() {
-	json_add_string "" "$1"
+append_origin() {
+	procd_append_param command -o"$1"
 }

 append_origin_parts() {
@@ -139,9 +137,9 @@ append_origin_parts() {
 	port="$3"

 	if [ "${proto}" = "https" -a "${port}" -eq 443 -o "${proto}" = "http" -a "${port}" -eq 80 ]; then
-		append_str "${proto}://${host}"
+		append_origin "${proto}://${host}"
 	else
-		append_str "${proto}://${host}:${port}"
+		append_origin "${proto}://${host}:${port}"
 	fi
 }

@@ -152,7 +150,6 @@ validate_owsd_iface() {
 		'origin:list(string)' \
 		'whitelist_interface_as_origin:bool:0' \
 		'whitelist_dhcp_domains:bool:0' \
-		'whitelist_all_origins:bool:0' \
 		'ipv6:bool:1' \
 		'ipv6only:bool:0' \
 		'linklocal:bool:0' \
@@ -166,7 +163,7 @@ validate_owsd_iface() {
 }

 parse_owsd_iface() {
-	local port interface whitelist_interface_as_origin whitelist_dhcp_domains whitelist_all_origins ipv6 ipv6only linklocal
+	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
 	local ubusx_acl
@@ -178,37 +175,24 @@ parse_owsd_iface() {

 	# utility function
 	new_listen_socket() {
-		json_add_int "port" ${port}
+		procd_append_param command -p "${port}"

-		[ -n "${cert}"      ] && json_add_string "cert" "${cert}"
-		[ -n "${key}"       ] && json_add_string "key" "${key}"
-		[ -n "${ca}"        ] && json_add_string "ca" "${ca}"
+		procd_append_param command -L"$1"

-		[ -n "${restrict_to_user}" ] && {
-			json_add_array "restrict_to_user"
-			config_list_foreach "$1" "restrict_to_user" append_str
-			json_close_array
-		}
-		[ -n "$2" ] && json_add_string "interface" "$2"
+		[ -n "${cert}"      ] && procd_append_param command -c"${cert}"
+		[ -n "${key}"       ] && procd_append_param command -k"${key}"
+		[ -n "${ca}"        ] && procd_append_param command -a"${ca}"

-		[ -n "${ubusx_acl}" ] && json_add_string "ubusx_acl" "$ubusx_acl"
+		[ -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}"

 	}

-	origin_whitelist_all() {
-		[ "$1" = "*" ] && echo "true"
-	}
-
-	append_whitelists() {
-		config_list_foreach "$1" "origin" append_str
-
-		# uncomment code below when implementing one vhost per origin fix
-		#[ -n "$2" ] && whitelist_all_origins=1
-
-		#if [ "$whitelist_all_origins" -eq 1 ]; then
-		#	whitelist_dhcp_domains=1
-		#	whitelist_interface_as_origin=1
-		#fi
+	append_whitelists () {
+		config_list_foreach "$1" "origin" append_origin

 		if [ "$whitelist_dhcp_domains" -eq 1 ]; then
 			for domain in $DHCP_DOMAINS; do
@@ -228,22 +212,13 @@ parse_owsd_iface() {
 	if [ -n "${interface}" ]; then
 		# 1 listen-socket (vhost) for each IP address on that network's iface

-		whitelist=$(config_list_foreach "$1" "origin" origin_whitelist_all)
-
 		# ipv4 addresses
 		if [ "${ipv6only}" -eq 0 ]; then
 			network_get_ipaddrs ip4addrs "${interface}";
 		fi
-
-		json_add_array "$1"
 		for addr in ${ip4addrs}; do
-			json_add_object "${1}"
 			new_listen_socket "$1" "${addr}"
-			[ -n "$whitelist" -o "$whitelist_all_origins" -eq 1 ] && json_add_boolean "origin_check" false
-			json_add_array "origin"
-			append_whitelists "$1" "$whitelist"
-			json_close_array
-			json_close_object
+			append_whitelists "$1"
 		done

 		# ipv6 addresses
@@ -255,24 +230,16 @@ parse_owsd_iface() {
 				ip6addrs="${ip6addrs} ${linklocaladdrs}"
 			fi
 		fi
-
 		for addr in ${ip6addrs}; do
-			json_add_object "${1}6"
 			new_listen_socket "$1" "${addr}"
 			addr="\\[${addr}]"
-			[ -n "$whitelist" ] && json_add_boolean "origin_check" false
-			json_add_array "origin"
-			append_whitelists "$1" "$whitelist"
-			json_close_array
-			json_add_boolean "ipv6" 1
-			json_close_object
+			append_whitelists "$1"
+			procd_append_param command -66
 		done
-		json_close_array
-
 	else
 		new_listen_socket "$1"
-		if [ "${ipv6}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
-		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
+		if [ "${ipv6}" -eq 1 ]; then procd_append_param command -6; fi
+		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then procd_append_param command -6; fi

 		append_whitelists "$1"
 	fi
@@ -296,49 +263,41 @@ start_service() {
 		echo "Global validation failed"
 		return 1
 	}
-	json_init
-	json_add_object "global"
-	[ -n "${sock}"       ] && json_add_string "socket" "$sock"
-	[ -n "${www}"        ] && json_add_string "www" "$www"
-	[ -n "${redirect}"   ] && json_add_string "redirect" "$redirect"
-	[ -n "${www_maxage}" ] && json_add_int "www_maxage" "$www_maxage"
-	json_close_object
+
+	[ -n "${sock}"      ] && procd_append_param command -s"${sock}"
+	[ -n "${www}"       ] && procd_append_param command -w"${www}"
+	[ -n "${redirect}"  ] && procd_append_param command -r"${redirect}"
+	[ -n "${www_maxage}" ] && procd_append_param command -t"${www_maxage}"
+
+	#validate_owsd_ubusproxy || {
+	#	echo "Ubusproxy validation failed"
+	#	return 1
+	#}

 	validate_owsd_ubusproxy && {
 		if [ "${enable}" -eq 1 ]; then
-			json_add_object "ubusproxy"
+			procd_append_param command -U

-			[ -n "${peer_cert}" ] && json_add_string "peer_cert" "${peer_cert}"
-			[ -n "${peer_key}"  ] && json_add_string "peer_key" "${peer_key}"
-			[ -n "${peer_ca}"   ] && json_add_string "peer_ca" "${peer_ca}"
+			[ -n "${peer_cert}" ] && procd_append_param command -C"${peer_cert}"
+			[ -n "${peer_key}"  ] && procd_append_param command -K"${peer_key}"
+			[ -n "${peer_ca}"   ] && procd_append_param command -A"${peer_ca}"

 			append_peer () {
-				[ -n "$1"   ] && json_add_string "peer" "$1"
+				[ -n "$1"   ] && procd_append_param command -P"$1"
 			}

 			append_object () {
-				[ -n "$1"   ] && json_add_string "object" "$1"
+				[ -n "$1"   ] && procd_append_param command -U"$1"
 			}

-			json_add_array "peer"
 			config_list_foreach "ubusproxy" "peer" append_peer
-			json_close_array
-			json_add_array "object"
 			config_list_foreach "ubusproxy" "object" append_object
-			json_close_array

-			[ "${prefix}" == "mac" ] && json_add_string "prefix" "mac"
-			json_close_object
+			[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
 		fi
 	}

-	json_add_object "owsd-listen"
 	config_foreach parse_owsd_iface "owsd-listen"
-	json_close_object
-
-	[ ! -d "/tmp/owsd" ] && mkdir /tmp/owsd
-	json_dump > /tmp/owsd/owsd_cfg.json
-	procd_append_param command -f "/tmp/owsd/owsd_cfg.json"

 #	procd_set_param stderr 1
 	procd_set_param respawn
--- a/paho-mqtt-c/Makefile
+++ b/paho-mqtt-c/Makefile
@@ -16,10 +16,6 @@ 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)

-PKG_LICENSE:=edl-v10
-PKG_LICENSE_FILES:=LICENSE
-
-
 include $(INCLUDE_DIR)/package.mk

 define Package/lib-paho-mqtt
--- a/peripheral_manager/Makefile
+++ b/peripheral_manager/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=ba1026896e221cb60751fe2faab002d241f9db74
+PKG_SOURCE_VERSION:=769430115b6dd984313574c3fa2a6d99c65cd223
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/peripheral_manager/files/etc/init.d/peripheral_manager
+++ b/peripheral_manager/files/etc/init.d/peripheral_manager
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common

-START=12
+START=19
 STOP=91

 USE_PROCD=1
--- a/picolisp/Makefile
+++ b/picolisp/Makefile
@@ -11,9 +11,6 @@ PKG_MD5SUM:=ac19fd6ff4d05dd2b15ea00d1ed591e7

 PKG_BUILD_DEPENDS+= +libopenssl +@OPENSSL_WITH_EC2M

-PKG_LICENSE:=MIT-X11
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk

 define Package/picolisp
--- a/port-management/files/etc/init.d/port_management
+++ b/port-management/files/etc/init.d/port_management
@@ -73,8 +73,3 @@ service_triggers() {
 	procd_add_reload_trigger ports
 }

-boot() {
-	wan=$(db -q get hw.board.ethernetWanPort)
-	restart_port $wan
-	start
-}
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.1

-PKG_SOURCE_VERSION:=b1e1d6218a90b533a3492fd93b0e2b256bc23cf6
+PKG_SOURCE_VERSION:=c1d8ba92f6a8538f7a48960592cfe91c0c057c2b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

@@ -16,9 +16,6 @@ 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)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
--- a/rulengd/files/etc/init.d/rulengd
+++ b/rulengd/files/etc/init.d/rulengd
@@ -1,7 +1,10 @@
 #!/bin/sh /etc/rc.common
+#
+# Start the rulengd
+#

-START=17
-STOP=11
+START=99
+STOP=01

 USE_PROCD=1
 NAME=rulengd
--- a/tr098/Config.in
+++ b/tr098/Config.in
@@ -1,11 +0,0 @@
-if PACKAGE_libtr098
-
-config LIBTR098_VENDOR_PREFIX
-    string "TR-098 Vendor Prefix"
-    default "X_IOPSYS_EU_"
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-	
-endif
--- a/tr098/Makefile
+++ b/tr098/Makefile
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libtr098
-PKG_VERSION:=1.0-2019-09-25
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c2de93e288907da239652bd137f2ddee389b5042
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_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/libtr098
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
-endef
-
-define Package/libtr098/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/libtr098/description
- Test description will update later.
-endef
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBTR098_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
-define Package/libtr098/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/tr098
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/tr098
-	$(INSTALL_DIR) $(1)/usr/share/tr098
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/tr098
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libtr098
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libtr098/
-	$(CP) $(PKG_BUILD_DIR)/tr098/*.h $(1)/usr/include/libtr098/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtr098))
--- a/uboot/Makefile
+++ b/uboot/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git

 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=19dde95c2bba420d5ead96b0dd5aea8dc7979ec0
+PKG_SOURCE_VERSION:=819227ec4cf4f2f8f7e8d46a3bee58e329089de6
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=670ad7a30f3c6871b6c8a972e19ca2dd78ea8c9b
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=uspd
 PKG_VERSION:=1.0.3

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=19ac73922e57d10c13e1bc2eb5ac653953804087
+PKG_SOURCE_VERSION:=f033acb40afd9b087587d3cfba292e1d884600d6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

@@ -20,7 +20,7 @@ define Package/uspd
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +libbbfdm
+  DEPENDS:=+libubox +ubus +icwmp-curl
 endef

 define Package/uspd/description
--- a/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE
@@ -64,10 +64,3 @@ featureaccesscodes = |FAC|
 ;
 ;language=

-; Whether the transferor puts the transfer target on-hold before sending REFER
-;
-; The transferor needs put the transfer target on-hold before sending REFER to the transferee as per RFC5589.
-; But call transfer fails on some devices, e.g. Ericsson MTAS as the transfer target. The configuration is
-; to solve this kind of interoperability issue.
-hold_target_before_refer = |HOLDTARGET|
-
--- a/voice-client/files/etc/config/voice_client
+++ b/voice-client/files/etc/config/voice_client
@@ -175,3 +175,8 @@ config sip_service_provider 'sip0'
 	option is_fax '0'
 	option transport 'udp'

+config tone_setting 'toneringbk'
+
+config tone_setting 'tonering'
+
+config tone_setting 'tonebusy'
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -86,6 +86,7 @@ TMPL_UDPTL=$TEMPLATEDIR/udptl.conf.TEMPLATE

 TMPL_CHANNEL=$TEMPLATEDIR/$LINENAME.conf.TEMPLATE
 TMPL_CHANNEL_LINE=$TEMPLATEDIR/tel_line.TEMPLATE
+TMPL_TONE_LINE=$TEMPLATEDIR/tone.conf.TEMPLATE

 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE

@@ -207,7 +208,7 @@ assemble_and_copy_config()
 	[ ! -d $ASTERISKDIR/manager.d ] && mkdir -p $ASTERISKDIR/manager.d/

 	# Get rid of the working directory
-	rm -rf $WORKDIR
+        rm -rf $WORKDIR
 }

 # read configured codecs for a Line section
@@ -670,25 +671,29 @@ configure_sip_provider()
 	local autoframing
 	local encryption

-	config_get enabled $1 enabled "0"
+	config_get enabled $1 enabled
 	config_get domain $1 domain
-	config_get host $1 host "$domain"
+	config_get host $1 host
 	config_get port $1 port
 	config_get outboundproxy $1 outboundproxy
 	config_get outboundproxyport $1 outboundproxyport
 	config_get user $1 user
 	config_get authuser $1 authuser
 	config_get secret $1 secret
-	config_get is_fax $1 is_fax "0"
-	config_get autoframing $1 autoframing "0"
-	config_get transport $1 transport "udp"
-	config_get encryption $1 encryption "0"
+	config_get is_fax $1 is_fax
+	config_get autoframing $1 autoframing
+	config_get transport $1 transport
+	config_get encryption $1 encryption

 	# This is a hack to fix security issue #14962
 	user=${user//"'"/}
 	authuser=${authuser//"'"/}

-	if [ "$enabled" == "0" ] ; then
+	if [ -z "$transport" ] ; then 
+		transport="udp" 
+	fi
+
+	if [ -z "$enabled" -o "$enabled" = "0" ] ; then
 		return
 	fi

@@ -699,6 +704,10 @@ configure_sip_provider()

 	echo "Configuring SIP Provider $1"

+	if [ -z "$host" ] ; then
+		host=$domain
+	fi
+
 	# Get secret from existing asterisk config if its not set in luci config
 	if [ -z "$secret" ] ; then
 		echo "Restoring secret from old config for $1"
@@ -745,20 +754,23 @@ configure_sip_provider()
 	fi

 	# Set or remove encryption
-	if [ "$encryption" == "0" ] ; then
+	if [ -z "$encryption" -o "$encryption" == "0" ] ; then
 		sed -i "/|ENCRYPTION|/d"		$WORKDIR/sip_provider.tmp
 	else
 		sed -i "s/|ENCRYPTION|/yes/g"		$WORKDIR/sip_provider.tmp
 	fi

 	# Force ulaw/alaw if fax, otherwise read selected codecs
-	if [ "$is_fax" == "1" ] ; then
+	if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
 		sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/"	$WORKDIR/sip_provider.tmp
 	else
 		sed -i "s/|ALLOW|/$(read_codecs_ptime $1)/"		$WORKDIR/sip_provider.tmp
 	fi

 	# Autoframing
+	if [ -z "$autoframing" ] ; then
+		autoframing=0
+	fi
 	sed -i "s/|AUTOFRAMING|/$autoframing/"			$WORKDIR/sip_provider.tmp

 	# Set registered extension so that incoming calls match the correct peer
@@ -1794,7 +1806,6 @@ configure_tel()
 	local dialoutmsec
 	local fac
 	local echocancel
-	local hold_target_before_refer

 	config_get jbenable TEL jbenable
 	config_get jbforce TEL jbforce
@@ -1804,7 +1815,6 @@ configure_tel()
 	config_get dialoutmsec TEL dialoutmsec
 	config_get fac TEL fac
 	config_get echocancel TEL echo_cancel
-	config_get hold_target_before_refer TEL hold_target_before_refer

 	CHANNEL_FAC="$CHANNEL_FAC $fac"
 	# Convert whitespace to commas
@@ -1829,14 +1839,44 @@ configure_tel()
 		dtmfcompatibility="0"
 	fi
 	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/$LINENAME.tmp
-
-	if [ "$hold_target_before_refer" == "no" ]; then
-		sed -i "s/|HOLDTARGET|/no/"			$WORKDIR/$LINENAME.tmp
-	else
-		sed -i "s/|HOLDTARGET|/yes/"			$WORKDIR/$LINENAME.tmp
-	fi
 }
+configure_tone_setting()
+{
+     local frequency
+     local frequency_sec
+     local impedance
+     local outputlevel

+     config_get frequency $1 frequency
+     config_get frequency_sec $1 frequency_sec
+     config_get impedance $1 impedance
+     config_get outputlevel $1 outputlevel
+
+     if [ -z "$frequency" ]; then
+               frequency=100
+     fi
+
+     if [ -z "$frequency_sec" ]; then
+                frequencyB=200
+     fi
+
+     if [ -z "$impedance" ]; then
+                impedance=100
+     fi
+
+     if [ -z "$outputlevel" ]; then
+                outputlevel=350
+     fi
+
+     cp $TMPL_TONE_LINE $WORKDIR/tel_line.tmp
+     sed -i "s/|SECTION|/$1/"                                $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$frequency/"                      $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$frequency_sec/"                  $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$impedance/"                      $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$outputlevel/"                    $WORKDIR/tel_line.tmp
+     cat $WORKDIR/tel_line.tmp >>                            $WORKDIR/$LINENAME.tmp
+     rm -f                                                   $WORKDIR/tel_line.tmp
+}
 #
 # Configure settings for individual line in $LINENAME.conf
 #
@@ -1888,6 +1928,7 @@ configure_tel_line()
 	fi

 	cp $TMPL_CHANNEL_LINE $WORKDIR/tel_line.tmp
+
 	sed -i "s/|SECTION|/$1/"				$WORKDIR/tel_line.tmp
 	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/tel_line.tmp
 	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/tel_line.tmp
@@ -1900,7 +1941,7 @@ configure_tel_line()
 	sed -i "s/|CLIR|/$clir/"				$WORKDIR/tel_line.tmp
 	sed -i "s/|LINE_NAME|/$LINENAME/"			$WORKDIR/tel_line.tmp

-	#Configure CHANNEL line with codecs according to the SIP line settings
+        #Configure CHANNEL line with codecs according to the SIP line settings
 #	local is_fax
 #	config_get is_fax $sip_provider is_fax
 # 	if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
@@ -2173,6 +2214,7 @@ start_service() {
 	config_foreach configure_tel_line_extension tel_line
 	config_foreach create_extensions_dialtone tel_line
 	configure_codecs
+	config_foreach configure_tone_setting tone_setting

 	###########################
 	# Voicemail configuration
--- a/voice-client/files/sbin/voice-monitor
+++ b/voice-client/files/sbin/voice-monitor
@@ -21,21 +21,21 @@ fi

 OFFHOOK=0
 REGISTERED=0
-
+INCOMING=0
 asterisk -x 'sip show registry' | grep -q "Registered" && REGISTERED=1
 ubus call endpt status | grep -q "OFFHOOK" && OFFHOOK=1

 if [ $OFFHOOK -eq 1 ]; then
 	ubus call led.voice1 set '{"state":"notice"}'
 elif [ $REGISTERED -eq 1 ]; then
-	ubus call led.voice1 set '{"state":"ok"}'
+        ubus call led.voice1 set '{"state":"ok"}'
 else
 	ubus call led.voice1 set '{"state":"error"}'
 fi

 ubus listen asterisk.registry asterisk.endpoint | \
 while read event ; do
-	#echo "voice-monitor got event: $event" >/dev/console
+#       echo "voice-monitor got event: $event" >/dev/console
 	json_load "$event"
 	if json_select asterisk.registry >/dev/null; then
 		json_get_var status status
@@ -57,11 +57,20 @@ while read event ; do
 		    ONHOOK)
 			OFFHOOK=0
 			if [ $REGISTERED -eq 1 ]; then
-				ubus call led.voice1 set '{"state":"ok"}'
-			else
-			        ubus call led.voice1 set '{"state":"error"}'
+                             ubus call led.voice1 set '{"state":"ok"}'
+                        else
+			     ubus call led.voice1 set '{"state":"error"}'
 			fi
 			;;
+                    RINGING)
+                       INCOMING=0
+                       asterisk -x 'sip show channels' | grep -q "INVITE" && INCOMING=1
+                       if [ $INCOMING -eq 1 ]; then
+                                  ubus call led.voice1 set '{"state":"notice"}'
+                       else
+                                  ubus call led.voice1 set '{"state":"ok"}'
+                       fi
+                       ;;
 		    *)
 			# Do nothing for other events.
 			;;
@@ -69,4 +78,5 @@ while read event ; do
 	fi
 done &

+
 echo $(($!-1)) $! >/tmp/voice-monitor.pid
--- a/wifilife/Makefile
+++ b/wifilife/Makefile
@@ -1,18 +1,18 @@
 #
-# Copyright (C) 2019 IOPSYS Software Solutions AB
+# Copyright (C) 2018 Iopsys
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifilife
-PKG_VERSION:=2.5.0
+PKG_VERSION:=1.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9b9a787120743d121ce867251af45da076fe7cce
+PKG_SOURCE_VERSION:=37d199b928f444710ab1ad0538f9f40650f5608c
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 ifeq ($(CONFIG_WIFILIFE_OPEN),y)
 TARGET_PROD=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROD)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 else
 PKG_SOURCE_PROTO:=git
@@ -56,7 +56,6 @@ define Package/wifilife/install
 	$(CP) -r ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifiagent $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wificntlr $(1)/usr/sbin/
 endef

 $(eval $(call BuildPackage,wifilife))
--- a/wifilife/files/etc/init.d/wifilife
+++ b/wifilife/files/etc/init.d/wifilife
@@ -2,8 +2,7 @@

 START=96
 STOP=10
-PROG_AGENT=/usr/sbin/wifiagent
-PROG_CNTLR=/usr/sbin/wificntlr
+PROG=/usr/sbin/wifiagent
 ENABLE=/tmp/owsd_enable
 USE_PROCD=1
 EXTRA_COMMANDS="enable_check"
@@ -13,7 +12,7 @@ start_service() {
 	[ "$(uci -q get wifilife.@wifilife[0].enabled)" == "0" ] && return

 	procd_open_instance
-	procd_set_param command ${PROG_AGENT} -d -l -f -o /tmp/wifiagent.log
+	procd_set_param command ${PROG} -d -l -f -o /tmp/wifiagent.log
 	procd_set_param respawn
 	procd_close_instance

@@ -22,7 +21,7 @@ start_service() {
 	config_get enable ubusproxy enable
 	if [ "$enable" == "1" ]; then
 		echo $enable > $ENABLE
-		procd_set_param command ${PROG_CNTLR} -d -l -f -o /tmp/wificntlr.log
+		procd_set_param command ${PROG} -c -d -l -f -o /tmp/wificntlr.log
 	fi
 	procd_close_instance
 }
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -1,14 +1,14 @@
 #
-# Copyright (C) 2019 Iopsys
+# Copyright (C) 2018 Iopsys
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=2.4.0
+PKG_VERSION:=1.0.2

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c4063e9c5581fed6e75037d0b13698b7cb2d6c2a
+PKG_SOURCE_VERSION:=9cd787def3934610ed790d75cfba3208a84fcd81
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

--- a/wifixd/Makefile
+++ b/wifixd/Makefile
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2018 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wifixd
-PKG_VERSION:=1.0.2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7aae246602af0df883ddefb83147010a457c2725
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wifixd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi status and configration utility (Deprecated)
-  DEPENDS:=+libwifix +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/wifixd/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.
-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/wifixd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/wifix.init $(1)/etc/init.d/wifix
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifixd $(1)/usr/sbin/wifixd
-endef
-
-$(eval $(call BuildPackage,wifixd))
--- a/wifixd/files/wifix.init
+++ b/wifixd/files/wifix.init
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/wifixd
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-#	procd_set_param env IOP_LLA_LIBS_DEBUG=3    #for debugging only
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-        stop
-        start
-}
Author	SHA1	Message	Date
Hemlata Bhatt	939fae5860	Event catch for Led blinking	2019-10-08 15:21:51 +02:00
Hemlata Bhatt	19b1345f98	Telia Eesti-Make tone Configurable adding the tonetypes	2019-09-05 09:49:57 +02:00
Hemlata Bhatt	2aed9a5525	Telia Eesti-Make tone Configurable	2019-09-05 09:47:50 +02:00
Sukru Senli	2f3551e643	voice-client: firewall.sip: do not hardcode rtp ports	2019-08-21 10:08:05 +02:00
Jakob Olsson	29e635516d	questd: update pkg to remove des key from system.info	2019-08-19 10:29:29 +02:00
Sukru Senli	d4c6078f24	icwmp-4.0-2019-08-17	2019-08-19 08:15:43 +02:00
Jakob Olsson	8ad83b1252	questd: update pkg to include intel ssid fix #1073	2019-08-16 12:07:31 +02:00
Jakob Olsson	0e2154bb0d	questd: update pkg hash to include intel port up status	2019-08-16 11:25:37 +02:00
Anjan Chanda	dbc9aa37c7	Update feed [ iopsys ] package [ easy-soc-libs ] ------------------------------------------------------------------------------- * 4c20476 libwifi: remove dependency on unused netlink route ------------------------------------------------------------------------------- commit 4c204761a38a27ff9ff7021c3c34b92d7e3fdb84 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-08-15 11:54:00 +0200 libwifi: remove dependency on unused netlink route Base directory -> / libwifi/wifi.c \| 1 - 1 file changed, 1 deletion(-) -------------------------------------------------------------------------------	2019-08-15 11:56:25 +02:00
Jakob Olsson	e0687449cc	port_management: pass cfg name to set_port_speed #1059 #1060	2019-08-15 11:04:45 +02:00
Jakob Olsson	fc9a912cb5	voice_client: prevent malicious crontab injection through dayns #1008	2019-08-14 10:57:55 +02:00
Jakob Olsson	54d5855ad9	netmode: prevent path traversal in pre and post from netmode.sh #1010	2019-08-09 09:23:35 +02:00
Jakob Olsson	b0054ba9c7	voice_client: ringing: prevent scheduler from creating malicious cronjobs #1008	2019-08-06 10:56:10 +02:00
Oussama Ghorbel	a5a3f56ee7	uboot: update package source revision commit 819227ec4cf4f2f8f7e8d46a3bee58e329089de6 Author: Oussama Ghorbel <oussama.ghorbel@iopsys.eu> Date: Thu Jul 25 14:34:55 2019 +0200 adjust brightness to Genexis recommended values	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	2fc025e8c5	Revert "protect u-boot by password for norrland board" This reverts commit `fc3a0f8169`.	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	44cf5757fc	gryphon-led-module: set brightness level to 15 This is requested by Genexis	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	0cf9177ea3	protect u-boot by password for norrland board b1aea2a7df protect u-boot prompt by sha256 password 860cd65bdb initialize SHA buffer size var in passwd_abort	2019-07-25 14:55:38 +02:00