From bd5e3eead2ca39538ed111213fba6568fac893e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 12 Apr 2026 20:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=B8=20Sync=202026-04-12=2020:23:24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aria2/Makefile | 5 +++-- luci-app-chongyoung2.0/Makefile | 4 ++-- luci-app-dynv6/Makefile | 2 +- .../root/etc/uci-defaults/luci-dynv6 | 9 --------- luci-app-my-dnshelper/Makefile | 6 +++--- .../root/usr/share/passwall/subscribe.lua | 4 ++-- luci-app-synology/Makefile | 2 +- luci-app-timedreboot/Makefile | 6 +++--- momo/Makefile | 20 ++++++++++++------- 9 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 luci-app-dynv6/root/etc/uci-defaults/luci-dynv6 diff --git a/aria2/Makefile b/aria2/Makefile index 25d7883e..d627f57b 100644 --- a/aria2/Makefile +++ b/aria2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aria2 PKG_VERSION:=1.37.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/ @@ -108,11 +108,12 @@ define Build/Prepare $(call Build/Prepare/Default) unzip $(DL_DIR)/aria2.conf -d $(PKG_BUILD_DIR)/ sed -i '/rpc-secret/d' $(PKG_BUILD_DIR)/aria2.conf-master/* + [ -x $(PKG_BUILD_DIR)/aria2.conf-master/tracker.sh ] && { cd $(PKG_BUILD_DIR)/aria2.conf-master && sh ./tracker.sh >/dev/null 2>&1 } endef define Package/aria2/postinst #!/bin/sh -[ -x $${IPKG_INSTROOT}/usr/share/aria2//tracker.sh ] && (cd $${IPKG_INSTROOT}/usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 &) || exit 0 +[ -x $${IPKG_INSTROOT}/usr/share/aria2//tracker.sh ] && { cd $${IPKG_INSTROOT}/usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 & } || exit 0 endef define Package/aria2/install diff --git a/luci-app-chongyoung2.0/Makefile b/luci-app-chongyoung2.0/Makefile index edddb524..2c15ba79 100644 --- a/luci-app-chongyoung2.0/Makefile +++ b/luci-app-chongyoung2.0/Makefile @@ -10,11 +10,11 @@ LUCI_TITLE:=chongyoung LUCI_DEPENDS:= LUCI_PKGARCH:=all PKG_VERSION:=4.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 define Package/luci-app-chongyoung-lua/postinst #!/bin/sh -chmod +x $${IPKG_INSTROOT}/etc/init.d/* +chmod +x $(1)/etc/init.d/* exit 0 endef diff --git a/luci-app-dynv6/Makefile b/luci-app-dynv6/Makefile index 9da90c17..3480dcfa 100755 --- a/luci-app-dynv6/Makefile +++ b/luci-app-dynv6/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=dynv6 ddns script LUCI_DEPENDS:= +luci-compat PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_MAINTAINER:=luochongjun define Package/luci-app-dynv6/postinst diff --git a/luci-app-dynv6/root/etc/uci-defaults/luci-dynv6 b/luci-app-dynv6/root/etc/uci-defaults/luci-dynv6 deleted file mode 100644 index b89d7328..00000000 --- a/luci-app-dynv6/root/etc/uci-defaults/luci-dynv6 +++ /dev/null @@ -1,9 +0,0 @@ - #!/bin/sh - -uci -q get ucitrack.@dynv6[0] || uci add ucitrack dynv6 -uci set ucitrack.@dynv6[0]=dynv6 -uci set ucitrack.@dynv6[0].exec="/bin/sh /etc/rc.common /etc/init.d/dynv6 restart" -uci commit ucitrack -/etc/init.d/ucitrack restart - -exit 0 diff --git a/luci-app-my-dnshelper/Makefile b/luci-app-my-dnshelper/Makefile index 3de662f6..7c34bb3d 100644 --- a/luci-app-my-dnshelper/Makefile +++ b/luci-app-my-dnshelper/Makefile @@ -17,9 +17,9 @@ LUCI_DEPENDS:=+my-dnshelper define Package/$(PKG_NAME)/postinst #!/bin/sh - chmod a+x $${IPKG_INSTROOT}/etc/init.d/my-dnshelper >/dev/null 2>&1 || echo "" - chmod a+x $${IPKG_INSTROOT}/usr/share/my-dnshelper/* >/dev/null 2>&1 || echo "" - chmod a+x $${IPKG_INSTROOT}/usr/bin/my-dnshelper >/dev/null 2>&1 || echo "" + chmod a+x ${IPKG_INSTROOT}/etc/init.d/my-dnshelper >/dev/null 2>&1 || echo "" + chmod a+x ${IPKG_INSTROOT}/usr/share/my-dnshelper/* >/dev/null 2>&1 || echo "" + chmod a+x ${IPKG_INSTROOT}/usr/bin/my-dnshelper >/dev/null 2>&1 || echo "" exit 0 endef diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 86e5e511..c6773e71 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1867,7 +1867,7 @@ local function update_node(manual) if domain_strategy then if vvv == "sing-box" then local map = { UseIPv4v6 = "prefer_ipv4", UseIPv6v4 = "prefer_ipv6", UseIPv4 = "ipv4_only", UseIPv6 = "ipv6_only" } - domain_strategy = map[domain_strategy or ""] + domain_strategy = map[domain_strategy] or "" end uci:set(appname, cfgid, "domain_strategy", domain_strategy) end @@ -2087,7 +2087,7 @@ local execute = function() domain_resolver_dns = value.domain_resolver_dns domain_resolver_dns_https = value.domain_resolver_dns_https local map = { UseIPv4v6 = 1, UseIPv6v4 = 1, UseIPv4 = 1, UseIPv6 = 1 } - domain_strategy = (not map[value.domain_strategy or ""]) and value.domain_strategy or nil + domain_strategy = (value.domain_strategy and map[value.domain_strategy]) and value.domain_strategy or nil -- 订阅组链式代理 local function valid_chain_node(node) diff --git a/luci-app-synology/Makefile b/luci-app-synology/Makefile index 74eeaaf5..fd9a875b 100644 --- a/luci-app-synology/Makefile +++ b/luci-app-synology/Makefile @@ -15,7 +15,7 @@ include $(TOPDIR)/feeds/luci/luci.mk define Package/luci-app-synology/postinst #!/bin.sh -chmod a+x ${IPKG_INSTROOT}/etc/init.d/synology >/dev/null 2>&1 +chmod 755 /etc/init.d/synology exit 0 endef diff --git a/luci-app-timedreboot/Makefile b/luci-app-timedreboot/Makefile index 548b8f23..865ff433 100644 --- a/luci-app-timedreboot/Makefile +++ b/luci-app-timedreboot/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-timedreboot PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_DATE:=20220920 PKG_MAINTAINER:=kongfl888 @@ -47,8 +47,8 @@ endef define Package/$(PKG_NAME)/postinst #!/bin/sh - chmod a+x $${IPKG_INSTROOT}/etc/init.d/timedreboot >/dev/null 2>&1 - chmod a+x $${IPKG_INSTROOT}/usr/bin/dorboot >/dev/null 2>&1 + chmod a+x ${IPKG_INSTROOT}/etc/init.d/timedreboot >/dev/null 2>&1 + chmod a+x ${IPKG_INSTROOT}/usr/bin/dorboot >/dev/null 2>&1 exit 0 endef diff --git a/momo/Makefile b/momo/Makefile index 46da9e52..54b2677a 100644 --- a/momo/Makefile +++ b/momo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=momo PKG_VERSION:=2026.04.09 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Joseph Mory @@ -12,15 +12,11 @@ include $(INCLUDE_DIR)/package.mk define Package/momo SECTION:=net CATEGORY:=Network - TITLE:=The universal proxy platform. - URL:=https://sing-box.sagernet.org + TITLE:=Transparent Proxy with sing-box on OpenWrt. + URL:=https://github.com/nikkinikki-org DEPENDS:=+ca-bundle +curl firewall4 +ip-full +kmod-inet-diag +kmod-nft-socket +kmod-nft-tproxy +kmod-tun +kmod-dummy +sing-box endef -define Package/momo/description - The universal proxy platform. -endef - define Package/momo/conffiles /etc/config/momo endef @@ -60,6 +56,16 @@ define Package/momo/install $(INSTALL_DATA) $(CURDIR)/files/momo.upgrade $(1)/lib/upgrade/keep.d/momo endef +define Package/momo/postrm +#!/bin/sh +if [ -z $${IPKG_INSTROOT} ]; then + uci -q batch <<-EOF > /dev/null + del firewall.momo + commit firewall + EOF +fi +endef + define Build/Compile endef