diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile index 966e217eb..0b2a41c58 100644 --- a/package/lean/UnblockNeteaseMusicGo/Makefile +++ b/package/lean/UnblockNeteaseMusicGo/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusicGo -PKG_VERSION:=0.1.6 -PKG_RELEASE:=7 +PKG_VERSION:=0.1.9 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=e38035e92a4ecca6c827ec2d572aaf8528ec3cb5 +PKG_SOURCE_VERSION:=d0ca5dcef952ba77ba1abaf3d0f659e600c8c1f1 PKG_MAINTAINER:=Silvan PKG_SOURCE_SUBDIR:=$(PKG_NAME) diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index d6c5b2e9e..0d9051d0c 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=51 +PKG_RELEASE:=55 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby index 64a6fe9ff..8f4385cad 100755 --- a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby +++ b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby @@ -130,13 +130,13 @@ add_rule() $ipt_n -A ADBYBY -d 240.0.0.0/4 -j RETURN ip_rule if [ $(ipset list music -name -quiet | grep music) ]; then - $ipt_n -A ADBYBY -m set --match-set music dst -j RETURN + $ipt_n -A ADBYBY -m set --match-set music dst -j RETURN 2>/dev/null fi - $ipt_n -A ADBYBY -p tcp -j REDIRECT --to-ports 8118 - $ipt_n -I PREROUTING -p tcp --dport 80 -j ADBYBY + $ipt_n -A ADBYBY -p tcp -j REDIRECT --to-ports 8118 2>/dev/null + $ipt_n -I PREROUTING -p tcp --dport 80 -j ADBYBY 2>/dev/null mkdir -p /var/etc - echo -e "/etc/init.d/adbyby reload_rule" > "/var/etc/adbyby.include" + echo -e "/etc/init.d/adbyby restart" > "/var/etc/adbyby.include" } del_rule() diff --git a/package/lean/luci-app-adbyby-plus/root/etc/ppp/ip-up.d/adrulesup.sh b/package/lean/luci-app-adbyby-plus/root/etc/ppp/ip-up.d/adrulesup.sh deleted file mode 100755 index 2325452eb..000000000 --- a/package/lean/luci-app-adbyby-plus/root/etc/ppp/ip-up.d/adrulesup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -sleep 40 && /etc/init.d/adbyby restart diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 37a7218ff..9c4b4d913 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.1 -PKG_RELEASE:=38 +PKG_RELEASE:=39 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 12bca5eb4..585291277 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -45,7 +45,7 @@ ip_rule() do local ip=$(uci_get_by_name acl_rule ipaddr '' $i) local mode=$(uci_get_by_name acl_rule filter_mode '' $i) - echo $i $ip $mode + case "$mode" in http) ipset -! add music_http $ip diff --git a/package/lean/luci-app-zerotier/Makefile b/package/lean/luci-app-zerotier/Makefile index 125d08f06..d557df631 100644 --- a/package/lean/luci-app-zerotier/Makefile +++ b/package/lean/luci-app-zerotier/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=LuCI for Zerotier LUCI_DEPENDS:=+zerotier LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=16 +PKG_RELEASE:=17 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-zerotier/root/etc/zerotier.start b/package/lean/luci-app-zerotier/root/etc/zerotier.start index 98fcf4eaa..eb7bb8c27 100755 --- a/package/lean/luci-app-zerotier/root/etc/zerotier.start +++ b/package/lean/luci-app-zerotier/root/etc/zerotier.start @@ -13,7 +13,7 @@ fi nat_enable=$(uci get zerotier.sample_config.nat) zt0=$(ifconfig | grep zt | awk '{print $1}') -echo "zt interface $zt0 is started!" + echo $zt0 > /tmp/zt.nif iptables -D FORWARD -i $zt0 -j ACCEPT 2>/dev/null iptables -D FORWARD -o $zt0 -j ACCEPT 2>/dev/null