From 0488b625057fe693a04643adcc8496bacca9504d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Sep 2026 04:25:02 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8B=20Sync=202026-09-29=2004:25:01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-openvpn-server/Makefile | 2 +- luci-app-openvpn-server/root/etc/uci-defaults/openvpn | 2 -- qosmate/Makefile | 2 +- qosmate/etc/qosmate.sh | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/luci-app-openvpn-server/Makefile b/luci-app-openvpn-server/Makefile index 622796998..a5f32fa22 100644 --- a/luci-app-openvpn-server/Makefile +++ b/luci-app-openvpn-server/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+openvpn-openssl +openvpn-easy-rsa LUCI_PKGARCH:=all PKG_NAME:=luci-app-openvpn-server PKG_VERSION:=2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/luci-app-openvpn-server/root/etc/uci-defaults/openvpn index 1b6ac47e7..fe7756975 100755 --- a/luci-app-openvpn-server/root/etc/uci-defaults/openvpn +++ b/luci-app-openvpn-server/root/etc/uci-defaults/openvpn @@ -1,7 +1,5 @@ #!/bin/sh -grep -qv "myvpn" /etc/config/openvpn && grep -q "myvpn" /etc/config/openvpn-opkg && cp -f /etc/config/openvpn-opkg /etc/config/openvpn - openvpn_port="$(uci -q get openvpn.myvpn.port)" [ -z "$openvpn_port" ] && openvpn_port=1194 diff --git a/qosmate/Makefile b/qosmate/Makefile index a6cb9c2ed..7bce031c6 100644 --- a/qosmate/Makefile +++ b/qosmate/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qosmate PKG_VERSION:=0.5.48 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_MAINTAINER:=Markus Hütter PKG_LICENSE:=GPL-3.0-or-later diff --git a/qosmate/etc/qosmate.sh b/qosmate/etc/qosmate.sh index e1c29b12b..25b04ca33 100644 --- a/qosmate/etc/qosmate.sh +++ b/qosmate/etc/qosmate.sh @@ -1047,7 +1047,7 @@ INLINE_FILE="/etc/qosmate.d/inline_dscptag.nft" INLINE_INCLUDE="" if [ -s "$INLINE_FILE" ]; then - TMP_CHECK_FILE="/tmp/qosmate_inline_sh_check.nft" + TMP_CHECK_FILE="$(mktemp)" { printf '%s\n\t%s\n' "table inet __qosmate_sh_ctx {" "chain __dscptag_sh_ctx {"