Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>

net/kadnode/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=kadnode
-PKG_VERSION:=2.4.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mwarning/KadNode
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=9e5f503785f5f894f951c747c00586233b75254e91d2555f83b14ee2f07214c9
+PKG_MIRROR_HASH:=3583e409862982db88545fde721ed59cfc78df8c59ab1a715a621ad657e05248
 
 PKG_MAINTAINER:=Moritz Warning <[email protected]>
 PKG_LICENSE:=MIT

net/kadnode/files/kadnode.config

@@ -37,6 +37,7 @@ config kadnode
 ## Add static peers addresses.
 	list peer 'bttracker.debian.org:6881'
 	list peer 'router.bittorrent.com:6881'
+	list peer 'dht.libtorrent.org:25401'
 
 ## Bind the DHT to this port.
 #	option port '6881'
@@ -45,9 +46,11 @@ config kadnode
 #	option ifname 'eth0'
 
 ## Verbosity: quiet, verbose or debug
+## Default: verbose
 #	option verbosity 'quiet'
 
 ## Local port to accept forwarded requests.
+## Enabled by default.
 #	option dns_port '3535'
 
 ## Disable multicast peer discovery on the LAN.
@@ -56,3 +59,6 @@ config kadnode
 ## Disable port forwarding when this router is behind another
 ## router in a private network that supports UPnP/NAT-PMP.
 #	option fwd_disable '1'
+
+## Isolate DHT swarn to nodes that use this (base16) prefix.
+#	dht_isolation_prefix '01234'

net/v2ray-geodata/Makefile

@@ -12,31 +12,31 @@ PKG_MAINTAINER:=Tianling Shen <[email protected]>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202412120057
+GEOIP_VER:=202501020052
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
   URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
   URL_FILE:=geoip.dat
   FILE:=$(GEOIP_FILE)
-  HASH:=5a184de8e36b5b131e405eb1078856703c0727f097636529cbbe47f38f2fe92d
+  HASH:=dba9102d288936e3b9b6511c0d0b03e62865c130a2263cb4719ad80b7a9f69bf
 endef
 
-GEOSITE_VER:=20241210004721
+GEOSITE_VER:=20241221105938
 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:=e414da6132d8b406827b827f246c3fe9759530d61f191b866836fe4d0a7b13a4
+  HASH:=aa65cee72dd6afbf9dd4c474b4ff28ceb063f6abf99249a084091adb4f282f09
 endef
 
-GEOSITE_IRAN_VER:=202412160039
+GEOSITE_IRAN_VER:=202501060036
 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
 define Download/geosite-ir
   URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/
   URL_FILE:=iran.dat
   FILE:=$(GEOSITE_IRAN_FILE)
-  HASH:=3d123bb0c0355a4138b6b1e5259cde523755311b1ddce16a1e6e07642392f7a7
+  HASH:=90cedfdb93e79823bd06df0196f8c223aed2409e03916c1f3eba100cec6a68d2
 endef
 
 define Package/v2ray-geodata/template

net/xray-core/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray-core
-PKG_VERSION:=24.12.18
+PKG_VERSION:=24.12.31
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3d8b4a161a263e7af7bb1a2690961da075d13f980acd806f5cd4e5c8338d7534
+PKG_HASH:=e3c24b561ab422785ee8b7d4a15e44db159d9aa249eb29a36ad1519c15267be0
 
 PKG_MAINTAINER:=Tianling Shen <[email protected]>
 PKG_LICENSE:=MPL-2.0

utils/owut/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owut
-PKG_SOURCE_DATE:=2024-12-10
+PKG_SOURCE_DATE:=2025-01-06
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e38844ae6c805051c791099df6b2e53a1de580fa
+PKG_SOURCE_VERSION:=e623a9007177a5ec7a8bced2a6656505665df477
 PKG_SOURCE_URL:=https://github.com/efahl/owut.git
-PKG_MIRROR_HASH:=629e74244e8df33bd8e2bb3464964e7c255820e9eeae52ace0fd9e272dded415
+PKG_MIRROR_HASH:=e2b0e8ea1a7e20951b028bf199096bc1091ee427020ce3495be275d0e84275de
 
 PKG_MAINTAINER:=Eric Fahlgren <[email protected]>
 PKG_LICENSE:=GPL-2.0-only