From a77abd40641e83aae3c4bf0cfa89654e91e56cea Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 24 Jun 2021 13:30:34 +0800 Subject: [PATCH] ddns-scripts_dnspod: fix dependence --- package/lean/ddns-scripts_aliyun/Makefile | 4 ++-- .../lean/ddns-scripts_aliyun/update_aliyun_com.sh | 12 ++++++------ package/lean/ddns-scripts_dnspod/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/lean/ddns-scripts_aliyun/Makefile b/package/lean/ddns-scripts_aliyun/Makefile index f90c05f98..b26f436b2 100644 --- a/package/lean/ddns-scripts_aliyun/Makefile +++ b/package/lean/ddns-scripts_aliyun/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_aliyun PKG_VERSION:=1.0.3 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Sense @@ -17,7 +17,7 @@ define Package/$(PKG_NAME) SUBMENU:=IP Addresses and Names TITLE:=DDNS extension for AliYun.com PKGARCH:=all - DEPENDS:=+ddns-scripts +uclient-fetch +libustream-openssl +openssl-util + DEPENDS:=+ddns-scripts +wget-ssl +openssl-util endef define Package/$(PKG_NAME)/description diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh index 52a00aff0..96d5ff49a 100755 --- a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh +++ b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh @@ -17,8 +17,8 @@ [ -z "$password" ] && write_log 14 "配置错误!保存阿里云API访问密钥的'密码'不能为空" # 检查外部调用工具 -WGET_SSL='uclient-fetch' -[ -n "$WGET_SSL" ] || write_log 13 "使用阿里云API需要 uclient-fetch 支持,请先安装" +WGET_SSL='wget' +[ -n "$WGET_SSL" ] || write_log 13 "使用阿里云API需要 GNU Wget 支持,请先安装" command -v sed >/dev/null 2>&1 || write_log 13 "使用阿里云API需要 sed 支持,请先安装" command -v openssl >/dev/null 2>&1 || write_log 13 "使用阿里云API需要 openssl-util 支持,请先安装" @@ -42,7 +42,7 @@ __DOMAIN="${domain#*@}" # 构造基本通信命令 build_command() { - __CMDBASE="$WGET_SSL -q -O $DATFILE" + __CMDBASE="$WGET_SSL --no-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # 绑定用于通信的主机/IP if [ -n "$bind_network" ]; then local bind_ip run_prog @@ -50,7 +50,7 @@ build_command() { eval "$run_prog bind_ip $bind_network" || \ write_log 13 "无法使用 '$run_prog $bind_network' 获取本地IP地址 - 错误代码: '$?'" write_log 7 "强制使用IP '$bind_ip' 通信" - write_log 14 "uclient-fetch: FORCE binding to specific address not supported" + __CMDBASE="$__CMDBASE --bind-address=$bind_ip" fi # 强制设定IP版本 if [ $force_ipversion -eq 1 ]; then @@ -82,7 +82,7 @@ aliyun_transfer() { while : ; do build_Request $__PARAM - __RUNPROG="$__CMDBASE '${__URLBASE}?${__URLARGS}' 2>$ERRFILE" + __RUNPROG="$__CMDBASE '${__URLBASE}?${__URLARGS}'" write_log 7 "#> $__RUNPROG" eval $__RUNPROG @@ -245,4 +245,4 @@ else [ $(( $ret & 4 )) -ne 0 ] && sleep 3 && update_domain fi -return 0 \ No newline at end of file +return 0 diff --git a/package/lean/ddns-scripts_dnspod/Makefile b/package/lean/ddns-scripts_dnspod/Makefile index 3afb379a7..baecd31a0 100644 --- a/package/lean/ddns-scripts_dnspod/Makefile +++ b/package/lean/ddns-scripts_dnspod/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_dnspod PKG_VERSION:=1.0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Small_5 @@ -17,7 +17,7 @@ define Package/$(PKG_NAME) SUBMENU:=IP Addresses and Names TITLE:=DDNS extension for Dnspod.com/Dnspod.cn PKGARCH:=all - DEPENDS:=+ddns-scripts +wget + DEPENDS:=+ddns-scripts +wget-ssl +ca-bundle endef define Package/$(PKG_NAME)/description