From 1e9d24dcafe0ed971c9c88fb75461e3909d4912c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Tue, 9 Jan 2024 17:47:28 +0100 Subject: [PATCH] uspot: update to Git HEAD (2024-01-09) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 0cffba9458d3 treewide: add support for RADIUS Reply-Message c9fb744fdee8 treewide: add support for 'lang=' & ChilliSpot-Lang 584a162cb19a handler-uam: ensure that 'seconds_remaining' is always set bd1f7c5de1ae Makefile: align with packages feed one 0ea6ad3c4e54 Makefile: mark uspot-www and uspotfilter "PKGARCH:=all" e6a286ccfdbf uspot/uspotfilter: use 'logger -t' 427ed16cfde5 uspot: expose ratelimits in client data 4ba1dd9c5135 uspot: don't send NAS-Port-Type 78a37ef49b85 templates: add id="replymsg" to reply msg header e3f4e179fd17 templates: show remaining time in "connected" 398762dff711 radius-client: correctly use str_to_hex() 730ef800d9da templates: simplify HTML 6bb39282fd8f Documentation update b6c802adac19 portal: handle_request() logic refactoring 1aa1a5eb28d7 uspotfilter: implement peer_lookup() ba5547ec61f1 portal: speedup peer lookup by leveraging spotfilter d551376c29bb templates: added html5 time tag to timeleft output 154c98e0b77b uspotfilter: mark client as active when set() 8dcb03a37a77 uspotfilter: rework neigh management cfb2ce7909da uspotfilter: use client_remove() where applicable 8411314dbf90 Documentation update 8dacf3df9935 uspot: use a single operation for client removal 297b7857c1e0 uspotfilter: fix DELNEIGH processing 76003917c205 uspotfilter: client_set() only clear idle when allowing f46a855c5085 uspotfilter: remove botched IPv6 "support" 4ff31cbf0e2b uspot: client_remove(): stay in sync with spotfilter edc9ad7e60a3 uspot/uspotfilter: use ucode-mod-log for logging 52e24aecf2db uspotfilter: use ucode '??=' syntax c4b6f2f0bb1e Update README Update the package Makefile to reflect the changes from the following above-listed commits: 0ea6ad3c4e54 Makefile: mark uspot-www and uspotfilter "PKGARCH:=all" edc9ad7e60a3 uspot/uspotfilter: use ucode-mod-log for logging Signed-off-by: Thibaut VARÈNE (cherry picked from commit ab20c1bd90df66c8351a063a7a3318100f5c22af) --- net/uspot/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/uspot/Makefile b/net/uspot/Makefile index 9d6dd6485d..9207c77b9a 100644 --- a/net/uspot/Makefile +++ b/net/uspot/Makefile @@ -8,9 +8,9 @@ PKG_MAINTAINER:=Thibaut VARÈNE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/f00b4r0/uspot.git -PKG_SOURCE_DATE:=2023-11-30 -PKG_SOURCE_VERSION:=7e1e21b0f8425205d719b99a392fa893b3e512e6 -PKG_MIRROR_HASH:=494c616159b16d978fe00348ebe50c77a48f1db98d624ed613f3cca2d39e3a6e +PKG_SOURCE_DATE:=2024-01-09 +PKG_SOURCE_VERSION:=c4b6f2f0bb1e9d2da4adc8cb3523cd7e440d7584 +PKG_MIRROR_HASH:=fa6be10e0479a9dc71b8c21e57b07aac09c8938e8e7120045816a5cd4b949343 CMAKE_SOURCE_SUBDIR:=src @@ -25,7 +25,7 @@ define Package/uspot DEPENDS:=+conntrack \ +libblobmsg-json +liblucihttp-ucode +libradcli +libubox +libubus +libuci \ +spotfilter \ - +ucode +ucode-mod-math +ucode-mod-nl80211 +ucode-mod-rtnl +uhttpd-mod-ucode +ucode-mod-uloop + +ucode +ucode-mod-log +ucode-mod-math +ucode-mod-nl80211 +ucode-mod-rtnl +uhttpd-mod-ucode +ucode-mod-uloop endef @@ -49,6 +49,7 @@ define Package/uspot-www CATEGORY:=Network TITLE:=uspot default user interface files DEPENDS:=+uspot + PKGARCH:=all endef define Package/uspot-www/description @@ -63,6 +64,7 @@ define Package/uspotfilter PROVIDES:=spotfilter CONFLICTS:=spotfilter DEPENDS:=+conntrack +nftables-json +ucode +ucode-mod-rtnl +ucode-mod-uloop + PKGARCH:=all endef define Package/uspotfilter/description -- 2.30.2