IPKG_INSTROOT and ubus fixes

Author: stangri

Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https-dns-proxy
 PKG_VERSION:=2025.09.11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/baranyaib90/https_dns_proxy/

files/etc/init.d/https-dns-proxy

@@ -9,8 +9,6 @@ STOP=15
 # shellcheck disable=SC2034
 USE_PROCD=1
 
-[ -n "${IPKG_INSTROOT}" ] && return 0
-
 if type extra_command 1>/dev/null 2>&1; then
 	extra_command 'version' 'Show version information'
 else
@@ -30,6 +28,16 @@ readonly DEFAULT_BOOTSTRAP="${BOOTSTRAP_CF},${BOOTSTRAP_GOOGLE}"
 readonly canaryDomainsMozilla='use-application-dns.net'
 readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com'
 
+# Silence "Command failed: Not found" for redundant procd service delete calls
+__UBUS_BIN="$(command -v ubus || echo /bin/ubus)"
+ubus() {
+	if [ "$1" = "call" ] && [ "$2" = "service" ] && [ "$3" = "delete" ]; then
+		"$__UBUS_BIN" "$@" >/dev/null 2>&1 || true
+	else
+		"$__UBUS_BIN" "$@"
+	fi
+}
+
 hdp_boot_flag=
 
 # package global config variables
@@ -362,7 +370,7 @@ service_triggers() {
 		output "Setting trigger (on_boot) "
 		procd_add_raw_trigger "interface.*.up" 5000 "/etc/init.d/${packageName}" restart 'on_interface_up' && output_okn || output_failn
 	else
-		. /lib/functions/network.sh
+		. "${IPKG_INSTROOT}/lib/functions/network.sh"
 		network_flush_cache
 		network_find_wan wan
 		wan="${wan:-wan}"

files/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+
+
 sed -i "s|update_dnsmasq_config|dnsmasq_config_update|" "/etc/config/https-dns-proxy"
 sed -i "s|wan6_trigger|procd_trigger_wan6|" "/etc/config/https-dns-proxy"
 sed -i "s|procd_fw_src_interfaces|force_dns_src_interface|" "/etc/config/https-dns-proxy"