update 2023-06-12 16:22:37
This commit is contained in:
github-actions[bot]
parent
93fd7b5222
commit
f2991d54a4
|
|
@ -5,12 +5,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=hysteria
|
||||
PKG_VERSION:=1.3.4
|
||||
PKG_VERSION:=1.3.5
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=13862594252dcea83d791b0cf8234874154ba623f22d94cef685561a710717c1
|
||||
PKG_HASH:=9b3b5fca069d215a1f4c9cf3aa0a7b4e9b1fe21216fddb483a20ab42eb4a4dd7
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILE:=LICENSE
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-amlogic
|
||||
PKG_VERSION:=3.1.188
|
||||
PKG_VERSION:=3.1.189
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0 License
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ check_updated() {
|
|||
# Check if the response is empty or an error occurred
|
||||
if [[ -z "${response}" ]] || [[ "${response}" == *"Not Found"* ]]; then
|
||||
tolog "02.01 Invalid OpenWrt download address." "1"
|
||||
break
|
||||
else
|
||||
# Filter the results and save them to the file
|
||||
echo "${response}" |
|
||||
|
|
|
|||
|
|
@ -174,19 +174,22 @@ download_kernel() {
|
|||
fi
|
||||
|
||||
# Delete other residual kernel files
|
||||
rm -f ${KERNEL_DOWNLOAD_PATH}/*.tar.gz 2>/dev/null && sync
|
||||
rm -f ${KERNEL_DOWNLOAD_PATH}/sha256sums 2>/dev/null && sync
|
||||
rm -f ${KERNEL_DOWNLOAD_PATH}/*.tar.gz
|
||||
rm -f ${KERNEL_DOWNLOAD_PATH}/sha256sums
|
||||
rm -rf ${KERNEL_DOWNLOAD_PATH}/${download_version}*
|
||||
|
||||
kernel_down_from="https://github.com/${kernel_repo}/releases/download/kernel_${kernel_tag}/${download_version}.tar.gz"
|
||||
wget "${kernel_down_from}" -q -P "${KERNEL_DOWNLOAD_PATH}"
|
||||
[[ "${?}" -ne "0" ]] && tolog "03.03 The kernel download failed." "1"
|
||||
|
||||
tar -xf "${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz" -C "${KERNEL_DOWNLOAD_PATH}"
|
||||
tar -xzf ${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz -C ${KERNEL_DOWNLOAD_PATH}
|
||||
[[ "${?}" -ne "0" ]] && tolog "03.04 Kernel decompression failed." "1"
|
||||
mv -f ${KERNEL_DOWNLOAD_PATH}/${download_version}/* -t ${KERNEL_DOWNLOAD_PATH}
|
||||
mv -f ${KERNEL_DOWNLOAD_PATH}/${download_version}/* ${KERNEL_DOWNLOAD_PATH}/
|
||||
|
||||
sync && sleep 3
|
||||
rm -rf "${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz" "${KERNEL_DOWNLOAD_PATH}/${download_version}"
|
||||
# Delete the downloaded kernel file
|
||||
rm -f ${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz
|
||||
rm -rf ${KERNEL_DOWNLOAD_PATH}/${download_version}
|
||||
|
||||
tolog "03.05 The kernel is ready, you can update."
|
||||
sleep 2
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ while true; do
|
|||
# Check if the response is empty or an error occurred
|
||||
if [[ -z "${response}" ]] || [[ "${response}" == *"Not Found"* ]]; then
|
||||
tolog "02.01 Query failed, please try again." "1"
|
||||
break
|
||||
else
|
||||
echo "${response}" |
|
||||
jq -r '.[].tag_name' | sort -rV \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-wechatpush
|
||||
PKG_VERSION:=3.2.0
|
||||
PKG_VERSION:=3.2.1
|
||||
PKG_RELEASE:=12
|
||||
|
||||
PKG_MAINTAINER:=tty228 <tty228@yeah.net>
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,7 @@ function login_send(){
|
|||
sys_log=$(logread notice)
|
||||
|
||||
# Web 登录提醒
|
||||
for login_ip in `cat ${dir}web_login | sort -u`; do
|
||||
[ -f ${dir}web_login ] && for login_ip in `cat ${dir}web_login | sort -u`; do
|
||||
[ -z "$login_ip" ] && continue
|
||||
local login_time=$(echo "$sys_log" | grep -w ${login_ip} | awk '{print $4}' | tail -n 1)
|
||||
local login_mode=$(echo "$sys_log" | grep -w ${login_ip} | awk '{print $13}' | tail -n 1)
|
||||
|
|
@ -1142,10 +1142,10 @@ function login_send(){
|
|||
fi
|
||||
echo "`date "+%Y-%m-%d"` ${login_time} ${disturb_text}设备 ${login_ip} (${login_ip_attribution}) 通过 Web ${login_mode} 登录了路由器 " >> ${logfile}
|
||||
done
|
||||
echo "" > ${dir}web_login
|
||||
rm -f ${dir}web_login >/dev/null 2>&1
|
||||
unset login_ip login_time login_mode
|
||||
# SSH 登录提醒
|
||||
for login_ip in `cat ${dir}ssh_login | sort -u`; do
|
||||
[ -f ${dir}ssh_login ] && for login_ip in `cat ${dir}ssh_login | sort -u`; do
|
||||
[ -z "$login_ip" ] && continue
|
||||
local login_time=$(echo "$sys_log" | grep -w ${login_ip} | awk '{print $4}' | tail -n 1)
|
||||
local login_mode=$(echo "$sys_log" | grep -w ${login_ip} | awk '{print $8}' | tail -n 1)
|
||||
|
|
@ -1175,10 +1175,10 @@ function login_send(){
|
|||
fi
|
||||
echo "`date "+%Y-%m-%d"` ${login_time} ${disturb_text}设备 ${login_ip} (${login_ip_attribution}) 通过 SSH ${login_mode} 登录了路由器 " >> ${logfile}
|
||||
done
|
||||
echo "" > ${dir}ssh_login
|
||||
rm -f ${dir}ssh_login >/dev/null 2>&1
|
||||
unset login_ip login_time login_mode
|
||||
# Web 非法登录
|
||||
for login_ip in `cat ${dir}web_failed | sort -u`; do
|
||||
[ -f ${dir}web_failed ] && for login_ip in `cat ${dir}web_failed | sort -u`; do
|
||||
[ -z "$login_ip" ] && continue
|
||||
login_ip_attribution=$(get_ip_attribution ${login_ip})
|
||||
[ -n "$login_ip_attribution" ] && content_attribution="${str_linefeed}${str_tab}IP 归属地： ${str_space}${str_space}${str_space}${str_space}${login_ip_attribution}" || unset content_attribution
|
||||
|
|
@ -1195,10 +1195,10 @@ function login_send(){
|
|||
content="${content}${str_splitline}${str_title_start} 登录信息${str_title_end}${str_linefeed}${str_tab}设备 IP： ${str_space}${str_space}${str_space}${str_space}${login_ip}${content_attribution}"
|
||||
fi
|
||||
done
|
||||
echo "" > ${dir}web_failed
|
||||
rm -f ${dir}web_failed >/dev/null 2>&1
|
||||
unset login_ip
|
||||
# SSH 非法登录
|
||||
for login_ip in `cat ${dir}ssh_failed | sort -u`; do
|
||||
[ -f ${dir}ssh_failed ] && for login_ip in `cat ${dir}ssh_failed | sort -u`; do
|
||||
[ -z "$login_ip" ] && continue
|
||||
login_ip_attribution=$(get_ip_attribution ${login_ip})
|
||||
[ -n "$login_ip_attribution" ] && content_attribution="${str_linefeed}${str_tab}IP 归属地： ${str_space}${str_space}${str_space}${str_space}${login_ip_attribution}" || unset content_attribution
|
||||
|
|
@ -1215,7 +1215,7 @@ function login_send(){
|
|||
content="${content}${str_splitline}${str_title_start} 登录信息${str_title_end}${str_linefeed}${str_tab}设备 IP： ${str_space}${str_space}${str_space}${str_space}${login_ip}${content_attribution}"
|
||||
fi
|
||||
done
|
||||
echo "" > ${dir}ssh_failed
|
||||
rm -f ${dir}ssh_failed >/dev/null 2>&1
|
||||
unset login_ip
|
||||
}
|
||||
|
||||
|
|
@ -1517,7 +1517,7 @@ if [ -n "$web_logged" ] || [ -n "$ssh_logged" ] || [ -n "$web_login_failed" ] ||
|
|||
declare -A web_failed_counts
|
||||
declare -A ssh_failed_counts
|
||||
[ -f ${dir}child_pid ] && child_pid=$(cat ${dir}child_pid)
|
||||
[ -n "$child_pid" ] && kill $child_pid
|
||||
[ -n "$child_pid" ] && kill $child_pid >/dev/null 2>&1
|
||||
(
|
||||
logread -f -p notice | while IFS= read -r line; do
|
||||
[ -n "$web_logged" ] && {
|
||||
|
|
|
|||
Loading…
Reference in New Issue