diff --git a/package/lean/adbyby/Makefile b/package/lean/adbyby/Makefile index c01afd749..ffeb94bf9 100644 --- a/package/lean/adbyby/Makefile +++ b/package/lean/adbyby/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adbyby PKG_VERSION:=2.7 -PKG_RELEASE:=20181023 +PKG_RELEASE:=20200307 include $(INCLUDE_DIR)/package.mk @@ -16,7 +16,7 @@ define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=Powerful adblock module to block ad. - DEPENDS:= + DEPENDS:=@(x86||arm||mipsel||mips) URL:=http://www.adbyby.com/ endef @@ -24,6 +24,28 @@ define Package/$(PKG_NAME)/description Adbyby is a powerful adblock module to block ad,just like adblock. endef +ifeq ($(ARCH),x86_64) + ADBYBY_DIR:=amd64 +endif +ifeq ($(ARCH),mipsel) + ADBYBY_DIR:=mipsle +endif +ifeq ($(ARCH),mips) + ADBYBY_DIR:=mips +endif +ifeq ($(ARCH),i386) + ADBYBY_DIR:=x86 +endif +ifeq ($(ARCH),arm) + ADBYBY_DIR:=armv7 + ifeq ($(BOARD),bcm53xx) + ADBYBY_DIR:=arm + endif + ifeq ($(BOARD),kirkwood) + ADBYBY_DIR:=arm + endif +endif + define Build/Prepare endef @@ -47,24 +69,7 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/share/adbyby/doc $(INSTALL_DATA) ./files/doc/* $(1)/usr/share/adbyby/doc/ -ifeq ($(ARCH),mipsel) - $(INSTALL_BIN) ./files/7620n/adbyby $(1)/usr/share/adbyby/ -endif -ifeq ($(ARCH),mips) - $(INSTALL_BIN) ./files/ar71xx/adbyby $(1)/usr/share/adbyby/ -endif -ifeq ($(ARCH),i386) - $(INSTALL_BIN) ./files/x86/adbyby $(1)/usr/share/adbyby/ -endif -ifeq ($(ARCH),x86_64) - $(INSTALL_BIN) ./files/x86_64/adbyby $(1)/usr/share/adbyby/ -endif -ifeq ($(ARCH),arm) - $(INSTALL_BIN) ./files/arm/adbyby $(1)/usr/share/adbyby/ -endif -ifeq ($(ARCH),aarch64) - $(INSTALL_BIN) ./files/armv7/adbyby $(1)/usr/share/adbyby/ -endif + $(INSTALL_BIN) ./files/$(ADBYBY_DIR)/adbyby $(1)/usr/share/adbyby/adbyby endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/adbyby/files/7620n/adbyby b/package/lean/adbyby/files/7620n/adbyby deleted file mode 100755 index 39ab0a1eb..000000000 Binary files a/package/lean/adbyby/files/7620n/adbyby and /dev/null differ diff --git a/package/lean/adbyby/files/amd64/adbyby b/package/lean/adbyby/files/amd64/adbyby new file mode 100755 index 000000000..76c8fa084 Binary files /dev/null and b/package/lean/adbyby/files/amd64/adbyby differ diff --git a/package/lean/adbyby/files/ar71xx/adbyby b/package/lean/adbyby/files/ar71xx/adbyby deleted file mode 100755 index 6c8edf1cb..000000000 Binary files a/package/lean/adbyby/files/ar71xx/adbyby and /dev/null differ diff --git a/package/lean/adbyby/files/armv7/adbyby b/package/lean/adbyby/files/armv7/adbyby index 98dbfbe54..fbbf33f77 100755 Binary files a/package/lean/adbyby/files/armv7/adbyby and b/package/lean/adbyby/files/armv7/adbyby differ diff --git a/package/lean/adbyby/files/mips/adbyby b/package/lean/adbyby/files/mips/adbyby new file mode 100755 index 000000000..c805034d8 Binary files /dev/null and b/package/lean/adbyby/files/mips/adbyby differ diff --git a/package/lean/adbyby/files/mipsle/adbyby b/package/lean/adbyby/files/mipsle/adbyby new file mode 100755 index 000000000..d4ddaafa8 Binary files /dev/null and b/package/lean/adbyby/files/mipsle/adbyby differ diff --git a/package/lean/adbyby/files/x86/adbyby b/package/lean/adbyby/files/x86/adbyby index a3970fe2f..e6956ba26 100755 Binary files a/package/lean/adbyby/files/x86/adbyby and b/package/lean/adbyby/files/x86/adbyby differ diff --git a/package/lean/adbyby/files/x86_64/adbyby b/package/lean/adbyby/files/x86_64/adbyby deleted file mode 100755 index 5c5606063..000000000 Binary files a/package/lean/adbyby/files/x86_64/adbyby and /dev/null differ diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index f7fe45cb9..c3f7246bc 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adbyby -LUCI_DEPENDS:=+adbyby +wget +ipset +coreutils +coreutils-nohup +dnsmasq-full +LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=45 +PKG_RELEASE:=46 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 212dba9b6..34c440bef 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 @@ -129,6 +129,9 @@ add_rule() $ipt_n -A ADBYBY -d 224.0.0.0/4 -j RETURN $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 + fi $ipt_n -A ADBYBY -p tcp -j REDIRECT --to-ports 8118 $ipt_n -I PREROUTING -p tcp --dport 80 -j ADBYBY }