update 2026-02-02 00:35:05

luci-app-pppoe-relay/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for PPPoE Relay
 LUCI_DEPENDS:=+rp-pppoe-common +rp-pppoe-relay
 LUCI_PKGARCH:=all
 PKG_VERSION:=1
-PKG_RELEASE:=2-20200326
+PKG_RELEASE:=3-20260201
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

luci-app-pppoe-relay/root/etc/config/pppoe-relay

@@ -1 +1,6 @@
 
+config service
+	option enabled '0'
+	option server_interface 'wan'
+	option client_interface 'br-lan'
+

luci-app-pppoe-relay/root/etc/init.d/pppoe-relay

@@ -5,14 +5,16 @@ START=99
 
 CONFIG="pppoe-relay"
 
+BIN="$(command -v pppoe-relay)"
+
 setup_service() {
 	config_get enabled $1 enabled
 	[ "$enabled" -eq 0 ] && return 0
 	config_get server_interface $1 server_interface
 	config_get client_interface $1 client_interface
 	[ -n "$server_interface" -a -n "$client_interface" ] && {	
-		is_run=$(ps | grep "/usr/sbin/pppoe-relay -S $server_interface -C $client_interface" | grep -v "grep")
-		[ -z "$is_run" ] && /usr/sbin/pppoe-relay -S $server_interface -C $client_interface
+		top -bn1 | grep "${BIN}" | grep -v "grep" >/dev/null
+		[ "$?" != 0 ] && ${BIN} -S $server_interface -C $client_interface
 	}
 }
 
@@ -22,5 +24,5 @@ start() {
 }
 
 stop() {
-	killall -q -9 pppoe-relay
+	killall -q -9 ${BIN}
 }

luci-app-pppoe-relay/root/etc/uci-defaults/luci-app-pppoe-relay

@@ -7,5 +7,8 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
+rm -f /tmp/luci-indexcache /tmp/luci-indexcache.*
+rm -rf /tmp/luci-modulecache/
+killall -HUP rpcd 2>/dev/null
+
 exit 0

v2ray-geodata/Makefile

@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=ed2de9add79623e2e5dbc5930ee39cc7037a7c6e0ecd58ba528b6f73d61457b5
 endef
 
-GEOSITE_VER:=20260201035843
+GEOSITE_VER:=20260201133610
 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:=4846b83865dc78914ae9dc9139cf4b221f10f8aef69107a8a24b1f2e2e378792
+  HASH:=1ee9a82122777fbe524ed3a105aa10f7887f5884ffccfe59fc26ccb65241b650
 endef
 
 GEOSITE_IRAN_VER:=202601260049