diff --git a/ddnsgo/Makefile b/ddnsgo/Makefile index 2a1656691..47a42d0cd 100644 --- a/ddnsgo/Makefile +++ b/ddnsgo/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddnsgo -PKG_VERSION:=5.1.1 +PKG_VERSION:=5.2.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/jeessy2/ddns-go.git -PKG_MIRROR_HASH:=1a7a7c1c51a18692229dec6c3556528593706e2ce70f712f2a2f7e005c9873d8 -PKG_SOURCE_VERSION:=39bfef88d63dd00e667a4ceceb2df80ba0bafe6c +PKG_MIRROR_HASH:=eba198057947a8a4b5e249d7afd8960f26658b569bf09a5bd731ad59e8f64eb6 +PKG_SOURCE_VERSION:=73ea376ce70d25e29241526520af2758f80db7e6 PKG_LICENSE:=AGPL-3.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index ff381ca3b..dac97473b 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.178 +PKG_VERSION:=3.1.180 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh index a8e289f1a..88db2a034 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh @@ -141,7 +141,8 @@ check_updated() { jq '.[]' | jq -s --arg RTK "${releases_tag_keywords}" '.[] | select(.tag_name | contains($RTK))' | jq -s '.[].assets[] | {data:.updated_at, url:.browser_download_url}' | - jq -s --arg BOARD "_${BOARD}_" --arg MLV "${main_line_version}." '.[] | select((.url | contains($BOARD)) and (.url | contains($MLV)))' | + jq -s --arg BOARD "_${BOARD}_" --arg MLV "${main_line_version}." --arg FSX "${firmware_suffix}" \ + '.[] | select((.url | contains($BOARD)) and (.url | contains($MLV)) and (.url | endswith($FSX)))' | jq -s 'sort_by(.data)|reverse[]' | jq -s '.[0]' -c )" @@ -212,12 +213,21 @@ download_firmware() { shafile_path="$(echo ${opfile_path} | awk -F'/' '{print $1}')" shafile_file="https://github.com/${server_firmware_url}/releases/download/${shafile_path}/sha256sums" # Download sha256sums file - if wget "${shafile_file}" -q -O "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" 2>/dev/null; then - tolog "03.03 Sha256sums downloaded successfully." - releases_firmware_sha256sums="$(cat sha256sums | grep ${firmware_download_oldname##*/} | awk '{print $1}')" - download_firmware_sha256sums="$(sha256sum ${firmware_download_name} | awk '{print $1}')" - [[ -n "${releases_firmware_sha256sums}" && "${releases_firmware_sha256sums}" != "${download_firmware_sha256sums}" ]] && tolog "03.04 The sha256sum check is different." "1" + if wget "${latest_url}.sha" -q -O "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" 2>/dev/null; then + tolog "03.03 sha file downloaded successfully." + elif wget "${shafile_file}" -q -O "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" 2>/dev/null; then + tolog "03.04 sha256sums file downloaded successfully." fi + # If there is a sha256sum file, compare it + [[ -s "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" ]] && { + releases_firmware_sha256sums="$(cat ${FIRMWARE_DOWNLOAD_PATH}/sha256sums | grep ${firmware_download_oldname##*/} | awk '{print $1}')" + download_firmware_sha256sums="$(sha256sum ${FIRMWARE_DOWNLOAD_PATH}/${firmware_download_name} | awk '{print $1}')" + if [[ -n "${releases_firmware_sha256sums}" && "${releases_firmware_sha256sums}" != "${download_firmware_sha256sums}" ]]; then + tolog "03.05 sha256sum verification mismatched." "1" + else + tolog "03.06 sha256sum verification succeeded." + fi + } sync && sleep 3 tolog "You can update."