From 0c51b265bf881834228a60baa6eaa283135172f1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 13 Apr 2021 00:13:33 +0200 Subject: [PATCH 1/3] iwinfo: update to latest Git HEAD 50b64a6 iwinfo: add basic IEEE 802.11ax support 70d2136 iwinfo: nl80211: perform split wiphy dump cd23727 iwinfo: cli: fix hwmode formatting Signed-off-by: David Bauer (cherry picked from commit 6f77ce77248d6458414efafd64c72d653fc70bb8) --- package/network/utils/iwinfo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 3454d615a9..0f63aca0d9 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2021-01-31 -PKG_SOURCE_VERSION:=4a32b33e9606f1bc1125f4bc24b0581349e55f2e -PKG_MIRROR_HASH:=414e5d150efaadba21103e66f862be66a94dcf83c16a2850f7c05051a9b0739d +PKG_SOURCE_DATE:=2021-04-20 +PKG_SOURCE_VERSION:=cd23727f72b7859ba572c4e273247578c2124926 +PKG_MIRROR_HASH:=a43516e3502274e0ba64348481364158996ddb0019c35c9dcd2d5a257de67e98 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 @@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS := \ CONFIG_PACKAGE_kmod-brcm-wl-mimo \ CONFIG_PACKAGE_kmod-cfg80211 -IWINFO_ABI_VERSION:=20210106 +IWINFO_ABI_VERSION:=20210420 include $(INCLUDE_DIR)/package.mk From e16a45f258a42bf36c05a182f9396d321e0c12a9 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 2 May 2021 00:22:56 +0200 Subject: [PATCH 2/3] iwinfo: update to latest Git HEAD c45f0b5 iwinfo: add 802.11ax HE rate information Signed-off-by: David Bauer (cherry picked from commit 5515c29029ce7c63b48d1af0cbb3fbdc14ca033b) --- package/network/utils/iwinfo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 0f63aca0d9..d8c1befc97 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2021-04-20 -PKG_SOURCE_VERSION:=cd23727f72b7859ba572c4e273247578c2124926 -PKG_MIRROR_HASH:=a43516e3502274e0ba64348481364158996ddb0019c35c9dcd2d5a257de67e98 +PKG_SOURCE_DATE:=2021-04-30 +PKG_SOURCE_VERSION:=c45f0b584b4b86f8250f90ea19afca271c114fa2 +PKG_MIRROR_HASH:=24ad04791254a0523cd15a4fec6116d9ff121e006c93e5e41459f91347b33ec2 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 @@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS := \ CONFIG_PACKAGE_kmod-brcm-wl-mimo \ CONFIG_PACKAGE_kmod-cfg80211 -IWINFO_ABI_VERSION:=20210420 +IWINFO_ABI_VERSION:=20210430 include $(INCLUDE_DIR)/package.mk From a75928d1259e52e52b1991a4dc39df61ba3c9206 Mon Sep 17 00:00:00 2001 From: Alexey Dobrovolsky Date: Tue, 23 Feb 2021 17:43:02 +0300 Subject: [PATCH 3/3] busybox: sysntpd: option to bind server to iface NTPD in busybox has option -I to bind server to IFACE. However, capabilities of the busybox are limited, the -I option cannot be repeated and only one interface can be effectively specified in it. This option is currently not configurable via UCI. The patch adds an interface option to the system config, ntp section. Also sort options for uci_load_validate alphabetically. Signed-off-by: Alexey Dobrovolsky (cherry picked from commit e12fcf0fe5597467f7cc21144e5f4da60500ebd2) --- package/utils/busybox/files/sysntpd | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index e4a070762f..c4c311c242 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -30,7 +30,12 @@ get_dhcp_ntp_servers() { validate_ntp_section() { uci_load_validate system timeserver "$1" "$2" \ - 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)' + 'dhcp_interface:list(string)' \ + 'enable_server:bool:0' \ + 'enabled:bool:1' \ + 'interface:string' \ + 'server:list(host)' \ + 'use_dhcp:bool:1' } start_ntpd_instance() { @@ -49,7 +54,10 @@ start_ntpd_instance() { procd_open_instance procd_set_param command "$PROG" -n -N - [ "$enable_server" = "1" ] && procd_append_param command -l + if [ "$enable_server" = "1" ]; then + procd_append_param command -l + [ -n "$interface" ] && procd_append_param command -I $interface + fi [ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT" for peer in $server; do procd_append_param command -p $peer