update 2024-12-20 04:21:37

UA2F/CMakeLists.txt

@@ -91,9 +91,6 @@ else ()
     message(STATUS "AddressSanitizer is disabled.")
 endif ()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-gc-sections")
-
 if (UA2F_CUSTOM_USER_AGENT)
     if (NOT UA2F_USER_AGENT_STRING)
         message(FATAL_ERROR "UA2F_USER_AGENT_STRING is not set")
@@ -154,7 +151,6 @@ if (UA2F_BUILD_TESTS)
             test/cache_test.cc
             src/util.c
             src/cache.c
-            src/cli.c
     )
     target_link_libraries(
             ua2f_test

UA2F/openwrt/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UA2F
-PKG_VERSION:=4.9.5
+PKG_VERSION:=4.9.6
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-3.0-only

UA2F/src/ua2f.c

@@ -1,12 +1,11 @@
 #include "cli.h"
 #include "handler.h"
 #include "statistics.h"
-#include "third/nfqueue-mnl.h"
 #include "util.h"
-
 #ifdef UA2F_ENABLE_UCI
 #include "config.h"
 #endif
+#include "third/nfqueue-mnl.h"
 
 #include <assert.h>
 #include <signal.h>

luci-app-passwall/luasrc/passwall/api.lua

@@ -1066,7 +1066,7 @@ end
 function get_version()
 	local version = sys.exec("opkg list-installed luci-app-passwall 2>/dev/null | awk '{print $3}'")
 	if not version or #version == 0 then
-		version = sys.exec("apk info luci-app-passwall 2>/dev/null | awk 'NR == 1 {print $1}' | cut -d'-' -f4-")
+		version = sys.exec("apk info -L luci-app-passwall 2>/dev/null | awk 'NR == 1 {print $1}' | cut -d'-' -f4-")
 	end
 	return version or ""
 end