From 866b2a26fdf5b668f24365625edeadab6b5c81b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=85=20Sync=202024-09-23=2009:20:20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tun2socks/Makefile | 4 ++-- wifi-scripts/Makefile | 2 +- wifi-scripts/files/lib/netifd/hostapd.sh | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tun2socks/Makefile b/tun2socks/Makefile index 96c416556..12e4a6c0b 100644 --- a/tun2socks/Makefile +++ b/tun2socks/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tun2socks PKG_VERSION:=2.5.2 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/xjasonlyu/tun2socks.git -PKG_SOURCE_VERSION:=bf745d0e0e5d53d0aa364f1c95f5951769f44023 +PKG_SOURCE_VERSION:=56786517dc3d4de051980a45dff71d33c924862b PKG_MAINTAINER:=Konstantine Shevlakov PKG_LICENSE:=GPL-3.0 diff --git a/wifi-scripts/Makefile b/wifi-scripts/Makefile index fc6fdaef5..552be271a 100644 --- a/wifi-scripts/Makefile +++ b/wifi-scripts/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wifi-scripts PKG_VERSION:=1.0 -PKG_RELEASE:=15 +PKG_RELEASE:=16 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Felix Fietkau diff --git a/wifi-scripts/files/lib/netifd/hostapd.sh b/wifi-scripts/files/lib/netifd/hostapd.sh index 232f9021b..32b9d9d08 100644 --- a/wifi-scripts/files/lib/netifd/hostapd.sh +++ b/wifi-scripts/files/lib/netifd/hostapd.sh @@ -376,8 +376,8 @@ hostapd_common_add_bss_config() { config_add_array radius_auth_req_attr config_add_array radius_acct_req_attr - config_add_int eap_server - config_add_string eap_user_file ca_cert server_cert private_key private_key_passwd server_id + config_add_int eap_server radius_server_auth_port + config_add_string eap_user_file ca_cert server_cert private_key private_key_passwd server_id radius_server_clients config_add_boolean fils config_add_string fils_dhcp @@ -571,7 +571,7 @@ hostapd_set_bss_options() { multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key skip_inactivity_poll \ ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \ multicast_to_unicast_all proxy_arp per_sta_vif \ - eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \ + eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id radius_server_clients radius_server_auth_port \ vendor_elements fils ocv apup set_default fils 0 @@ -1151,6 +1151,8 @@ hostapd_set_bss_options() { [ -n "$private_key" ] && append bss_conf "private_key=$private_key" "$N" [ -n "$private_key_passwd" ] && append bss_conf "private_key_passwd=$private_key_passwd" "$N" [ -n "$server_id" ] && append bss_conf "server_id=$server_id" "$N" + [ -n "$radius_server_clients" ] && append bss_conf "radius_server_clients=$radius_server_clients" "$N" + [ -n "$radius_server_auth_port" ] && append bss_conf "radius_server_auth_port=$radius_server_auth_port" "$N" fi set_default multicast_to_unicast_all 0