From 40ef2519484d20dd9c3c02274f091e20f0bb9ba0 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 23 Apr 2024 17:42:23 +0530
Subject: [PATCH] Revert "obuspa: option to use system ca-bundle"

This reverts commit 8a759a67e4b126c6ed7aa08bf82b930fa2d6b1cc.
---
 obuspa/Config.in                               |  4 ----
 obuspa/Makefile                                | 10 ++--------
 obuspa/files/etc/config/obuspa                 |  2 +-
 .../70-configure-default-ca-bundle             | 18 ------------------
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 obuspa/files/etc/uci-defaults/70-configure-default-ca-bundle

diff --git a/obuspa/Config.in b/obuspa/Config.in
index dc31886b5..7882cdbc9 100644
--- a/obuspa/Config.in
+++ b/obuspa/Config.in
@@ -30,8 +30,4 @@ config OBUSPA_MAX_CONTROLLERS_NUM
 	help
 	 This value must be in range of 1 to 10. (default 5)
 
-config OBUSPA_USE_CA_BUNDLE
-	bool "Use ca bundle from ca-certificates as trusted certificates in usp"
-	default y
-
 endif
diff --git a/obuspa/Makefile b/obuspa/Makefile
index 931c084b3..9bd28f43d 100644
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.23
+PKG_VERSION:=7.0.5.22
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -32,10 +32,7 @@ define Package/obuspa
   SUBMENU:=TRx69
   TITLE:=USP agent
   MENU:=1
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
-ifeq ($(CONFIG_OBUSPA_USE_CA_BUNDLE),y)
-  DEPENDS+=+ca-certificates
-endif
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates
 endef
 
 define Package/obuspa/description
@@ -115,9 +112,6 @@ ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
 	$(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/
 endif
-ifeq ($(CONFIG_OBUSPA_USE_CA_BUNDLE),y)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/70-configure-default-ca-bundle $(1)/etc/uci-defaults/
-endif
 endef
 
 $(eval $(call BuildPackage,obuspa))
diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa
index 05253dc91..2f9087cf4 100644
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -7,7 +7,7 @@ config obuspa 'global'
 	option db_file '/etc/obuspa/usp.db'
 	option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
-	#option trust_cert '/etc/ssl/cert.pem'
+	option trust_cert '/etc/ssl/cert.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/tmp/obuspa.log'
 
diff --git a/obuspa/files/etc/uci-defaults/70-configure-default-ca-bundle b/obuspa/files/etc/uci-defaults/70-configure-default-ca-bundle
deleted file mode 100644
index 0ce91640e..000000000
--- a/obuspa/files/etc/uci-defaults/70-configure-default-ca-bundle
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-CA="/etc/ssl/cert.pem"
-
-if [ ! -f "/etc/config/obuspa" ]; then
-	echo "Local obuspa not available"
-	return 0
-fi
-
-uci_load obuspa
-bundle="$(uci_get obuspa global trust_cert)"
-if [ -z "${bundle}" ]; then
-	if [ -f "${CA}" ]; then
-		uci_set obuspa global trust_cert "${CA}"
-	fi
-fi