diff --git a/dnsproxy/Makefile b/dnsproxy/Makefile index 69767204b..451af52ae 100644 --- a/dnsproxy/Makefile +++ b/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.74.1 +PKG_VERSION:=0.75.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b90d987a934ee2272f7c0923629e3922786b3cca2178854ab0d403e05617e4b9 +PKG_HASH:=ba4c6a58024cbfb8e823470862019d071a64abb3d29aa956237f0042c8e6f9b6 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/dnsproxy/files/dnsproxy.init b/dnsproxy/files/dnsproxy.init index 86062d142..71a95f24f 100644 --- a/dnsproxy/files/dnsproxy.init +++ b/dnsproxy/files/dnsproxy.init @@ -128,9 +128,9 @@ start_service() { # This must be set at last, all other options set after this will be ignored is_enabled "hosts" "enabled" && { - append_param "--hosts-file-enabled" "true" + append_param "--hosts-file-enabled=true" config_list_foreach "hosts" "hosts_files" "append_param '--hosts-files'" - } || append_param "--hosts-file-enabled" "false" + } || append_param "--hosts-file-enabled=false" procd_set_param respawn procd_set_param stdout 1 diff --git a/haproxy/Makefile b/haproxy/Makefile index 674487433..574fe2bb2 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=3.0.7 +PKG_VERSION:=3.0.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src -PKG_HASH:=5c5c6b66645278435a89cd6e2a0d39f8e7d2546212d847bd0d236511ff996f11 +PKG_HASH:=930ae2c33058e1f497fe62cdaacffab6cab6a91e31ba011a9a2f9fe6c5c4aebc PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index 1bc7e970a..bf48aee75 100755 --- a/haproxy/get-latest-patches.sh +++ b/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git -BASE_TAG=v3.0.7 +BASE_TAG=v3.0.8 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/luci-app-nekobox/htdocs/nekobox/download.php b/luci-app-nekobox/htdocs/nekobox/download.php index 74303eb6c..04b61b92c 100644 --- a/luci-app-nekobox/htdocs/nekobox/download.php +++ b/luci-app-nekobox/htdocs/nekobox/download.php @@ -1,8 +1,28 @@ alert('OpenWRT 剩余空间: " . round($availableSpaceInMB, 2) . " MB');"; + + if ($availableSpace < $threshold) { + echo ""; + exit; + } + if (isset($_FILES['imageFile']) && is_array($_FILES['imageFile']['error'])) { $targetDir = $_SERVER['DOCUMENT_ROOT'] . '/nekobox/assets/Pictures/'; - + if (!file_exists($targetDir)) { mkdir($targetDir, 0777, true); } diff --git a/luci-app-nekobox/htdocs/nekobox/ping.php b/luci-app-nekobox/htdocs/nekobox/ping.php index 5cef12279..ca4cb747c 100644 --- a/luci-app-nekobox/htdocs/nekobox/ping.php +++ b/luci-app-nekobox/htdocs/nekobox/ping.php @@ -1,3 +1,21 @@ + +