update 2025-02-12 20:38:15

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 <cnsztl@immortalwrt.org>
 PKG_LICENSE:=Apache-2.0

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

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 <heil@terminal-consulting.de>, \
 		Christian Lachner <gladiac@gmail.com>

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
 

luci-app-nekobox/htdocs/nekobox/download.php

@@ -1,8 +1,28 @@
 <?php
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $dfOutput = [];
+    exec('df /', $dfOutput);
+
+    $availableSpace = 0;
+    if (isset($dfOutput[1])) {
+        $dfData = preg_split('/\s+/', $dfOutput[1]);
+        $availableSpace = $dfData[3] * 1024;
+    }
+
+    $availableSpaceInMB = $availableSpace / 1024 / 1024;
+
+    $threshold = 50 * 1024 * 1024;
+
+    echo "<script>alert('OpenWRT 剩余空间: " . round($availableSpaceInMB, 2) . " MB');</script>";
+
+    if ($availableSpace < $threshold) {
+        echo "<script>alert('空间不足，上传操作已停止！');</script>";
+        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);
         }

luci-app-nekobox/htdocs/nekobox/ping.php

@@ -1,3 +1,21 @@
+<?php
+function getAvailableSpace() {
+    $dfOutput = [];
+    exec('df /', $dfOutput);
+
+    $availableSpace = 0;
+    if (isset($dfOutput[1])) {
+        $dfData = preg_split('/\s+/', $dfOutput[1]);
+        $availableSpace = $dfData[3] * 1024;
+    }
+
+    $availableSpaceInMB = $availableSpace / 1024 / 1024;
+    return round($availableSpaceInMB, 2);
+}
+
+$availableSpace = getAvailableSpace(); 
+?>
+
 <?php
 $default_url = 'https://raw.githubusercontent.com/Thaolga/Rules/main/Clash/songs.txt';
 
@@ -4878,6 +4896,10 @@ function showPlaylistContainer() {
             </div>
             <div class="modal-body text-center">
                 <h2 class="mb-3">上传图片/视频/音频</h2>
+                <div class="alert alert-warning d-flex align-items-center" role="alert">
+                    <i class="bi bi-exclamation-triangle-fill me-2"></i>
+                    OpenWRT 剩余空间: <?php echo $availableSpace; ?> MB
+                </div>
                 <form method="POST" action="download.php" enctype="multipart/form-data">
                     <div id="dropArea" class="mb-3">
                         <i id="uploadIcon" class="fas fa-cloud-upload-alt"></i>

luci-app-passwall/root/usr/share/passwall/app.sh

@@ -1927,6 +1927,7 @@ acl_app() {
 								if [ -n "${type}" ] && ([ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]); then
 									config_file="acl/${tcp_node}_TCP_${redir_port}.json"
 									_extra_param="socks_address=127.0.0.1 socks_port=$socks_port"
+									_extra_param="${_extra_param} tcp_proxy_way=$TCP_PROXY_WAY"
 									if [ "$dns_mode" = "sing-box" ] || [ "$dns_mode" = "xray" ]; then
 										dns_port=$(get_new_port $(expr $dns_port + 1))
 										_dns_port=$dns_port