From: Dengfeng Liu Date: Sun, 14 Jun 2026 07:49:01 +0000 (+0800) Subject: apfree-wifidog: update to 9.05.2872 X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f9337d6119165dea640d378b181cb2a3e8f0e363;p=openwrt-packages.git apfree-wifidog: update to 9.05.2872 Updated from 7.10.2082 to 9.05.2872. Changes: - Added new dependencies: libnftnl, libmnl, libbpf - Removed obsolete wdping binary - Added wifi-config and wifi-diag CGI tools - Removed obsolete CMake patches (fixed upstream) Signed-off-by: Dengfeng Liu --- diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile index 41d60950c..cd6b61804 100644 --- a/net/apfree-wifidog/Makefile +++ b/net/apfree-wifidog/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apfree-wifidog -PKG_VERSION:=7.10.2082 +PKG_VERSION:=9.05.2872 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/liudf0716/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=2b7b22221852732f2511e991bef5d135132a8cc50f3d612eaee77d74c51bc501 +PKG_HASH:=36b954719dcaadf8e574ee48ab897a6a3aa3b0443e3c2fa54ca784917302aa97 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Dengfeng Liu @@ -27,7 +27,7 @@ define Package/apfree-wifidog SUBMENU:=Captive Portals SECTION:=net CATEGORY:=Network - DEPENDS:=+zlib +libjson-c +libevent2 +libevent2-openssl +libuci +openssl-util +libnetfilter-queue +conntrack +libmosquitto + DEPENDS:=+zlib +libjson-c +libevent2 +libevent2-openssl +libuci +openssl-util +libnetfilter-queue +conntrack +libmosquitto +libnftnl +libmnl +libbpf TITLE:=Apfree's wireless captive portal solution URL:=https://github.com/liudf0716/apfree_wifidog endef @@ -48,7 +48,6 @@ define Package/apfree-wifidog/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wifidogx $(1)/usr/bin/wifidogx $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wdctlx $(1)/usr/bin/wdctlx $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) ./files/wdping $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-msg.html $(1)/etc/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-redir.html $(1)/etc/ @@ -61,6 +60,9 @@ define Package/apfree-wifidog/install $(INSTALL_DIR) $(1)/etc/config $(CP) ./files/wifidogx.conf $(1)/etc/config/wifidogx $(INSTALL_DIR) $(1)/etc/wifidogx + $(INSTALL_DIR) $(1)/www/cgi-bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wifi-config $(1)/www/cgi-bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wifi-diag $(1)/www/cgi-bin/ endef $(eval $(call BuildPackage,apfree-wifidog)) diff --git a/net/apfree-wifidog/files/wdping b/net/apfree-wifidog/files/wdping deleted file mode 100644 index 1174e1acc..000000000 --- a/net/apfree-wifidog/files/wdping +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -IP=$1 -[ -x /usr/sbin/fping ] && { - fping -t 100 -c 1 $IP &> /dev/null && echo 1 || echo 0 -} || { - ping -w 1 -c 1 $IP &> /dev/null && echo 1 || echo 0 -} diff --git a/net/apfree-wifidog/patches/001-refactor-update-CMake-configuration-for-improved-str.patch b/net/apfree-wifidog/patches/001-refactor-update-CMake-configuration-for-improved-str.patch deleted file mode 100644 index 344cf9fc4..000000000 --- a/net/apfree-wifidog/patches/001-refactor-update-CMake-configuration-for-improved-str.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 66e8f953cc297c7263b3a8f99caedb2ad40816b3 Mon Sep 17 00:00:00 2001 -From: Dengfeng Liu -Date: Mon, 18 Nov 2024 15:46:04 +0800 -Subject: [PATCH] refactor: update CMake configuration for improved structure - and clarity - -Signed-off-by: Dengfeng Liu ---- - CMakeLists.txt | 47 +++++++++------- - src/CMakeLists.txt | 134 ++++++++++++++++++++------------------------- - 2 files changed, 85 insertions(+), 96 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,32 +1,37 @@ --cmake_minimum_required(VERSION 2.8.12) --project(ApFreeWiFidog C) -+cmake_minimum_required(VERSION 3.12) -+project(apfree-wifidog -+ VERSION 1.0.0 -+ DESCRIPTION "ApFree WiFiDog" -+ LANGUAGES C) - -+# Set C standard and module path - set(CMAKE_C_STANDARD 11) --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -- --option(AW_DEBUG "Build debug" ON) --option(AW_WEBSSH "Build with web ssh support" OFF) --option(AW_FW3 "Build with fw3 support" OFF) -- --find_package(LibEvent) --if(NOT LibEvent_FOUND) -- message(FATAL_ERROR "libevent2 not found!") --endif(NOT LibEvent_FOUND) -- --find_package(OpenSSL) --if(NOT OPENSSL_FOUND) -- message(FATAL_ERROR "OpenSSL not found!") --endif(NOT OPENSSL_FOUND) -+set(CMAKE_C_STANDARD_REQUIRED ON) -+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" ${CMAKE_MODULE_PATH}) - -+# Options -+option(AW_DEBUG "Build with debug support" ON) -+option(AW_FW3 "Build with iptables support" OFF) -+ -+# Required packages -+include(FindPackageHandleStandardArgs) -+ -+# Find and include dependencies -+find_package(LibEvent REQUIRED) -+find_package(OpenSSL REQUIRED) - find_package(JSON-C REQUIRED) --include_directories(${JSON-C_INCLUDE_DIR}) -- - find_package(UCI REQUIRED) --include_directories(${UCI_INCLUDE_DIR}) - --if(LIB_INSTALL_DIR) --else() -- set(LIB_INSTALL_DIR lib) -+# Set installation directory -+if(NOT DEFINED LIB_INSTALL_DIR) -+ set(LIB_INSTALL_DIR lib) - endif() - -+# Include directories -+include_directories( -+ ${JSON-C_INCLUDE_DIR} -+ ${UCI_INCLUDE_DIR} -+) -+ -+# Add subdirectories - add_subdirectory(src) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,96 +1,80 @@ -- -+# Define source file groups - set(src_apfreewifidog -- main.c -- gateway.c -- commandline.c -- conf.c -- debug.c -- firewall.c -- centralserver.c -- http.c -- auth.c -- client_list.c -- util.c -- wdctl_thread.c -- ping_thread.c -- safe.c -- pstring.c -- ssl_redir.c -- wd_client.c -- wd_util.c -- mqtt_thread.c -- ws_thread.c -- dns_forward.c -+ main.c gateway.c commandline.c conf.c debug.c -+ firewall.c centralserver.c http.c auth.c client_list.c -+ util.c wdctl_thread.c ping_thread.c safe.c pstring.c -+ ssl_redir.c wd_client.c wd_util.c mqtt_thread.c -+ ws_thread.c dns_forward.c - ) - -+set(src_fw3 -+ fw_iptables.c fw3_iptc.c ipset.c -+) - --if(AW_FW3) -- set(src_fw3 -- fw_iptables.c -- fw3_iptc.c -- ipset.c -- ) --else() -- set(src_fw4 -- fw_nft.c -- ) --endif() -+set(src_fw4 -+ fw_nft.c -+) - - set(src_dhcp -- dhcp_cpi.c -- dhcp.c -- ipv4.c -- options.c --) -- --set(src_wdctlx wdctl.c util.c debug.c) -- --set(libs -- pthread -- m -- z -- json-c -- uci -- ssl -- crypto -- event -- event_openssl -- netfilter_queue -- resolv -- mosquitto) -+ dhcp_cpi.c dhcp.c ipv4.c options.c -+) -+ -+set(src_wdctlx -+ wdctl.c util.c debug.c -+) -+ -+# Define common libraries -+set(common_libs -+ pthread m z json-c uci ssl crypto -+ event event_openssl netfilter_queue -+ resolv mosquitto -+) - -+# Set compiler flags -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall --std=gnu99 -Wmissing-declarations") - if(AW_DEBUG) -- message("Building debug") -- ADD_DEFINITIONS(-ggdb -Wall --std=gnu99 -Wmissing-declarations) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb") -+ message(STATUS "Building in DEBUG mode") - else() -- message("Buildign release") -- ADD_DEFINITIONS(-O2 -Wall --std=gnu99 -Wmissing-declarations) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") -+ message(STATUS "Building in RELEASE mode") - endif() - --if (AW_FW3) -- message("Building with fw3") -- ADD_DEFINITIONS(-DAW_FW3) -- set(fw3_libs -- dl -- ip4tc -- iptext -- iptext4 -- xtables) -+# Handle firewall version -+if(AW_FW3) -+ set(fw_source ${src_fw3}) -+ set(fw_libs dl ip4tc iptext iptext4 xtables) -+ add_definitions(-DAW_FW3) -+ message(STATUS "Building with fw3") -+ set(src_fw3 -+ fw_iptables.c fw3_iptc.c ipset.c -+ ) - else() -- message("Building with fw4") -- ADD_DEFINITIONS(-DAW_FW4) -+ set(fw_source ${src_fw4}) -+ set(fw_libs "") -+ add_definitions(-DAW_FW4) -+ message(STATUS "Building with fw4") -+ set(src_fw4 -+ fw_nft.c -+ ) - endif() - -+# Build targets - add_executable(wdctlx ${src_wdctlx}) --if(AW_FW3) -- add_executable(wifidogx ${src_apfreewifidog} ${src_fw3} ${src_dhcp}) -- target_link_libraries(wifidogx ${libs} ${fw3_libs} ${CURL_LIBRARIES}) --else() -- add_executable(wifidogx ${src_apfreewifidog} ${src_fw4} ${src_dhcp}) -- target_link_libraries(wifidogx ${libs} ${CURL_LIBRARIES}) --endif() - --install(TARGETS wifidogx wdctlx -- RUNTIME DESTINATION bin -+add_executable(wifidogx -+ ${src_apfreewifidog} -+ ${fw_source} -+ ${src_dhcp} - ) - -+target_link_libraries(wifidogx -+ ${common_libs} -+ ${fw_libs} -+ ${CURL_LIBRARIES} -+) -+ -+# Installation -+install(TARGETS wifidogx wdctlx -+ RUNTIME DESTINATION bin -+) diff --git a/net/apfree-wifidog/patches/002-refactor-disable-debug-support-by-default-in-CMake-c.patch b/net/apfree-wifidog/patches/002-refactor-disable-debug-support-by-default-in-CMake-c.patch deleted file mode 100644 index ac9499ab5..000000000 --- a/net/apfree-wifidog/patches/002-refactor-disable-debug-support-by-default-in-CMake-c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eda722063c6774f7adce0e75cccf4c1493b9e3cd Mon Sep 17 00:00:00 2001 -From: Dengfeng Liu -Date: Sat, 14 Dec 2024 10:14:52 +0800 -Subject: [PATCH] refactor: disable debug support by default in CMake - configuration - -Signed-off-by: Dengfeng Liu ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,7 +10,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" ${CMAKE_MODULE_PATH}) - - # Options --option(AW_DEBUG "Build with debug support" ON) -+option(AW_DEBUG "Build with debug support" OFF) - option(AW_FW3 "Build with iptables support" OFF) - - # Required packages