From 7f846e1fc15afd68edbc392093bfc3c82ddfab7f Mon Sep 17 00:00:00 2001 From: action Date: Sun, 14 Jun 2026 21:51:11 +0800 Subject: [PATCH] update 2026-06-14 21:51:11 --- dae/Makefile | 6 +++--- daed/Makefile | 12 +++--------- daed/files/daed.init | 18 ++++++++++++----- naiveproxy/Makefile | 44 +++++++++++++++++++++--------------------- v2ray-geodata/Makefile | 4 ++-- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dae/Makefile b/dae/Makefile index 1018e3d0..26221f92 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae -PKG_VERSION:=2026.06.08 +PKG_VERSION:=2026.06.14 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=0dd83147223ea0c6af3efb48f465c375a97f30d9 -PKG_SOURCE_URL:=https://github.com/olicesx/dae.git +PKG_SOURCE_VERSION:=5a51cc747ef9e17185d438dc54ebf32c681984db +PKG_SOURCE_URL:=https://github.com/daeuniverse/dae.git PKG_MIRROR_HASH:=skip PKG_LICENSE:=AGPL-3.0-only diff --git a/daed/Makefile b/daed/Makefile index bf852855..6aa58995 100644 --- a/daed/Makefile +++ b/daed/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=daed -PKG_VERSION:=2026.06.08 +PKG_VERSION:=2026.06.14 DAED_VERSION:=daed-4d6a433 WING_VERSION:=wing-dc50308 -CORE_VERSION:=core-0dd8314 +CORE_VERSION:=core-5a51cc7 WING_HASH_SHORT:=$(shell echo $(WING_VERSION) | cut -d- -f2) CORE_HASH_SHORT:=$(shell echo $(CORE_VERSION) | cut -d- -f2) PKG_RELEASE:=1 @@ -106,20 +106,14 @@ define Build/Prepare git clone https://github.com/daeuniverse/dae-wing $(PKG_BUILD_DIR) && \ git -C $(PKG_BUILD_DIR) checkout $(WING_HASH_SHORT) ; \ rm -rf $(PKG_BUILD_DIR)/dae-core ; \ - git clone https://github.com/olicesx/dae $(PKG_BUILD_DIR)/dae-core && \ + git clone https://github.com/daeuniverse/dae $(PKG_BUILD_DIR)/dae-core && \ git -C $(PKG_BUILD_DIR)/dae-core checkout $(CORE_HASH_SHORT) ; \ - rm -rf $(DAED_BUILD_DIR)/outbound ; \ - git clone --depth=1 -b perf/complete-optimizations https://github.com/olicesx/outbound.git $(DAED_BUILD_DIR)/outbound ; \ - rm -rf $(DAED_BUILD_DIR)/quic-go ; \ - git clone --depth=1 -b perf/node-pooling-v2 https://github.com/olicesx/quic-go.git $(DAED_BUILD_DIR)/quic-go ; \ pushd $(PKG_BUILD_DIR)/dae-core ; \ git submodule update --init ; \ go get -u=patch ; \ go mod tidy ; \ popd ; \ pushd $(PKG_BUILD_DIR) ; \ - go mod edit -replace github.com/daeuniverse/outbound=../outbound ; \ - go mod edit -replace github.com/daeuniverse/quic-go=../quic-go ; \ go get -u=patch ; \ go mod tidy ; \ wget -qO default.pgo "https://github.com/QiuSimons/luci-app-dae/raw/refs/heads/kix/dae/pprof/default.pgo" ; \ diff --git a/daed/files/daed.init b/daed/files/daed.init index 7a1e9ac4..f0b282d7 100755 --- a/daed/files/daed.init +++ b/daed/files/daed.init @@ -1,5 +1,4 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2023 Tianling Shen USE_PROCD=1 START=99 @@ -7,7 +6,15 @@ START=99 CONF="daed" PROG="/usr/bin/daed" LOG="/var/log/daed/daed.log" -DAENETNS="/run/netns/daens" + + +cleanup_netns() { + if [ -e "/run/netns/daens" ]; then + logger -t daed "Cleaning up residual netns 'daens'..." + ip netns del daens 2>/dev/null + rm -f /run/netns/daens 2>/dev/null + fi +} start_service() { config_load "$CONF" @@ -16,6 +23,8 @@ start_service() { config_get_bool enabled "config" "enabled" "0" [ "$enabled" -eq "1" ] || return 1 + cleanup_netns + local listen_addr log_maxbackups log_maxsize config_get listen_addr "config" "listen_addr" "0.0.0.0:2023" config_get log_maxbackups "config" "log_maxbackups" "1" @@ -32,15 +41,14 @@ start_service() { procd_set_param limits core="unlimited" procd_set_param limits nofile="1000000 1000000" procd_set_param respawn - # procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance } stop_service() { - rm -f "$LOG" - [ -f "$DAENETNS" ] && umount "$DAENETNS" + procd_kill "$CONF" "" + cleanup_netns } service_triggers() { diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 9cd1c7a3..4d25a79b 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_REAL_VERSION:=148.0.7778.96-5 +PKG_REAL_VERSION:=149.0.7827.114-1 PKG_VERSION:=$(subst -,.,$(PKG_REAL_VERSION)) PKG_RELEASE:=1 @@ -21,47 +21,47 @@ else ifeq ($(ARCH_PREBUILT),riscv64_riscv64) endif ifeq ($(ARCH_PREBUILT),aarch64_cortex-a53) - PKG_HASH:=2cc643c0818a5b84a873ceb20132050b98dd9e6d7184bb4df47c054cc14e8b56 + PKG_HASH:=f47f3563547df291179faedce1cbaea79d3308d9b514ab45cd9a48ef91b16004 else ifeq ($(ARCH_PREBUILT),aarch64_cortex-a72) - PKG_HASH:=f402da04a623aa67cde64ab86948bf5f91e0968ce12c007c575ebff94b9780e6 + PKG_HASH:=720506fb399fad7721ebafa6d79c62afa5af6e2129963d34c4fe9eae5e21271e else ifeq ($(ARCH_PREBUILT),aarch64_generic) - PKG_HASH:=088249b5bd8018396eda31ce4712e2304a6576528f996e597ed908bb44e5a69d + PKG_HASH:=ae9c706226534fa5d0eda08f4a9d7503284abef5d786af5158b744fff6f29ac3 else ifeq ($(ARCH_PREBUILT),arm_arm1176jzf-s_vfp) - PKG_HASH:=c38b1b218420a817d340f99a7c719415cdff2c6f6dc1ab0d28b7245c20db7336 + PKG_HASH:=7377bb778a50133da75693f5a13b2a5ea71ff187c074f29d003e6a5a60b945f9 else ifeq ($(ARCH_PREBUILT),arm_arm926ej-s) - PKG_HASH:=1bfb00c5c2aaa34e2802e172a13d06fd8edfa5dc3c3a9a92f898d02b43e01509 + PKG_HASH:=a43eb9984a93212df55ab47f66dd2dc8cbeb1eda807d9936fb28fe5b58f38991 else ifeq ($(ARCH_PREBUILT),arm_cortex-a15_neon-vfpv4) - PKG_HASH:=0aecbb0745f22535f649d28f6b1a7f0f15695af53efda3cf4d33a636858bb64b + PKG_HASH:=d74106a600a9a22dfb727b30753c6a97d22616a5db690d83ef9166a5288b776c else ifeq ($(ARCH_PREBUILT),arm_cortex-a5_vfpv4) - PKG_HASH:=fae5b1218eaeeb39b59b16a933092e91b01225bbea472e88ff02773d332d79fc + PKG_HASH:=5a121b951bd4dbc19599fdfcde61249a1afc8cd492f290b782808297e987cfab else ifeq ($(ARCH_PREBUILT),arm_cortex-a7) - PKG_HASH:=6ac9e3222de2cc079e3c6cd465d8922031e4970ff05c50d3726e8e08a2c80d75 + PKG_HASH:=a1e7cab958cc4912d65d00fc56144102d88792886bc4d3fc77fad2306ecb2d38 else ifeq ($(ARCH_PREBUILT),arm_cortex-a7_neon-vfpv4) - PKG_HASH:=ed7b3f9e4cf38eaa9e3451c36203c472a9adfefb134da5acd2b47caf7e8b4885 + PKG_HASH:=24bda5d57d206f91341be3cc7da6ab57342f2232b7e725295b1f928bcecc51ac else ifeq ($(ARCH_PREBUILT),arm_cortex-a7_vfpv4) - PKG_HASH:=10242073e2aa04b8f09deb7907183ec9933a8f5cc052206c8580a56ab5b68a0d + PKG_HASH:=13e20e649a226fbb879c1d571caa18bc40bdf27d90a1391172754bcb14ac6b74 else ifeq ($(ARCH_PREBUILT),arm_cortex-a8_vfpv3) - PKG_HASH:=c090e56714dc71c49248c7ec54a95a295daf4f56b66ad889c51ff0eae2ceaadd + PKG_HASH:=4bb88189ceb131136a72e19650a8b495b2124762a20b9a4dad0f2da6a296f8b5 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9) - PKG_HASH:=2aafcb1169336924ce22eef37fef72a2e3b0504c83effc5c18a030e2e79245f8 + PKG_HASH:=9a9913aab430e5f319ce1efdf9e673c12174eb5977596f6b6af8c69f5be095e4 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9_neon) - PKG_HASH:=4f119877f9b9326b8648b3015f129ed27f0eab3c1bf14ad59f4bd34b41c1a7ab + PKG_HASH:=9cb857ad352a7fafc06569aaae2a90d43fc5ad33a383686b56dbd508c6caa3c3 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9_vfpv3-d16) - PKG_HASH:=d47b762719889870d0ecb1b700fd444b840757c34845bd9008031bcbe564dada + PKG_HASH:=89582a47cc611e5caa51e720a13139cd87b3b22105c204afaa8744ad8ddca0a5 else ifeq ($(ARCH_PREBUILT),arm_mpcore) - PKG_HASH:=04d609af80585520ecb96a512f203c375f2483b41256c5c220c6d687297619d1 + PKG_HASH:=3f8a2513ac301a16344b24544f86e4b62355622ec8dc9c6757b0faee231a7560 else ifeq ($(ARCH_PREBUILT),arm_xscale) - PKG_HASH:=b98fcc755b4e542965707cae3fd87fb01e5fded09c3279f54825d917f9f0c9e2 + PKG_HASH:=2ca1330ed5dd42a92221e32e5a769d19ac87787b0f4cf6a3dbe065241f16dd4d else ifeq ($(ARCH_PREBUILT),mipsel_24kc) - PKG_HASH:=c7c3f3482818fea9d72598d17a03b065b9bd8bccfbe7c8226860a8ab68b12e22 + PKG_HASH:=a24acff64dc71603d46951b4f1496e3704ef60d17e25b221fa1664d37e1d375b else ifeq ($(ARCH_PREBUILT),mipsel_mips32) - PKG_HASH:=733ef1bfb67b12111ff05df38c4ee0b14228589f48be5f1f967efe04cffd7ce2 + PKG_HASH:=3ecc3c6796cd26dec68b6e6989bbd2636502e735323c81c954441431678b45dc else ifeq ($(ARCH_PREBUILT),riscv64) - PKG_HASH:=3b9cea024b0d8c79927c463741845f1623be9544dd3b7767fc9d55b0d7c564f4 + PKG_HASH:=f72aeda71c6da0b75ccf2a09f2a963e750aba9f18f7a849fd09bcbfa89514199 else ifeq ($(ARCH_PREBUILT),x86) - PKG_HASH:=06e4c5595b2de9f3f0f6a347add46f72e213a6686be1abc3bc8efca876c4a07d + PKG_HASH:=b3513fee31ec503a3835579d211f5d0aa70e2d46b17eda363d42841d7ea15552 else ifeq ($(ARCH_PREBUILT),x86_64) - PKG_HASH:=5fce9437c84c2cec6322753c424c5f2f5621cc91d6aa3743650e6d7b54407a44 + PKG_HASH:=f1a1742f78f0b4b7fa36f8f4600598579b048da6c033c353633b396ec24c1bf2 else PKG_HASH:=dummy endif diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index e9c33173..8934af09 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=a322dfb6bfd8987c83453c39582a07771c9deddf9f8f7d2d19c7927ebd5e76c8 endef -GEOSITE_VER:=20260613160425 +GEOSITE_VER:=20260614060203 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=346a916bb366fc7162458fe0ca3ec72603ec92b92fb755f1ea7d37720e34f674 + HASH:=ba318433841e627a47e7909cdcab5b60fa1f3b06d937151b6f3bc54a1153e63a endef GEOSITE_IRAN_VER:=202606080206