questd: set PKG_SOURCE_VERSION to qualcomm branch

to avoid patching the binaries downloaded when building open builds

ated/Makefile

@@ -1,9 +1,16 @@
-#
-# Copyright (C) 2016 inteno
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+/* 
+ * 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.
+ */
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -20,6 +27,9 @@ 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
 

bashdb/Makefile

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

bbf/Config_bbfdm.in

@@ -0,0 +1,27 @@
+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

bbf/Makefile

@@ -0,0 +1,87 @@
+#
+# 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))

bbk_cli/Makefile

@@ -0,0 +1,42 @@
+#
+# 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))

bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch

@@ -0,0 +1,25 @@
+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)

bootchart2/Makefile

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

catv/Makefile

@@ -1,9 +1,19 @@
+#
+# 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

crashlog/Makefile

@@ -1,9 +1,18 @@
+#
+# 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
 

dectmngr2/Makefile

@@ -1,19 +1,20 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# 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_RELEASE:=1
 PKG_VERSION:=1.3.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=637aa9ef231f81d195f7a1b67c70af445ade7fee
+PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
 PKG_NAME:=dectmngr2
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
 
 RSTRIP:=true
 export BUILD_DIR

dslmngr/Makefile

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

easy-qos/Makefile

@@ -1,19 +1,29 @@
+#
+# 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.0
+PKG_VERSION:=1.1
 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 utitie
+	This package contains Easy QoS utility
 endef
 
 define Build/Prepare
@@ -29,7 +39,11 @@ 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

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -0,0 +1,165 @@
+#!/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"
+}
+

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" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; 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" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else

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" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
 			create_rule tcp ${ip} ${prio_num} ${port_list}
 			create_rule udp ${ip} ${prio_num} ${port_list}
 		else

easy-soc-libs.deprecated/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_libwifix)
+menu "configurations"
+
+config LIBWIFIX_DEBUG
+	depends on PACKAGE_libwifix
+	bool "Enable wifi debugging"
+	default n
+
+endmenu
+endif

easy-soc-libs.deprecated/Makefile

@@ -0,0 +1,111 @@
+#
+# 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 ifeq ($(CONFIG_TARGET_ipq),y)
+  TARGET_PLATFORM=QCA
+  TARGET_CFLAGS +=-DIOPSYS_QCA
+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))

easy-soc-libs/Makefile

@@ -1,24 +1,29 @@
 #
-# Copyright (C) 2018 Iopsys
+# 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
-PKG_VERSION:=1.0.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9b7accf0ac4f7c8010fb06ba83df9e53264b429a
+PKG_SOURCE_VERSION:=1b6234d2dad694ace8af50956cd66f1c96f2255f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 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
@@ -37,7 +42,7 @@ endef
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
+  DEPENDS+=+libnl +libnl-route
 endef
 
 define Package/libethernet
@@ -77,7 +82,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
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
 endef
 
 subdirs := \
@@ -107,7 +112,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
@@ -137,7 +142,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

endptmngr/Makefile

@@ -1,27 +1,31 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# 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_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
+PKG_SOURCE_VERSION:=ef49d57c3824df4dfb4921d39461e2bd14f918a7
 
 
 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://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
+PATCH_DIR:=
 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

fatrace/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v2.
+# This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
 
@@ -20,6 +20,9 @@ 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
 

gigaset-elements/.gitignore

@@ -1,3 +0,0 @@
-
-git-src
-

gigaset-elements/Makefile

@@ -1,65 +0,0 @@
-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))
-

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:=Genexis
+  PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
 

gryphon-led-module/src/sk9822.h

@@ -22,7 +22,7 @@
 #include <linux/types.h>
 
 #define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 1  // 5-bit brightness, 0-31
+#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
 
 typedef struct {
 	uint8_t b;

ice-client/Config.in

@@ -1,4 +0,0 @@
-
-config ICE_OPEN
-       bool "Use pre-compiled version for Open SDK"
-       default n

ice-client/files/ice-client.uci_default

@@ -1,74 +0,0 @@
-#!/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
-

icgroupd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Inteno Broadband AB
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

icwmp/Config_cwmp.in

@@ -19,17 +19,9 @@ 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
 

icwmp/Config_datamodel.in

@@ -1,7 +0,0 @@
-if PACKAGE_libdatamodel
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-05-21
+PKG_VERSION:=4.0-2019-10-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3ae6954f55e90a339561719a0328c0cf3a4b018c
+PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
 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 \
@@ -30,13 +32,6 @@ 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
@@ -65,11 +60,18 @@ 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 +libexpat +libstrophe +curl +libtrace +libdatamodel
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +(PACKAGE_libtr098):libtr098
 endef
 
 define Package/icwmp/description
@@ -94,10 +96,6 @@ 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
@@ -109,8 +107,6 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -131,16 +127,6 @@ 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 \
@@ -172,18 +158,23 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/libdatamodel/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
-endef
+ifeq ($(CONFIG_PACKAGE_libtr098),y)
+CONFIGURE_ARGS += \
+	--enable-tr098
+endif
+
+CONFIGURE_ARGS += \
+	--enable-tr181
 
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(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
 	$(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
@@ -215,6 +206,7 @@ define Package/icwmp_xmpp/install
 	$(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
+	$(CP) ./xmpp-files/* $(1)/
 endef
 
 define Package/icwmp_udpechoserver/install
@@ -235,17 +227,15 @@ define Package/icwmp_twamp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
 endef
 
-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
+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
 endef
 
-
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -265,11 +255,10 @@ 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))

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

@@ -41,4 +41,14 @@ 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

icwmp/xmpp-files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+[ -f /etc/config/cwmp_xmpp ] || exit 0
+
+[ "$ACTION" == "ifup" ] || 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
+
+local proto="$(uci -q get network.$INTERFACE.proto)"
+[ "$proto" == "none" ] && exit 0
+
+local ifname="$(uci -q get network.$INTERFACE.ifname)"
+[ "${ifname:0:1}" == "@" ] && exit 0
+
+/etc/init.d/icwmp_xmppd reload &
+

ifbt/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ifbt
-PKG_VERSION:=0.1
+PKG_VERSION:=0.2
 
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
+PKG_SOURCE_VERSION:=f6edff47b6c0a154ab892301acf767d19ac8ad73
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
@@ -16,6 +16,9 @@ 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)

ifsi/Makefile

@@ -1,39 +0,0 @@
-#
-# 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))

ifsi/src/Makefile

@@ -1,17 +0,0 @@
-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
-

ifsi/src/ifsi.c

@@ -1,74 +0,0 @@
-/*
- * 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;
-}
-

imonitor/Makefile

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

inbd/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
+PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
@@ -20,6 +20,9 @@ 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
 

inotify-tools/Makefile

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

iop/Makefile

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

iop/config

@@ -14,6 +14,7 @@ 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
@@ -36,6 +37,7 @@ 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
@@ -78,6 +80,7 @@ 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
@@ -114,11 +117,14 @@ 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

iop/scripts/cve-check.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+function cvecheck {
+    CVEDIR="/tmp/cve-indicator/"
+    CVEBIN="${CVEDIR}/bin"
+    REPORTS="reports"
+    mkdir -p $REPORTS
+
+    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
+    if [ $? -ne 0 ]
+        then
+            echo "Missing dependencies"
+            sudo apt-get update
+            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
+
+        else
+            echo    "Dependecy check passed"
+    fi
+
+
+if [ -d "$CVEDIR" ]; then
+  ### Take action if $DIR exists ###
+  echo "${CVEDIR} exists running cvecheck"
+else
+  ###  Control will jump here if $DIR does NOT exists ###
+  echo "Error: cvecheck not found. getting from iopsys repo"
+  git clone git@dev.iopsys.eu:iopsys/cve-indicator.git /tmp/cve-indicator
+fi
+  CVEGENLIST=`${CVEBIN}/cve-indicator gen-list openwrt bin`
+  CVEGETCVES=`${CVEBIN}/cve-indicator get-cves $CVEGENLIST --api_url http://cve.circl.lu/api/cvefor/`
+  CVEGETRPRT=`${CVEBIN}/cve-indicator gen-rprt $CVEGETCVES`
+exit 0
+
+}
+
+
+register_command "cvecheck" "Generate a CVE report on latest build"

iop/scripts/genconfig.sh

@@ -18,6 +18,7 @@ function genconfig {
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
+	qca_ipq="target/linux/ipq"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -90,9 +91,11 @@ function genconfig {
 			iopsys_ramips=$(cd $ramips; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $qca_ipq/genconfig ] &&
+			iopsys_qca_ipq=$(cd $qca_ipq; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_qca_ipq; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -133,13 +136,20 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_qca_ipq; do
+		if [ $p == $profile ]; then
+		    target="ipq"
+		    config_path="$qca_ipq/config"
+		    return
+		fi
+	    done
+
 	}
 
 	git remote -v | grep -q http || {
 		DEVELOPER=1
 
 		bcmAllowed=0
-		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
@@ -150,7 +160,6 @@ 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() {
@@ -309,6 +318,8 @@ function genconfig {
 			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "ipq" ]; then
+			:
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -356,7 +367,6 @@ 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
@@ -364,7 +374,6 @@ 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

iop/scripts/generate_tarballs.sh

@@ -59,23 +59,6 @@ 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)
@@ -129,8 +112,8 @@ function print_usage {
 
 function generate_tarballs {
 
-    SERVER="god@software.inteno.se"
-    FPATH="/var/www/html/iopsys/consumer"
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
 
     set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
@@ -169,11 +152,9 @@ 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"

iopupgrade/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -20,6 +20,9 @@ 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
 

iopupgrade/files/sbin/iopu

@@ -164,7 +164,7 @@ trap finish EXIT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxb" opt; do
+while getopts "nrxbh" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -184,7 +184,7 @@ while getopts "nrxb" opt; do
 	    exit 0
 	    ;;
 	h)
-	    upd_usage
+	    usage
 	    exit 1
 	    ;;
     esac

iwatchdog/Makefile

@@ -1,6 +1,9 @@
+# Copyright (C) 2019 iopsys
 #
-# Copyright (C) 2013 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
 
@@ -8,6 +11,9 @@ 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
 
@@ -22,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/iwatchdog
   CATEGORY:=Utilities
-  TITLE:=Inteno watchdog
+  TITLE:=IOPSYS watchdog
 endef
 
 define Package/iwatchdog/description

libjwt/Makefile

@@ -17,6 +17,8 @@ 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

libtrace/Makefile

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

lmbench/Makefile

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

logrotate/Makefile

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

loop-detector/Makefile

@@ -1,3 +1,9 @@
+# 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
@@ -11,6 +17,9 @@ 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
 
 

ltq-nand/Makefile

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

multiwan/Makefile

@@ -11,6 +11,8 @@ PKG_NAME:=multiwan
 PKG_VERSION:=1.0.22
 PKG_RELEASE:=2
 
+PKG_LICENSE:=GPLv2
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/multiwan

natalie-dect-h/Makefile

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

natalie-dect/Makefile

@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2019 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
@@ -14,7 +11,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://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -25,6 +22,8 @@ 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

ndisc/Makefile

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

ndt/Makefile

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

netmode/Makefile

@@ -1,9 +1,16 @@
+#
+# 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
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=9fa23664b3bdd963e4556f5921c9f9be1c9c578f
+PKG_SOURCE_VERSION:=6406325e72d7ddd0ff7aaa3a87669519021bdb11
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 
@@ -11,6 +18,9 @@ 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

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 warning
+	procd_append_param command --verbose warning -i macaddr
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

netmode/files/etc/netmodes/bridged/wireless

@@ -1,6 +1,5 @@
 config wifi-status 'status'
 	option wlan '1'
-	option wps '1'
 	option sched_status '0'
 	option schedule '0'
 
@@ -8,9 +7,6 @@ config bandsteering 'bandsteering'
 	option enabled '0'
 	option policy '0'
 
-config apsteering 'apsteering'
-	option enabled '0'
-
 config wifi-device 'wl0'
 	option type 'broadcom'
 	option country 'EU/13'

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/pre/disable_ubusproxy.sh

@@ -0,0 +1,2 @@
+uci -q set owsd.ubusproxy.enable="0"
+uci -q commit owsd

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/wireless

@@ -1,6 +1,5 @@
 config wifi-status 'status'
 	option wlan '1'
-	option wps '1'
 	option sched_status '0'
 	option schedule '0'
 
@@ -8,9 +7,6 @@ config bandsteering 'bandsteering'
 	option enabled '0'
 	option policy '0'
 
-config apsteering 'apsteering'
-	option enabled '0'
-
 config wifi-device  ra0
 	option band b
 	option channel  auto

netmode/files/etc/netmodes/routed_brcm/wireless

@@ -1,6 +1,5 @@
 config wifi-status 'status'
 	option wlan '1'
-	option wps '1'
 	option sched_status '0'
 	option schedule '0'
 
@@ -8,9 +7,6 @@ config bandsteering 'bandsteering'
 	option enabled '0'
 	option policy '0'
 
-config apsteering 'apsteering'
-	option enabled '0'
-
 config wifi-device 'wl0'
 	option type 'broadcom'
 	option country 'EU/13'

netmode/files/etc/netmodes/routed_mtk/omcproxy

@@ -1,10 +0,0 @@
-config proxy
-	option scope global
-	option uplink wan
-	list downlink lan
-
-config proxy
-	option scope global
-	option uplink wan6
-	list downlink lan
-

netmode/files/etc/netmodes/routed_mtk/wireless

@@ -1,6 +1,5 @@
 config wifi-status 'status'
 	option wlan '1'
-	option wps '1'
 	option sched_status '0'
 	option schedule '0'
 
@@ -8,9 +7,6 @@ config bandsteering 'bandsteering'
 	option enabled '0'
 	option policy '0'
 
-config apsteering 'apsteering'
-	option enabled '0'
-
 config wifi-device  ra0
 	option band b
 	option channel  auto

netmode/files/lib/functions/netmode.sh

@@ -121,8 +121,13 @@ run_netmode_scripts() {
 	local mode=$1
 	local when=$2
 	local script
+	local path
+
+	path=$(readlink -f /etc/netmodes/$mode/)
+	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
+
 	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
-		logger -s -p user.info -t $0 "[netmode] Executing $when netmode scripts" >/dev/console
+		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
 		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
 			sh /etc/netmodes/$mode/scripts/$when/$script
 		done
@@ -185,7 +190,7 @@ switch_netmode() {
 	mkdir -p $CONF_BACKUP_DIR
 	cp -af /etc/config/* $CONF_BACKUP_DIR
 
-	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
+	logger -s -p user.info -t "netmode" "Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
 
 	for file in $(ls /etc/netmodes/$curmode/); do
 		case "$file" in
@@ -210,11 +215,10 @@ switch_netmode() {
 	case "$curmode" in
 		repeater*)
 			touch $SWITCHMODELOCK
-			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
+			logger -s -p user.info -t "netmode" "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
+			[ -f /etc/init.d/macoffset ] && /etc/init.d/macoffset reload
 			ubus call network reload
 			wifi reload nodat
 			ubus call router.network reload
@@ -225,6 +229,7 @@ switch_netmode() {
 		;;
 		*)
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
+			[ -f /etc/init.d/macoffset ] && /etc/init.d/macoffset reload
 			ubus call uci commit '{"config":"network"}'
 		;;
 	esac
@@ -238,7 +243,7 @@ revert_netmode() {
 	local rready="$3"
 
 	ubus call leds set  '{"state" : "allflash"}'
-	echo "Could not switch to '$from' mode; going back to '$to' mode" > /dev/console
+	logger -s -p user.info -t "netmode" "Could not switch to '$from' mode; going back to '$to' mode" > /dev/console
 	uci -q set netmode.setup.curmode="$to"
 	uci -q set netmode.setup.repeaterready="$rready"
 	uci commit netmode
@@ -247,7 +252,7 @@ revert_netmode() {
 	rm -rf $CONF_BACKUP_DIR
 	rm -rf $OLD_MODE_FILE
 
-	echo "Restarting network services" > /dev/console
+	logger -s -p user.info -t "netmode" "Restarting network services" > /dev/console
 	ubus call network reload
 	wifi reload
 	ubus call router.network reload
@@ -288,10 +293,10 @@ wait_for_netmode_handler() {
 
 netmode_get_ip_type() {
 	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is private"
+		logger -t $0 "netmode_get_ip_type: ip $1 is private"
 		echo "private"
 	} || {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is public"
+		logger -t $0 "netmode_get_ip_type: ip $1 is public"
 		echo "public"
 	}
 }
@@ -379,7 +384,7 @@ populate_netmodes() {
 	done
 
 	local hardware=$(db get hw.board.hardware)
-	local keys lang desc exp exclude
+	local keys lang desc exp exclude support
 	for mode in $(ls $MODEDIR); do
 
 			case "$mode" in
@@ -409,6 +414,23 @@ populate_netmodes() {
 				done
 				json_select ..
 				[ $exclude -eq 1 ] && continue
+			elif json_select supported_boards; then
+				support=0
+				_i=1
+				while json_get_var board $_i; do
+					case "$hardware" in
+						$board)
+							support=1
+							break
+						;;
+					esac
+					_i=$((_i+1))
+				done
+				json_select ..
+				[ $support -eq 1 ] || {
+					uci -q delete netmode.$mode
+					continue
+				}
 			fi
 
 			if json_select acl; then

netmode/files/usr/libexec/rpcd/repeater

@@ -100,7 +100,7 @@ get_wifi_iface_cfgstr() {
 case "$1" in
 	list)
 		if [ $WIFISTA -eq 1 ]; then
-			echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" }, "connect": { "ssid": "str", "key": "str" }, "forget_network": {} }'
+			echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" }, "connect": { "ssid": "str", "key": "str" }, "forget_network": {}, "wps_enroll": {}, "wps_stop": {} }'
 		else
 			echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" } }'
 		fi
@@ -211,6 +211,30 @@ case "$1" in
 				json_add_int "code" $code
 				json_dump
 			;;
+			wps_enroll)
+				local wetif
+				[ $WIFISTA -eq 1 ] && wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
+				if [ -n "$wetif" ]; then
+					iwpriv $wetif set ApCliEnable=0
+					iwpriv $wetif set WscConfMode=1
+					iwpriv $wetif set WscMode=2
+					iwpriv $wetif set ApCliEnable=1
+					iwpriv $wetif set WscGetConf=1
+				fi
+				json_init
+				json_add_string "ifname" $wetif
+				json_dump
+			;;
+			wps_stop)
+				local wetif
+				[ $WIFISTA -eq 1 ] && wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
+				if [ -n "$wetif" ]; then
+					iwpriv $wetif set WscStop=1
+				fi
+				json_init
+				json_add_string "ifname" $wetif
+				json_dump
+			;;
 		esac
 	;;
 esac

obuspa/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obuspa
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=f362163d5a660a18081ec8665851c8db90d6f238
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+
+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
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=USP agent
+  DEPENDS:=+libcoap +libopenssl +libcurl +libsqlite3 +libcares +libubox +libubus +libblobmsg-json +uspd
+endef
+
+define Package/obuspa/description
+ OB-USP-AGENT is a system daemon providing a User Services Platform (USP) Agent.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+ifneq ($(CONFIG_USE_MUSL),)
+TARGET_CFLAGS += -DUSE_MUSL
+endif
+
+#define Build/Prepare
+#        $(CP) -rf ./obuspa/* $(PKG_BUILD_DIR)/
+#endef
+
+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
+
+$(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -0,0 +1,15 @@
+config controller
+	option endpointid 'self::usp-controller.com'
+
+config mtp
+	option enable 'true'
+	option protocol 'STOMP'
+	option destination 'uspq'
+
+config connection
+	option host 'usp-controller.com'
+	option username 'username'
+	option password 'password'
+	option encryption 'false'
+	option interface 'wan'
+

obuspa/files/etc/init.d/obuspa

@@ -0,0 +1,120 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+PROG=/usr/sbin/obuspa
+l3device=""
+
+CTRL_PATH="Device.LocalAgent.Controller.1."
+MTP_PATH="Device.LocalAgent.MTP.1."
+CONN_PATH="Device.STOMP.Connection.1."
+
+log() {
+	echo "${@}"|logger -t obuspa -p debug
+}
+
+db_set() {
+	log "DBSET param|${1}| value|${2}|"
+	${PROG} -c dbset ${1} ${2}
+}
+
+validate_controller_section()
+{
+	uci_validate_section obuspa controller "${1}" \
+		'endpointid:string:"self:usp-controller.com"'
+}
+
+validate_mtp_section()
+{
+	uci_validate_section obuspa mtp "${1}" \
+		'enable:bool:true' \
+		'protocol:string:"STOMP"' \
+		'destination:string:'
+}
+
+validate_connection_section()
+{
+	uci_validate_section obuspa connection "${1}" \
+		'host:string:"usp-controller.com"' \
+		'username:string:username' \
+		'password:string:password' \
+		'encryption:bool:true' \
+		'interface:string:wan'
+}
+
+configure_controller() {
+	local endpointid
+
+	validate_controller_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+	db_set "${CTRL_PATH}EndpointID" ${endpointid}
+}
+
+configure_mtp() {
+	local protocol enable destination
+
+	validate_mtp_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+	db_set "${MTP_PATH}Enable" ${enable}
+	db_set "${MTP_PATH}Protocol" ${protocol}
+	db_set "${MTP_PATH}STOMP.Destination" ${destination}
+}
+
+configure_connection() {
+	local host username password encryption interface
+
+	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}
+	db_set "${CONN_PATH}X_ARRIS-COM_EnableEncryption" ${encryption}
+}
+
+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
+}
+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
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
+}

owsd/Makefile

@@ -10,13 +10,16 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=930db7f4af821e91f46107c8a76b60f943ec7c3b
+PKG_SOURCE_VERSION:=a83448ed65e1c76411b9c6553d64b5d623b8bcd7
 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}
@@ -61,8 +64,9 @@ define Package/owsd/install
 	$(INSTALL_CONF) ./files/owsd.config $(1)/etc/config/owsd
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) ./files/owsd.hotplug $(1)/etc/hotplug.d/iface/55-owsd
-#	$(INSTALL_DIR) $(1)/etc/uci-defaults
-#	$(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
+ifeq ($(CONFIG_OWSD_UPROXYD),y)
+	$(CP) ./uproxy-files/* $(1)/
+endif
 endef
 
 define Package/owsd-testdata

owsd/files/owsd.config

@@ -5,8 +5,8 @@ config owsd 'global'
 #	option www_maxage '3600'
 
 # ubusproxy is enbaled if: enable = 1 or peer exists or path exists
-config ubusproxy 'ubusproxy'
-	option enable '0'
+#config ubusproxy 'ubusproxy'
+#	option enable '0'
 #	list peer 'wss://repeater_hostname/'
 #	list peer 'wss://192.168.1.101/'
 #	list object 'router.*'
@@ -30,12 +30,12 @@ config owsd-listen 'lan'
 	option whitelist_interface_as_origin '1'
 	option whitelist_dhcp_domains '1'
 
-config owsd-listen 'lan_8080'
-	option port '8080'
-	option interface 'lan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	option whitelist_dhcp_domains '1'
+#config owsd-listen 'lan_8080'
+#	option port '8080'
+#	option interface 'lan'
+#	option ipv6 'on'
+#	option whitelist_interface_as_origin '1'
+#	option whitelist_dhcp_domains '1'
 
 #config owsd-listen 'lan_https'
 #	option port '443'

owsd/files/owsd.init

@@ -66,6 +66,8 @@ rpcd_acl() {
 }
 
 handle_owsd_acl() {
+	[ -d /tmp/owsd ] || mkdir /tmp/owsd
+
 	config_load rpcd
 	config_foreach append_users "login"
 
@@ -77,9 +79,9 @@ handle_owsd_acl() {
 		config_foreach owsd_acl "owsd-listen" "$USR"
 		json_close_array
 	done
-	json_dump > /tmp/owsd_acl
+	json_dump > /tmp/owsd/owsd_acl
 
-	json_load "$(cat /tmp/owsd_acl)"
+	json_load "$(cat /tmp/owsd/owsd_acl)"
 	config_load rpcd
 	config_foreach rpcd_acl "login"
 	uci commit rpcd
@@ -126,8 +128,8 @@ validate_owsd_global() {
 
 }
 
-append_origin() {
-	procd_append_param command -o"$1"
+append_str() {
+	json_add_string "" "$1"
 }
 
 append_origin_parts() {
@@ -137,9 +139,9 @@ append_origin_parts() {
 	port="$3"
 
 	if [ "${proto}" = "https" -a "${port}" -eq 443 -o "${proto}" = "http" -a "${port}" -eq 80 ]; then
-		append_origin "${proto}://${host}"
+		append_str "${proto}://${host}"
 	else
-		append_origin "${proto}://${host}:${port}"
+		append_str "${proto}://${host}:${port}"
 	fi
 }
 
@@ -150,6 +152,7 @@ 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' \
@@ -163,7 +166,7 @@ validate_owsd_iface() {
 }
 
 parse_owsd_iface() {
-	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
+	local port interface whitelist_interface_as_origin whitelist_dhcp_domains whitelist_all_origins ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
 	local ubusx_acl
@@ -175,24 +178,37 @@ parse_owsd_iface() {
 
 	# utility function
 	new_listen_socket() {
-		procd_append_param command -p "${port}"
+		json_add_int "port" ${port}
 
-		procd_append_param command -L"$1"
+		[ -n "${cert}"      ] && json_add_string "cert" "${cert}"
+		[ -n "${key}"       ] && json_add_string "key" "${key}"
+		[ -n "${ca}"        ] && json_add_string "ca" "${ca}"
 
-		[ -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 "${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 "${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}"
+		[ -n "${ubusx_acl}" ] && json_add_string "ubusx_acl" "$ubusx_acl"
 
 	}
 
-	append_whitelists () {
-		config_list_foreach "$1" "origin" append_origin
+	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
 
 		if [ "$whitelist_dhcp_domains" -eq 1 ]; then
 			for domain in $DHCP_DOMAINS; do
@@ -212,13 +228,22 @@ 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}"
-			append_whitelists "$1"
+			[ -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
 		done
 
 		# ipv6 addresses
@@ -230,16 +255,24 @@ 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}]"
-			append_whitelists "$1"
-			procd_append_param command -66
+			[ -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
 		done
+		json_close_array
+
 	else
 		new_listen_socket "$1"
-		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
+		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
 
 		append_whitelists "$1"
 	fi
@@ -263,39 +296,49 @@ 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 && {
+		if [ "${enable}" -eq 1 ]; then
+			json_add_object "ubusproxy"
 
-	validate_owsd_ubusproxy || {
-		echo "Ubusproxy validation failed"
-		return 1
+			[ -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}"
+
+			append_peer () {
+				[ -n "$1"   ] && json_add_string "peer" "$1"
+			}
+
+			append_object () {
+				[ -n "$1"   ] && json_add_string "object" "$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
+		fi
 	}
 
-	if [ "${enable}" -eq 1 ]; then
-		procd_append_param command -U
-
-		[ -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"   ] && procd_append_param command -P"$1"
-		}
-
-		append_object () {
-			[ -n "$1"   ] && procd_append_param command -U"$1"
-		}
-
-		config_list_foreach "ubusproxy" "peer" append_peer
-		config_list_foreach "ubusproxy" "object" append_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

owsd/files/owsd.uci_default

@@ -1,87 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-MGMT_INTERFACES=""
-OWSD_INTERFACES=""
-NOT_DEFAULT=0
-
-mgmt_interfaces() {
-	local interface=$1
-	[ "$interface" == "loopback" ] && return
-	[ "$interface" == "lan" ] && return
-	[ "$interface" == "wan" ] && return
-	[ "$interface" == "wan6" ] && return
-
-	local type proto
-	config_get type $interface type
-	config_get proto $interface proto "none"
-	[ "$type" == "bridge" -a "$proto" == "none" ] && return
-
-	local is_lan
-	config_get is_lan $interface is_lan
-	[ "$is_lan" == "1" ] && return
-
-	local ifname
-	config_get ifname $interface ifname
-	[ "${ifname:0:1}" == "@" ] && return
-
-	MGMT_INTERFACES="$MGMT_INTERFACES $interface"
-}
-
-owsd_interfaces() {
-	local config=$1
-	local interface
-	config_get interface $config interface
-	[ "$interface" == "loopback" ] && return
-	[ "$interface" == "lan" ] && return
-	[ "$interface" == "wan" ] && return
-	[ "$interface" == "wan6" ] && return
-
-	OWSD_INTERFACES="$OWSD_INTERFACES $interface"	
-
-	NOT_DEFAULT=1
-}
-
-not_owsd() {
-	local interface=$1
-	local there=0
-	for owsd in $OWSD_INTERFACES; do
-		if [ "$interface" == "$owsd" ]; then
-			there=1
-			break
-		fi
-	done
-	return $there
-}
-
-config_load network
-config_foreach mgmt_interfaces interface
-
-config_load owsd
-config_foreach owsd_interfaces owsd-listen
-
-if [ $NOT_DEFAULT -eq 0 ]; then
-	for mgmt in $MGMT_INTERFACES; do
-		if $(not_owsd $mgmt); then
-			uci -q set owsd.$mgmt=owsd-listen
-			uci -q set owsd.$mgmt.port=80
-			uci -q set owsd.$mgmt.interface="$mgmt"
-			uci -q set owsd.$mgmt.ipv6="on"
-			uci -q set owsd.$mgmt.whitelist_interface_as_origin="1"
-			uci -q set owsd.$mgmt.origin="*"
-
-			uci -q set owsd.$mgmt"_8080"=owsd-listen
-			uci -q set owsd.$mgmt"_8080".port=8080
-			uci -q set owsd.$mgmt"_8080".interface="$mgmt"
-			uci -q set owsd.$mgmt"_8080".ipv6="on"
-			uci -q set owsd.$mgmt"_8080".whitelist_interface_as_origin="1"
-			uci -q set owsd.$mgmt"_8080".origin="*"
-
-			uci commit owsd
-		fi
-	done
-fi
-
-exit 0
-

owsd/uproxy-files/etc/ubusx/ubusxDemoCA.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDHzCCAgegAwIBAgIJAKmrHnhgM9CZMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMMG3Jvb3QgQ0EgZm9yIGlvcHN5cyBnYXRld2F5czAeFw0xOTA0MjcxMDQ4MTJa
+Fw0yNzA3MTQxMDQ4MTJaMCYxJDAiBgNVBAMMG3Jvb3QgQ0EgZm9yIGlvcHN5cyBn
+YXRld2F5czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7i0RqyVvpl
+WVm4ioXV7H/5oII6nmlGb+eQM4p0QBujhyvwtT6z0L0KXwwWRGFdYBNChBfsi9zm
+AAhgQaR5D/QPRGDIiB69O3iBd2JFqzxo1rkN/nUMbZ2OplXRscmOs34yT68hV0ov
+nv0iAr06bzyoa2sxOfN262Ic2tKYG5UYtRVnbaX40U80DYm1tvoeJfZgTiZmeuky
+7t6PrWhJ+tfKdzK+IGDsIQ3k4k+3AfS8dwDEBbGocFhx+sOG/yv5OhGlZ3dH9toz
+Gq+xrkawoa0hkKKVOFhNINdHcPG0UH7iET779nsgylT/8OGkQG3vLSBkVJ8rAaAh
+j9vKBWdxIG0CAwEAAaNQME4wHQYDVR0OBBYEFMsfty2iwKt5U+WLdsYpgYVX1ZX2
+MB8GA1UdIwQYMBaAFMsfty2iwKt5U+WLdsYpgYVX1ZX2MAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBALv1l6C94e6Xos4DkiIDToLQasO0nQLcq3eZhsa6
+XJgWnBcoe7p4iLXzHzutacwTj/mx+ptbLkyqPzvIsufKeQf3hat5ICtCLZOpOW55
+fPc4GY4TMixEJDzt3L5U89BXVFTSh7aY5KbphD9zQgYcy1IpkEEPtSOL8B8KWdHb
+lrW1AE9p7YLHb4YgtS6NjEN04a1wHug/flcfes4u9DOnmJzSih9p8UtQP86hjiPK
+C9znwLrbbrJANz4D6QSTtTT+qi8iQo68sKXYLyUC10Kp19pq1FMnfY1IkCcBDSip
+hbGdxwd4txkrl52YZyuo14mXRGP/c2lvEO0a1P6IpR2kMj4=
+-----END CERTIFICATE-----

owsd/uproxy-files/etc/ubusx/ubusxDemoCA.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAzuLRGrJW+mVZWbiKhdXsf/mggjqeaUZv55AzinRAG6OHK/C1
+PrPQvQpfDBZEYV1gE0KEF+yL3OYACGBBpHkP9A9EYMiIHr07eIF3YkWrPGjWuQ3+
+dQxtnY6mVdGxyY6zfjJPryFXSi+e/SICvTpvPKhrazE583brYhza0pgblRi1FWdt
+pfjRTzQNibW2+h4l9mBOJmZ66TLu3o+taEn618p3Mr4gYOwhDeTiT7cB9Lx3AMQF
+sahwWHH6w4b/K/k6EaVnd0f22jMar7GuRrChrSGQopU4WE0g10dw8bRQfuIRPvv2
+eyDKVP/w4aRAbe8tIGRUnysBoCGP28oFZ3EgbQIDAQABAoIBACYwBcr4ukdT589A
+2gjkONhSeocvTMg/4S4MFwdqd97iK3Q35SyiwlfyjyLLBWo3cyF6+Kj118c5iS4C
+nns+gWxaWRPIUB/kbBLNSv0PwRDQhTn5VEvEtIMNrrROlZOPzJ/xp3W7IMKn0aAF
+5B2LqLa4m8NYfcrr23zruJSA0S6O4O9+E2ilI0bLwMPmSEbrRhDYvOUUTP5bqWAy
+DUcOZQp26LIbx9B1gBA9XcQADjSR59ZY0vUCh6Rhd9qmJ2ZVAj78hv7yLkGOUOwS
+O9LnvBQjb7AZ9YNntTx/YlNLtbEMLfhv1/tpBZ8jVa9ZvCNBWNmrzpSCIEzhcQUY
+jv+WGyECgYEA718+bHissVTet0kcuC18XCbdg7LelOws9aSo0ZgQaRCr7BjTXNMi
+NrQPira0QmGyWtQ5eoxLw0s44b8ol0I+zwqA9q5bRMvdNUaZxE01ObC0aaZx0Sex
+51exHN7knVyWS94kMGBYQRQW5ElrmOTUUFN9WOVwsIuhx22hUd8XZ4UCgYEA3UHf
+jWzbdWlOw8ZB7hOu6MS46IFuKdztblHu3n+qw65x9i6VHy5yL8+dDOiFa8earpyP
+bPNuDr0URTj6Xu4OzQ04gLXE3SXghSKZPSOq9UoJ56fw6wXq2Dtz5rFGD4Mt+WHR
+/NiWccKSkA+x0bu8ab2hYBIAeURfqSQfAcmiRckCgYEAmTElLBpWuu6L0lTyElTZ
+38fnwB87H6e+Zj7I48ojxnmq7WA99IwSu1ulDqs61bjcghCL8IfU/NkpQCAshBEb
+TTl1q2mOc4rcuPnD8sNOqusRqwOgl7CFxH50lPt459SXQ1qZYnRmRs/qjpMGT0Uz
+M20bLUc5RWM3WAArW9AglFkCgYAdk+XHqSq5SmeeIk3D/tueAFZbtpm8fO08lzVg
+hx6T5CkV6OpEbdgT7iQnipnza46RExrVTMGEtOAV1OUbdaWC4eaQxjvX+G1IPvTP
+SIpdGhWy4y+Aq5zWZTQ8PayI/FdUBDCnJWkPMhyXp5F04Szx0cjV5/IqQ+qp2MtQ
+WN0ZiQKBgQDT7UFw5svbtjzE6pcjImRSDI4BwmA8F6C7bkK3M5mu10k+/kr5jDGG
+xgByyY61TY3TpHKLOmuxqKb3nOy8umPlFt3P7xpYTuV5+dZRrbIFKtDy2uKkYi9E
+N5xyVfanlXhlU7JoJtc2Xtkdjr5SwESHjNSjR8jDG/sd7opjeltOZg==
+-----END RSA PRIVATE KEY-----

owsd/uproxy-files/etc/ubusx/ubusxDemoCA.srl

@@ -0,0 +1 @@
+514CD4028F0A688DAD8236D20F352623455A4D74

owsd/uproxy-files/etc/ubusx/ubusx_demo_only.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeMCFFFM1AKPCmiNrYI20g81JiNFWk10MA0GCSqGSIb3DQEBCwUAMCYx
+JDAiBgNVBAMMG3Jvb3QgQ0EgZm9yIGlvcHN5cyBnYXRld2F5czAeFw0xOTA2MjQx
+NzEwMjhaFw0yOTA2MjExNzEwMjhaME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlT
+dG9ja2hvbG0xFTATBgNVBAoMDGlvcHN5cywgSW5jLjEUMBIGA1UEAwwLVUJVUy1Y
+IERlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDosnAz7cNKUCWZ
+9+qFs8PpV1J1o+Eq6Hv3Bc5ceNrPxcEsE2vDWQdl7QXU9Je++xILSxfvljHIUO7D
+8AOcH03NO3N0F1H4KhmYIRjTKogQL8y/YIGFkzL4bZXwXRtvzXxMYNtdX4Lbdiyc
+AtGTiSWJ3zBtShPGPFqgR4JpYmf3VaVy/f74tRdUL86rnVNaU5OIBMHGLLxwMf2Z
+w3MPKSNj1ATcNoegKvMvHpd7FE2o5lDgFkUV3b8QqcAFTrmLXx6mYYpo9Fo1KHrA
+6SiUP0KQ/lkQ28yfkvzmN4JpJtLpomzscn9nmJfbI5g3GezSGGFHDAyW/Y2c+VPN
+N9C9n/NhAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFEBujnBMhFVqLUPnDM41Cd0
+ZzbY5n/haBN885xQP0tNdCJ9qN0L8dr8bDe1IR02WHZ4UIXzvOj20Nu2+AFP1OCG
+CEEPLTQwlaJhaBzhnfLaxb7XCHqVodKBiYDYLQLFNdY9wYOKvyNI5xXMtPbH5fUK
+GJA4bZTbL5c4iaqtdXwLE/6a9FCtfGsv9k70tPw+KYR4tcA2t3SS2Oe/bGRrj5yQ
+Tjy0P7R033S4GlrsCRa7sRGg8yd7TgNpGsgyncsFRLHDG4V71I9NhOkoHR64oUfT
+YVPt/16TIi31vF5FJO4TJtbA2wEpUWPk7x2VjIOvvauMoYE6Hf3YLatzdaIQNHo=
+-----END CERTIFICATE-----

owsd/uproxy-files/etc/ubusx/ubusx_demo_only.csr

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICkzCCAXsCAQAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEV
+MBMGA1UECgwMaW9wc3lzLCBJbmMuMRQwEgYDVQQDDAtVQlVTLVggRGVtbzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOiycDPtw0pQJZn36oWzw+lXUnWj
+4Sroe/cFzlx42s/FwSwTa8NZB2XtBdT0l777EgtLF++WMchQ7sPwA5wfTc07c3QX
+UfgqGZghGNMqiBAvzL9ggYWTMvhtlfBdG2/NfExg211fgtt2LJwC0ZOJJYnfMG1K
+E8Y8WqBHgmliZ/dVpXL9/vi1F1QvzqudU1pTk4gEwcYsvHAx/ZnDcw8pI2PUBNw2
+h6Aq8y8el3sUTajmUOAWRRXdvxCpwAVOuYtfHqZhimj0WjUoesDpKJQ/QpD+WRDb
+zJ+S/OY3gmkm0umibOxyf2eYl9sjmDcZ7NIYYUcMDJb9jZz5U8030L2f82ECAwEA
+AaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDWLgiuSq41EX4J5v5RH2gE3Ywr1FdzPMMe
+SCJxYL3JOcIvDl0aNyx2bAd9Gc6Zj8uRXT8gDsB3cEgAoHdGjiZB0uoNV/Auz6kS
+mYNnmpcZfAw775cBQpYBZvg2CRFqsv8mD4/OhBmoRjMpoosLkAYPuRmE58U/Ah+6
+9MJIzVca6dn7iLMLVWndkCoD9OUwBZNHU+SGTkn0IKUGyMUTmduADPBGbB7mYg6j
+DQsHiR1v7/ngb3uaQoVS8QA+XYmTUa1UZ+/83cmzjvf17rG10KwrJZh0lQNVUt5d
+gvH8aUvQq92xcXYQlhLfVFkqxmrLZNR0rIEeUVwYvVawPK8ZR+UK
+-----END CERTIFICATE REQUEST-----

owsd/uproxy-files/etc/ubusx/ubusx_demo_only.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA6LJwM+3DSlAlmffqhbPD6VdSdaPhKuh79wXOXHjaz8XBLBNr
+w1kHZe0F1PSXvvsSC0sX75YxyFDuw/ADnB9NzTtzdBdR+CoZmCEY0yqIEC/Mv2CB
+hZMy+G2V8F0bb818TGDbXV+C23YsnALRk4klid8wbUoTxjxaoEeCaWJn91Wlcv3+
++LUXVC/Oq51TWlOTiATBxiy8cDH9mcNzDykjY9QE3DaHoCrzLx6XexRNqOZQ4BZF
+Fd2/EKnABU65i18epmGKaPRaNSh6wOkolD9CkP5ZENvMn5L85jeCaSbS6aJs7HJ/
+Z5iX2yOYNxns0hhhRwwMlv2NnPlTzTfQvZ/zYQIDAQABAoIBAQC+o9IA+T4R1++2
+YMImn8xVk1DfSE/lE2rcSklywSCjMGS+c3rKJFpHSxSID4tyz8dMsUz+4JIQhx3W
+MQEEGzFmftprtd9V7UfittrbxfCLMl4QPERg5uPPXBiHQACGbFb1TDTsHp/apMqP
+Vk/VC3tRpSTLpPDma/PjdDKHnDOJEXXvIiI6lWzDjkFS8cmb+ZChAVJSAVDpM3v5
+OjtH6Cfn7QnlQh5v6OEcScmdHjGKaVstoQnulr9fK632KsWd4DVrPjcs6IYz+AmI
+w6iMVWwfXM4HmtBZKmFZDB+QedvkKj3GoIGW7rbUWWWW5Nvk549SbrV4dFLmGjFe
+Vg2X59yxAoGBAPfOj/f7aJcltV6Guf4jmt0r9fB+wHAl9Vx1Dg0Etg10LJnjbgEI
+2jkvVr4qp71GUg0vTdbAwcX5ha1gjvvLEfH2ikSut7je1L26Lcm7tcyCGnlIIOU5
+gwyLwTFArdmK8yn2gC56I+MOdiqsw3xgvGeLaM39BTdAcDYtnJ2E0ysLAoGBAPBj
+/G30UVQ3bXcPuP2vZHNUSVBRr3Rsi4YO4Ue+pF4y1tcxaEDHYR+WuD03l/Vnu9mK
+xZxHLwQuVjAeogwrzNgbN3CMN9jytGfnwPPG8YOw0umpS7wk4ZBA6wh97R6H8hlI
+6rSZYt2i92rBKEDU0i5ciUnR0pjyy/IUhM9o/L7DAoGBAJqKWKCXSl/QpW5g6QdD
+3yWFb+hes9Z85aqWWX/m6z4ysEn8WrMMeUNmcVtBMMDKZQtR7+I47d9wQFyitijz
+OKrETPCOYYdKeDQmMr33cWYr0STHxbQOjNq7IW18366miAUodEIH6++DKlBs07Dy
+hyyv9VlZLPKLHi+7fEuD9UmHAoGBAL/2OCfdx+xGbsV66rC6FK78Cad383I3E5uz
+2jYeiMcoNeOV8rh3/pjpFKrd8Bzp/1oStQa82VCvZ+f5LlIlz+hqo3Teo+I8vc+T
+g8OnhEkzNNmedXoCwZUeIhGf7XBKAwwp7DLXodl3P7giEvDiggy/nGo0gcXdbPsd
+Y4j1P49dAoGAPlVSKQx+s7zfcUwJMG9AqOXvXUEg9+AJZBn/xqVVwbd0jb/yf1lB
+7Y+3Q3FndrVF/Gd7kTbgIlwI6sk7l0+CN1jjN1WEHgFenz6O4nlwIcdbQRovw/4S
+okAV3yLGjubMCjyKdBP8bpocBcstYdr2PEmrt37XFNhQVL3C8HjdPmU=
+-----END RSA PRIVATE KEY-----

owsd/uproxy-files/etc/uci-defaults/60-owsd-ubusproxy

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# do not create ubusproxy section if it exists already
+[ "$(uci -q get owsd.ubusproxy)" == "ubusproxy" ] && exit 0
+
+uci set owsd.ubusproxy="ubusproxy"
+uci set owsd.ubusproxy.enable="1"
+uci set owsd.ubusproxy.peer_key="/etc/ubusx/ubusx_demo_only.key"
+uci set owsd.ubusproxy.peer_cert="/etc/ubusx/ubusx_demo_only.crt"
+uci set owsd.ubusproxy.peer_ca="/etc/ubusx/ubusxDemoCA.crt"
+uci commit owsd
+
+# do not create wan_https section if it exists already
+[ "$(uci -q get owsd.wan_https)" == "owsd-listen" ] && exit 0
+
+# do not create wan_https section if wan interface doesn't exist
+[ "$(uci -q get network.wan)" == "interface" ] || exit 0
+
+uci set owsd.wan_https="owsd-listen"
+uci set owsd.wan_https.port="443"
+uci set owsd.wan_https.interface="wan"
+uci set owsd.wan_https.key="/etc/ubusx/ubusx_demo_only.key"
+uci set owsd.wan_https.cert="/etc/ubusx/ubusx_demo_only.crt"
+uci set owsd.wan_https.ca="/etc/ubusx/ubusxDemoCA.crt"
+uci set owsd.wan_https.whitelist_interface_as_origin="1"
+uci del_list owsd.wan_https.origin="*"
+uci add_list owsd.wan_https.origin="*"
+uci commit owsd
+

paho-mqtt-c/Makefile

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

peripheral_manager/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # 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:=769430115b6dd984313574c3fa2a6d99c65cd223
+PKG_SOURCE_VERSION:=ba1026896e221cb60751fe2faab002d241f9db74
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 
@@ -20,6 +20,9 @@ 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
 

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=19
+START=12
 STOP=91
 
 USE_PROCD=1

picolisp/Makefile

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

port-management/files/etc/init.d/port_management

@@ -56,7 +56,7 @@ configure_ethports(){
 	config_get speed $name speed
 	config_get ifname $name ifname
 	config_get pause $name pause
-	set_port_speed $ifname $speed
+	set_port_speed $ifname $speed $name
 	set_port_pause $ifname $pause
 }
 
@@ -73,3 +73,8 @@ service_triggers() {
 	procd_add_reload_trigger ports
 }
 
+boot() {
+	wan=$(db -q get hw.board.ethernetWanPort)
+	restart_port $wan
+	start
+}

questd/Makefile

@@ -6,9 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=4.1.0
+PKG_VERSION:=4.1.1
 
-PKG_SOURCE_VERSION:=fdd80766b50fce51f68ff675b0e5398e0d31d3bb
+#PKG_SOURCE_VERSION:=04eb78c28d96801951b204bc434f84d43d4a0d03
+# FIXME
+PKG_SOURCE_VERSION:=qcom
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -16,6 +18,9 @@ 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)
@@ -33,6 +38,8 @@ QUESTD_TARGET:=-DIOPSYS_MEDIATEK
 QUESTD_CFLAGS:=\
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl-tiny
+else ifeq ($(CONFIG_TARGET_ipq),y)
+QUESTD_TARGET:=-DIOPSYS_QCA
 else
 $(info (UNEXPECTED CONFIG TARGET))
 endif
@@ -44,7 +51,7 @@ export QUESTD_CFLAGS
 
 define Package/questd
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl
+	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl +easy-soc-libs
 	TITLE:=router info daemon
 endef
 

questd/files/etc/uci-defaults/996-questd-opreqs

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+add_required_ubusproxy_objects() {
+	uci -q del_list owsd.ubusproxy.object="wifix"
+	uci -q add_list owsd.ubusproxy.object="wifix"
+	uci commit owsd
+}
+
+add_required_ubusproxy_objects
+

rulengd/files/etc/init.d/rulengd

@@ -1,10 +1,7 @@
 #!/bin/sh /etc/rc.common
-#
-# Start the rulengd
-#
 
-START=99
-STOP=01
+START=17
+STOP=11
 
 USE_PROCD=1
 NAME=rulengd

tr098/Config.in

@@ -0,0 +1,11 @@
+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

tr098/Makefile

@@ -0,0 +1,71 @@
+#
+# 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))

uboot/Makefile

@@ -14,10 +14,10 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=c77089efc41ea3292125330221bd5016796631b9
+PKG_SOURCE_VERSION:=19dde95c2bba420d5ead96b0dd5aea8dc7979ec0
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
-PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
+PKG_SOURCE_VERSION:=670ad7a30f3c6871b6c8a972e19ca2dd78ea8c9b
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -46,7 +46,7 @@ UBOOT_IMG:=uboot.img
 define uboot/ex400
   TITLE:=U-Boot for the ex400
   DEPENDS:=@TARGET_iopsys_ramips
-  PKG_RELEASE:=6
+  PKG_RELEASE:=7
 endef
 
 define uboot/sdx810_ap
@@ -74,7 +74,7 @@ define uboot/grx500_norrland
   TITLE:=U-Boot for Norrland Board
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=14
+  PKG_RELEASE:=15
 endef
 
 UBOOTS := \

uspd/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.3
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e8ee6a35751e661dd621b8b5c4cb788fe2081f58
+PKG_SOURCE_VERSION:=e570b892c5ff57c908ca36b86dc3cd75c0acea0f
 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 +icwmp-curl
+  DEPENDS:=+libubox +ubus +libbbfdm
 endef
 
 define Package/uspd/description
@@ -38,7 +38,9 @@ TARGET_CFLAGS += \
 
 define Package/uspd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_BIN) ./files/uspd.init $(1)/etc/init.d/uspd
+	$(INSTALL_CONF) ./files/uspd.config $(1)/etc/config/uspd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef

uspd/files/uspd.config

@@ -0,0 +1,2 @@
+config uspd 'usp'
+	option granularitylevel  '0'

uspd/files/uspd.init

@@ -17,3 +17,9 @@ reload_service() {
 	stop
 	start
 }
+
+service_triggers()
+{
+	procd_add_reload_trigger "cwmp"
+	procd_add_config_trigger "config.change" "uspd" /etc/init.d/uspd restart
+}

voice-client/Makefile

@@ -57,6 +57,7 @@ ifeq ($(CONFIG_TARGET_intel_mips),y)
 	-e 's/brcm/tapi/g' \
 	-e 's/BRCM/TAPI/g' \
 	-e 's/broadcom/intel/g' \
+	-e 's/SWE/ETS/g' \
 	$(1)/etc/config/voice_client \
 	$(1)/etc/asterisk_templates/*
 	sed -i \