From f6510849d6ec8578463ae6c06a548ec922edd231 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Mon, 28 Apr 2025 19:22:33 +0530
Subject: [PATCH] usermngr: Remove deprecated RemoteAccessCapable

---
 usermngr/Makefile               |  4 ++--
 usermngr/files/etc/config/users | 17 ++---------------
 usermngr/files/etc/init.d/users | 13 +++++++++++--
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/usermngr/Makefile b/usermngr/Makefile
index 9aac0010b..1a91607a4 100644
--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.3.7
+PKG_VERSION:=1.3.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=b6f34ac20c3a7ebdb500a6a9cb44a6d139925734
+PKG_SOURCE_VERSION:=fa6a85c147ba0f45d697b2e6bde9039c3b0d4c98
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/usermngr/files/etc/config/users b/usermngr/files/etc/config/users
index 849fdbc76..b232f517f 100644
--- a/usermngr/files/etc/config/users
+++ b/usermngr/files/etc/config/users
@@ -1,17 +1,4 @@
-config user 'admin'
-        option enabled '1'
-        option remote_access '1'
-
-config user 'user'
-        option enabled '1'
-        option remote_access '1'
-
-config role 'full_access'
+config users 'users'
 	option enabled '1'
-	option role_id '1'
-	option name 'full_access'
+	option loglevel '3'
 
-config role 'untrusted'
-	option enabled '1'
-	option role_id '2'
-	option name 'Untrusted'
diff --git a/usermngr/files/etc/init.d/users b/usermngr/files/etc/init.d/users
index b3b0c8814..793f4c052 100755
--- a/usermngr/files/etc/init.d/users
+++ b/usermngr/files/etc/init.d/users
@@ -7,14 +7,23 @@ USE_PROCD=1
 PROG=/usr/sbin/usermngr
 
 start_service() {
-	procd_open_instance usermngr_dm
+	local loglevel
+
+	loglevel="$(uci -q get users.users.loglevel)"
+
+	procd_open_instance usermngr
 	procd_set_param command $PROG
+
+	if [ -n "${loglevel}" ]; then
+		procd_append_param command -l "${loglevel}"
+	fi
+
 	procd_set_param respawn
 	procd_close_instance
 }
 
 reload_service() {
-	ret=$(ubus call service list '{"name":"users"}' | jsonfilter -qe '@.users.instances.usermngr_dm.running')
+	ret=$(ubus call service list '{"name":"users"}' | jsonfilter -qe '@.users.instances.usermngr.running')
 	if [ "$ret" != "true" ]; then
 		stop
 		start