Date: Thu, 04 Jun 2026 08:42:16 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f6b972befbbc - main - net/nekobox: update 5.11.=?utf-8?Q?8 =E2=86=92 5.?=11.16 Message-ID: <6a213a68.3cebf.4ef53b06@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6b972befbbc8f0e7cfb458fa25e4fb8472b928a commit f6b972befbbc8f0e7cfb458fa25e4fb8472b928a Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-06-04 05:38:12 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-06-04 08:41:15 +0000 net/nekobox: update 5.11.8 → 5.11.16 --- net/nekobox/Makefile | 13 +++--- net/nekobox/distinfo | 8 ++-- net/nekobox/files/patch-CMakeLists.txt | 30 -------------- net/nekobox/files/patch-core_CMakeLists.txt | 33 ++++++++------- ...ch-core_server_internal_boxdns_monitor__stub.go | 10 ----- ...atch-core_server_internal_sys_set__dns__stub.go | 4 +- .../files/patch-core_server_server__linux.go | 9 ---- ...atch-src_gharqad_configs_proxy_AbstractBean.cpp | 16 ++++++++ net/nekobox/files/patch-src_gharqad_main.cpp | 48 ++++++++++++++++++++++ net/nekobox/pkg-plist | 1 - 10 files changed, 97 insertions(+), 75 deletions(-) diff --git a/net/nekobox/Makefile b/net/nekobox/Makefile index 7f38469d3425..f4b0f14aa53f 100644 --- a/net/nekobox/Makefile +++ b/net/nekobox/Makefile @@ -1,5 +1,5 @@ PORTNAME= nekobox -DISTVERSION= 5.11.8 +DISTVERSION= 5.11.16 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -13,18 +13,21 @@ BUILD_DEPENDS= thrift:devel/thrift LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libcpr.so:www/cpr \ libcurl.so:ftp/curl \ - liblmdb.so:databases/lmdb \ - libthrift.so:devel/thrift-cpp + libleveldb.so:databases/leveldb \ + libsnappy.so:archivers/snappy \ + libthrift.so:devel/thrift-cpp \ + libyaml-cpp.so:devel/yaml-cpp RUN_DEPENDS= sing-box:net/sing-box USES= cmake compiler:c++20-lang desktop-file-utils gl localbase:ldflags pkgconfig qt:6 xorg -USE_GL= gl opengl -USE_QT= base declarative tools:build +USE_GL= opengl +USE_QT= base tools:build USE_XORG= ice sm x11 xext USE_GITHUB= yes GH_ACCOUNT= qr243vbi GH_PROJECT= nekobox +GH_TUPLE= quickjs-ng:quickjs:967aa0b:qjs/3rdparty/qjs CMAKE_ON= CMAKE_SKIP_INSTALL_RPATH \ SKIP_UPDATER diff --git a/net/nekobox/distinfo b/net/nekobox/distinfo index 8e7caf8dd42c..736874035dbf 100644 --- a/net/nekobox/distinfo +++ b/net/nekobox/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1778044716 -SHA256 (qr243vbi-nekobox-5.11.8_GH0.tar.gz) = 43bd92e77b4518991fa0bfcea07ae8359b0e5ca3aed90eb5907b9117fc58a25c -SIZE (qr243vbi-nekobox-5.11.8_GH0.tar.gz) = 8921359 +TIMESTAMP = 1780545804 +SHA256 (qr243vbi-nekobox-5.11.16_GH0.tar.gz) = c11a6fa9938395efd0c27d561bd74d96fd48cc5ce31604cc5c6e467edd30d313 +SIZE (qr243vbi-nekobox-5.11.16_GH0.tar.gz) = 10196761 +SHA256 (quickjs-ng-quickjs-967aa0b_GH0.tar.gz) = 9a07b53b2af197c83d9aa8bf9303cfe39b3a94b7c8730ef2fdb7d8f943121591 +SIZE (quickjs-ng-quickjs-967aa0b_GH0.tar.gz) = 847563 diff --git a/net/nekobox/files/patch-CMakeLists.txt b/net/nekobox/files/patch-CMakeLists.txt deleted file mode 100644 index 81a151a6969b..000000000000 --- a/net/nekobox/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- CMakeLists.txt.orig 2026-05-02 21:54:00 UTC -+++ CMakeLists.txt -@@ -345,10 +345,16 @@ if(NOT ACL_LIB) - find_library(ACL_LIB acl) - - if(NOT ACL_LIB) -- message(FATAL_ERROR "libacl not found. Install libacl-devel.") -+ if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ message(FATAL_ERROR "libacl not found. Install libacl-devel.") -+ else() -+ message(STATUS "libacl not found on FreeBSD, continuing without it") -+ endif() - endif() - --target_link_libraries(nekobox PRIVATE ${ACL_LIB}) -+if(ACL_LIB) -+ target_link_libraries(nekobox PRIVATE ${ACL_LIB}) -+endif() - endif() - - # Target Link -@@ -426,7 +432,9 @@ if (UNIX) - download_srslist() - --remove_rpath(nekobox) -+if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ remove_rpath(nekobox) -+endif() - - set(PROGRAMPREFIX "${CMAKE_INSTALL_LIBEXECDIR}/Iblis" CACHE STRING "Installation Directory") diff --git a/net/nekobox/files/patch-core_CMakeLists.txt b/net/nekobox/files/patch-core_CMakeLists.txt index 816ad5d249a7..7f45e757dc9f 100644 --- a/net/nekobox/files/patch-core_CMakeLists.txt +++ b/net/nekobox/files/patch-core_CMakeLists.txt @@ -1,31 +1,34 @@ ---- core/CMakeLists.txt.orig 2026-05-02 21:54:00 UTC +-- Enable darwin build and disable TUN-based features on FreeBSD. +-- +-- This patch ensures GOOS is correctly set for macOS and that features +-- requiring TUN/TAP or gVisor are disabled on FreeBSD as they are not yet +-- fully supported or integrated in the same way. +--- core/CMakeLists.txt.orig 2026-06-04 03:56:20 UTC +++ core/CMakeLists.txt -@@ -40,6 +40,10 @@ if (GOOS STREQUAL "") - set(GOOS "windows") - elseif(LINUX) +@@ -42,6 +42,8 @@ if (GOOS STREQUAL "") set(GOOS "linux") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ set(GOOS "freebsd") + elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set(GOOS "freebsd") + elseif(APPLE) + set(GOOS "darwin") else() set(GOOS "") endif() -@@ -182,9 +186,15 @@ message(STATUS "DESTINATION IS ${DESTDIR} FOR MACHINE +@@ -184,13 +186,15 @@ message(STATUS "DESTINATION IS ${DESTDIR} FOR MACHINE # ---------------------------- # Tags # ---------------------------- --set(TAGS "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_dhcp,with_tailscale,with_shadowtls,with_grpc,with_acme,with_internal_resolvectl") +-set(TAGS "with_clash_api,with_quic,with_wireguard,with_utls,with_dhcp,with_tailscale,with_shadowtls,with_grpc,with_acme,with_awg") +set(TAGS "with_clash_api,with_quic,with_utls,with_grpc,with_acme") --if(GOARCH STREQUAL "arm64" OR GOARCH STREQUAL "amd64") -+if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ set(TAGS "${TAGS},with_gvisor,with_wireguard,with_dhcp,with_tailscale,with_shadowtls,with_internal_resolvectl") + if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +- set(TAGS "${TAGS},with_gvisor") ++ set(TAGS "${TAGS},with_gvisor,with_wireguard,with_dhcp,with_tailscale,with_shadowtls,with_awg") + if(GOARCH STREQUAL "arm64" OR GOARCH STREQUAL "amd64") + set(TAGS "${TAGS},with_naive,with_naive_outbound,with_purego") + endif() +else() + message(STATUS "FreeBSD: disabling TUN-based and gVisor features") -+endif() -+ -+if((GOARCH STREQUAL "arm64" OR GOARCH STREQUAL "amd64") AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - set(TAGS "${TAGS},with_naive,with_naive_outbound,with_purego") endif() + file(MAKE_DIRECTORY "${DESTDIR}") diff --git a/net/nekobox/files/patch-core_server_internal_boxdns_monitor__stub.go b/net/nekobox/files/patch-core_server_internal_boxdns_monitor__stub.go deleted file mode 100644 index ce16d4d753b7..000000000000 --- a/net/nekobox/files/patch-core_server_internal_boxdns_monitor__stub.go +++ /dev/null @@ -1,10 +0,0 @@ --- Exclude FreeBSD from the generic monitor stub; a FreeBSD-specific stub is --- provided separately. ---- core/server/internal/boxdns/monitor_stub.go.orig 2026-05-05 00:00:00 UTC -+++ core/server/internal/boxdns/monitor_stub.go -@@ -1,4 +1,4 @@ --//go:build !windows -+//go:build !windows && !freebsd - - package boxdns - diff --git a/net/nekobox/files/patch-core_server_internal_sys_set__dns__stub.go b/net/nekobox/files/patch-core_server_internal_sys_set__dns__stub.go index 7b45c811182b..e0afd8007651 100644 --- a/net/nekobox/files/patch-core_server_internal_sys_set__dns__stub.go +++ b/net/nekobox/files/patch-core_server_internal_sys_set__dns__stub.go @@ -1,8 +1,8 @@ -- Exclude FreeBSD from the stub since it does not use DNS control. ---- core/server/internal/sys/set_dns_stub.go.orig 2026-05-05 00:00:00 UTC +--- core/server/internal/sys/set_dns_stub.go.orig 2026-06-01 16:33:26 UTC +++ core/server/internal/sys/set_dns_stub.go @@ -1,4 +1,4 @@ --//go:build !darwin +-//go:build !freebsd +//go:build !darwin && !freebsd package sys diff --git a/net/nekobox/files/patch-core_server_server__linux.go b/net/nekobox/files/patch-core_server_server__linux.go deleted file mode 100644 index 53bb46e870cb..000000000000 --- a/net/nekobox/files/patch-core_server_server__linux.go +++ /dev/null @@ -1,9 +0,0 @@ --- Add explicit linux build constraint so the file is not compiled on FreeBSD. ---- core/server/server_linux.go.orig 2026-05-05 00:00:00 UTC -+++ core/server/server_linux.go -@@ -1,3 +1,5 @@ -+//go:build linux -+ - package main - - import ( diff --git a/net/nekobox/files/patch-src_gharqad_configs_proxy_AbstractBean.cpp b/net/nekobox/files/patch-src_gharqad_configs_proxy_AbstractBean.cpp new file mode 100644 index 000000000000..ed65b076bc86 --- /dev/null +++ b/net/nekobox/files/patch-src_gharqad_configs_proxy_AbstractBean.cpp @@ -0,0 +1,16 @@ +-- Add missing network headers for FreeBSD. +-- +-- This patch includes <sys/types.h> and <sys/socket.h> which are required +-- for networking constants and structures on FreeBSD. +--- src/gharqad/configs/proxy/AbstractBean.cpp.orig 2026-06-04 04:04:10 UTC ++++ src/gharqad/configs/proxy/AbstractBean.cpp +@@ -3,6 +3,9 @@ + #include <winsock2.h> + #include <ws2tcpip.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <netdb.h> + #include <arpa/inet.h> + #endif diff --git a/net/nekobox/files/patch-src_gharqad_main.cpp b/net/nekobox/files/patch-src_gharqad_main.cpp new file mode 100644 index 000000000000..5238dec9972a --- /dev/null +++ b/net/nekobox/files/patch-src_gharqad_main.cpp @@ -0,0 +1,48 @@ +-- Suppress unused-value warnings for QT_TRANSLATE_NOOP. +-- +--- src/gharqad/main.cpp.orig 2026-06-04 03:57:05 UTC ++++ src/gharqad/main.cpp +@@ -169,25 +169,25 @@ static void loadTranslate(QString locale) { + } + + static void loadTranslate(QString locale) { +- QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Apply"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Yes"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "No"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "OK"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Defaults"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Restore Defaults"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Discard"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Apply"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Yes"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "No"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "OK"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Defaults"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Restore Defaults"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Discard"); + +- QT_TRANSLATE_NOOP("QPlatformTheme", "Undo"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Redo"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Cut"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Copy"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Paste"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Delete"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Select All"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Stop"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Clear"); +- QT_TRANSLATE_NOOP("QPlatformTheme", "Copy Link Location"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Undo"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Redo"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Cut"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Copy"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Paste"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Delete"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Select All"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Stop"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Clear"); ++ (void)QT_TRANSLATE_NOOP("QPlatformTheme", "Copy Link Location"); + + if (trans != nullptr) { + trans->deleteLater(); diff --git a/net/nekobox/pkg-plist b/net/nekobox/pkg-plist index 5d6c18ecc058..cd5052b4892e 100644 --- a/net/nekobox/pkg-plist +++ b/net/nekobox/pkg-plist @@ -22,7 +22,6 @@ libexec/Iblis/public/de_DE.qm libexec/Iblis/public/dv_MV.qm libexec/Iblis/public/dz_BT.qm libexec/Iblis/public/el_GR.qm -libexec/Iblis/public/emoji.ttf libexec/Iblis/public/es_ES.qm libexec/Iblis/public/et_EE.qm libexec/Iblis/public/eu_ES.qmhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a213a68.3cebf.4ef53b06>