From 16b5d1072f6c619a8d695f81cd332f542351b9b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Sat, 4 May 2024 10:55:42 +0200 Subject: [PATCH] uspot: update to Git HEAD (2024-05-03) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 5e2d15a110bb treewide: remove tip_mode e2dbdef4cf1e treewide: rename spotfilter -> uspotfilter ef0f5291365b uspot/uspotfilter: implement disconnect_delay 92d3356d3fb3 update README Update the package Makefile to reflect the changes from the following above-listed commit: e2dbdef4cf1e treewide: rename spotfilter -> uspotfilter (cherry picked from commit 5181ce4a483711791329a13e07d29f9321d85178) Signed-off-by: Thibaut VARÈNE --- net/uspot/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/net/uspot/Makefile b/net/uspot/Makefile index b721ae7c1f..b2e4a8cd06 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:=2024-03-25 -PKG_SOURCE_VERSION:=094f0df88150ff2c351cfca4fabf76a7edcac79d -PKG_MIRROR_HASH:=2ffc723e6560e76f53496b444568724d3c52a45ac143ca259096c3d20522de0f +PKG_SOURCE_DATE:=2024-05-03 +PKG_SOURCE_VERSION:=92d3356d3fb3ae36199dbd494b5d9a9ae1a9db07 +PKG_MIRROR_HASH:=c7584c6b029c56d7c16156c007500ad61e2be29a6fd939f192ad6cb4444e1f2b CMAKE_SOURCE_SUBDIR:=src @@ -25,7 +25,7 @@ define Package/uspot EXTRA_DEPENDS:=ucode (>= 2023-11-07) DEPENDS:=+conntrack \ +libblobmsg-json +liblucihttp-ucode +libradcli +libubox +libubus +libuci \ - +spotfilter \ + +uspotfilter \ +ucode +ucode-mod-log +ucode-mod-math +ucode-mod-nl80211 +ucode-mod-rtnl +uhttpd-mod-ucode +ucode-mod-uloop endef @@ -61,16 +61,14 @@ endef define Package/uspotfilter SECTION:=net CATEGORY:=Network - TITLE:=uspot implementation of spotfilter - PROVIDES:=spotfilter - CONFLICTS:=spotfilter + TITLE:=uspot firewall interface EXTRA_DEPENDS:=ucode (>= 2023-11-07) DEPENDS:=+conntrack +nftables-json +ucode +ucode-mod-rtnl +ucode-mod-uloop PKGARCH:=all endef define Package/uspotfilter/description - This package provides the nftables firewall interface to spotfilter. + This package provides the nftables firewall interface to uspot. It is compatible with firewall4. endef @@ -91,7 +89,7 @@ endef define Package/uspotfilter/install $(INSTALL_DIR) $(1)/usr/share $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/spotfilter $(1)/etc/init.d/spotfilter + $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/uspotfilter $(1)/etc/init.d/uspotfilter $(CP) $(PKG_BUILD_DIR)/files/usr/share/uspotfilter $(1)/usr/share/ endef -- 2.30.2