From 1da95ba8c2851b84a915a04bbdb2d2861768fd10 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Thu, 4 May 2023 16:51:14 +0530
Subject: [PATCH] sulu: 2.1.5

---
 sulu/sulu-base/Makefile                  | 4 ++--
 sulu/sulu-builder/Makefile               | 4 ++--
 sulu/sulu-builder/files/etc/sulu/sulu.sh | 6 ++++++
 sulu/sulu-multi-ap/Makefile              | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sulu/sulu-base/Makefile b/sulu/sulu-base/Makefile
index dfd0de7ca..8d474496f 100644
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.1.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=a910afbc0b0e812155a445fb6be5c0e41d2b2c3b
+PKG_SOURCE_VERSION:=6b3abc2e7477623bb810c08cc2b3bb64d7e98add
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core
diff --git a/sulu/sulu-builder/Makefile b/sulu/sulu-builder/Makefile
index 0df62f355..e0d28cc0d 100644
--- a/sulu/sulu-builder/Makefile
+++ b/sulu/sulu-builder/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.1.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=472f75509965b297bdeaf07c21d02c813dd25763
+PKG_SOURCE_VERSION:=e9a7903c71f5fc6e15cb0ccd4092d52073323ae0
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)
diff --git a/sulu/sulu-builder/files/etc/sulu/sulu.sh b/sulu/sulu-builder/files/etc/sulu/sulu.sh
index c298172b6..467550f22 100644
--- a/sulu/sulu-builder/files/etc/sulu/sulu.sh
+++ b/sulu/sulu-builder/files/etc/sulu/sulu.sh
@@ -111,6 +111,7 @@ function generate_sulu_conn_config()
 		json_add_string 'toId' "$(_get_endpoint_id)";
 		json_add_int 'port' "$(_get_sulu_tls_port)";
 		json_add_string 'path' "/ws";
+		json_add_boolean 'useSession' 1;
 		json_add_string 'protocol' 'wss';
 			json_add_array 'auth';
 			json_close_array;
@@ -266,6 +267,11 @@ function _update_obuspa_config_rbac() {
 			uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller"
 			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
 			uci_set obuspa ${sec} assigned_role_name "$f"
+			uci_set obuspa ${sec} SessionMode "Require"
+			restart=1
+		fi
+		if ! uci_get obuspa ${sec} SessionMode >/dev/null 2>&1; then
+			uci_set obuspa ${sec} SessionMode "Require"
 			restart=1
 		fi
 	done
diff --git a/sulu/sulu-multi-ap/Makefile b/sulu/sulu-multi-ap/Makefile
index 906eb1230..fc25353e3 100644
--- a/sulu/sulu-multi-ap/Makefile
+++ b/sulu/sulu-multi-ap/Makefile
@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.1.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=95ebfae55435b328f40fc753877fd62bf2e254f8
+PKG_SOURCE_VERSION:=26ab5ba51ea54b805d848ccd698b5d099bc57322
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk