diff --git a/dae/Makefile b/dae/Makefile index 19a75119..eb7cb1ea 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae -PKG_VERSION:=2026.08.03 +PKG_VERSION:=2026.08.04 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=28872b0b421d9ebfc17b6279d190dedb70c51904 +PKG_SOURCE_VERSION:=1ddfd8fbf4e1da5b9a23eb3ce631df95fc23a33e PKG_SOURCE_URL:=https://github.com/olicesx/dae.git PKG_MIRROR_HASH:=skip diff --git a/luci-app-nikki/root/usr/share/rpcd/ucode/luci.nikki b/luci-app-nikki/root/usr/share/rpcd/ucode/luci.nikki index 1aac65f0..9f205e36 100644 --- a/luci-app-nikki/root/usr/share/rpcd/ucode/luci.nikki +++ b/luci-app-nikki/root/usr/share/rpcd/ucode/luci.nikki @@ -82,7 +82,7 @@ const methods = { const protocol = api_tls_listen ? 'https' : 'http'; - const url = api_listen + path; + const url = (api_tls_listen ?? api_listen) + path; const process = popen(`curl --proto-default '${protocol}' --insecure --request '${method}' --oauth2-bearer '${api_secret}' --url-query '${query}' --data '${body}' '${url}'`); if (process) { diff --git a/luci-app-passwall/root/usr/share/passwall/utils.sh b/luci-app-passwall/root/usr/share/passwall/utils.sh index c5fc7275..167d18ae 100755 --- a/luci-app-passwall/root/usr/share/passwall/utils.sh +++ b/luci-app-passwall/root/usr/share/passwall/utils.sh @@ -475,7 +475,10 @@ ln_run() { [ -x "${file_func}" ] || echolog " - $(readlink ${file_func}) 没有执行权限,无法启动:${file_func} $*" fi #echo "${file_func} $*" >&2 - [ -n "${file_func}" ] || echolog " - 找不到 ${ln_name},无法启动..." + [ -n "${file_func}" ] || { + echolog " - 找不到 ${ln_name},无法启动..." + return 1 + } [ "${output}" != "/dev/null" ] && [ -n "$(echo "${output}" | grep -E "default|SOCKS_")" ] && [ "${ln_name}" != "chinadns-ng" ] && { local persist_log_path=$(config_t_get global persist_log_path) local sys_log=$(config_t_get global sys_log "0") diff --git a/luci-app-passwall2/root/usr/share/passwall2/utils.sh b/luci-app-passwall2/root/usr/share/passwall2/utils.sh index fe15aa9d..c969936b 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/utils.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/utils.sh @@ -388,7 +388,10 @@ ln_run() { [ -x "${file_func}" ] || log 1 "$(i18n "%s does not have execute permissions and cannot be started: %s %s" "$(readlink ${file_func})" "${file_func}" "$*")" fi #echo "${file_func} $*" >&2 - [ -n "${file_func}" ] || log 1 "$(i18n "%s not found, unable to start..." "${ln_name}")" + [ -n "${file_func}" ] || { + log 1 "$(i18n "%s not found, unable to start..." "${ln_name}")" + return 1 + } [ "${queue_run}" == "1" ] && { mkdir -p $TMP_PROCESS_LIST_PATH diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 7d181839..f6134eca 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=b71d1999439dde2de2d2b6844a2befa50c50211ff739785c005ca7c230a17d6a endef -GEOSITE_VER:=20260801163240 +GEOSITE_VER:=20260804035612 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=d0288dd63ac15195655766da1b49925d05f001aaa30783a5d51c805c4b989fbe + HASH:=9e777df11bd5db511459c8cd93be34998ab136f9443f4fc52bcecb081582ad64 endef GEOSITE_IRAN_VER:=202608030119