update 2023-03-02 22:48:53

adguardhome/Makefile

@@ -22,13 +22,15 @@ PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
+PKG_CONFIG_DEPENDS:=CONFIG_ADGUARDHOME_COMPRESS_GOPROXY
+
 GO_PKG:=github.com/AdguardTeam/AdGuardHome
 GO_PKG_BUILD_PKG:=github.com/AdguardTeam/AdGuardHome
 
 AGH_BUILD_TIME:=$(shell date -d @$(SOURCE_DATE_EPOCH) +%FT%TZ%z)
 AGH_VERSION_PKG:=github.com/AdguardTeam/AdGuardHome/internal/version
 GO_PKG_LDFLAGS_X:=$(AGH_VERSION_PKG).channel=release \
-	$(AGH_VERSION_PKG).version=$(PKG_SOURCE_VERSION) \
+	$(AGH_VERSION_PKG).version=v$(PKG_VERSION) \
 	$(AGH_VERSION_PKG).buildtime=$(AGH_BUILD_TIME) \
 	$(AGH_VERSION_PKG).goarm=$(GO_ARM) \
 	$(AGH_VERSION_PKG).gomips=$(GO_MIPS)
@@ -53,6 +55,17 @@ define Package/adguardhome/description
 Free and open source, powerful network-wide ads and trackers blocking DNS server.
 endef
 
+define Package/$(PKG_NAME)/config
+config ADGUARDHOME_COMPRESS_GOPROXY
+	bool "Compiling with GOPROXY proxy"
+	default n
+endef
+
+ifeq ($(CONFIG_ADGUARDHOME_COMPRESS_GOPROXY),y)
+export GO111MODULE=on
+export GOPROXY=https://goproxy.bj.bcebos.com
+endif
+
 define Build/Compile
 	( \
 		pushd $(PKG_BUILD_DIR) ; \

chinadns-ng/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chinadns-ng
-PKG_VERSION:=1.0-beta.25
+PKG_VERSION:=2023.03.22
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git
-PKG_SOURCE_DATE:=2021-05-08
+PKG_SOURCE_DATE:=2023.03.02
-PKG_SOURCE_VERSION:=14cc6348d67b09cae37d9bce554c89c2c0e0b265
+PKG_SOURCE_VERSION:=a2ceae6b3530217e3339fb502d30daac7315b83e
-PKG_MIRROR_HASH:=3b66fc0888d9488e3b8e39df3016d51fae1b43325d292381e94aa3c7d2318282
+PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=AGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE

luci-app-rtbwmon/Makefile

@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.0-1
+PKG_VERSION:=1.0.1-1
 PKG_RELEASE:=
 PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>
 
@@ -10,6 +10,14 @@ LUCI_TITLE:=LuCI realtime client bandwidth monitor
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+iptables
 
+define Package/luci-app-rtbwmon/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+    /usr/libexec/rtbwmon.sh prerm
+fi
+exit 0
+endef
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

luci-app-rtbwmon/root/usr/libexec/rtbwmon.sh

@@ -123,16 +123,13 @@ update() {
     exec 1000>/var/run/rtbwmon.lock
     flock -n 1000 2>/dev/null || {
         flock 1000 2>/dev/null
-        [ -f /var/run/rtbwmon.csv ] && {
+        [ -f /var/run/rtbwmon.csv ] && cat /var/run/rtbwmon.csv
-            cat /var/run/rtbwmon.csv
+        flock -u 1000 2>/dev/null
-            flock -u 1000 2>/dev/null
+        return 1
-            return 1
-        }
     }
 
     if [ -z "$WAN_INTERFACE" ]; then
         do_clean
-        > /var/run/rtbwmon.csv
     else
         do_update "$WAN_INTERFACE" 2>/dev/null
         cat /var/run/rtbwmon.csv
@@ -162,7 +159,7 @@ run_gc() {
             break
         fi
     done
-    clean
+    [ -f /var/run/rtbwmon.csv ] && clean
     flock -u 1001
     return 0
 }
@@ -173,6 +170,17 @@ show_ifaces() {
     ip addr show scope global up | grep '^ \+inet ' | sed -n -e 's/^.* \([^ ]\+\)$/\1/p' | grep -Fv "$WAN_INTERFACE" | sort -u
 }
 
+prerm() {
+    # avoid invoke
+    chmod 644 /usr/libexec/rtbwmon.sh
+
+    exec 1000>/var/run/rtbwmon.lock
+    flock 1000
+    sleep 1 </dev/null >/dev/null 2>&1 1000>/dev/null
+    do_clean
+    flock -u 1000
+}
+
 case $1 in
 "clean")
 	clean
@@ -186,6 +194,9 @@ case $1 in
 "gc")
     run_gc
     ;;
+"prerm")
+    prerm
+    ;;
 *)
 	echo \
 		"Usage: $0 {update|clean|ifaces}

v2ray-geodata/Makefile

@@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202302230047
+GEOIP_VER:=202303020053
 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:=958b34017682aa28d2bf7f0368cdb62934c5623bf405d96ab12e54e320adfea0
+  HASH:=4cd53acc7e2896cab0cbdd39fd43fd6fc60073be6a025f4fb80710e6bb55090e
 endef
 
 GEOSITE_VER:=20230302073658