diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index 252a4b2ea..9c4582819 100644 --- a/luci-app-godproxy/Makefile +++ b/luci-app-godproxy/Makefile @@ -2,51 +2,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-godproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=3-20211109 +PKG_RELEASE:=3-20211112 -include $(INCLUDE_DIR)/package.mk +PKG_MAINTAINER:=panda-mute -define Package/luci-app-godproxy - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI support for koolproxy - DEPENDS:=+openssl-util +ipset +dnsmasq-full +@BUSYBOX_CONFIG_DIFF +iptables-mod-nat-extra +wget - MAINTAINER:=panda-mute +LUCI_TITLE:=LuCI support for koolproxy +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+koolproxy +openssl-util +ipset +dnsmasq-full +@BUSYBOX_CONFIG_DIFF +iptables-mod-nat-extra +wget + +define Package/$(PKG_NAME)/conffiles +/etc/config/koolproxy +/usr/share/koolproxy/data/rules/ endef -define Build/Compile -endef +include $(TOPDIR)/feeds/luci/luci.mk -define Package/luci-app-godproxy/conffiles - /etc/config/koolproxy - /usr/share/koolproxy/data/rules/ -endef - -define Package/luci-app-godproxy/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci - cp -pR ./luasrc/* $(1)/usr/lib/lua/luci - $(INSTALL_DIR) $(1)/ - cp -pR ./root/* $(1)/ - -ifeq ($(ARCH),aarch64) - $(INSTALL_BIN) ./bin/aarch64 $(1)/usr/share/koolproxy/koolproxy - -else ifeq ($(ARCH),arm) - $(INSTALL_BIN) ./bin/arm $(1)/usr/share/koolproxy/koolproxy - -else ifeq ($(ARCH),i386) - $(INSTALL_BIN) ./bin/i386 $(1)/usr/share/koolproxy/koolproxy - -else ifeq ($(ARCH),mips) - $(INSTALL_BIN) ./bin/mips $(1)/usr/share/koolproxy/koolproxy - -else ifeq ($(ARCH),mipsel) - $(INSTALL_BIN) ./bin/mipsel $(1)/usr/share/koolproxy/koolproxy - -else ($(ARCH),x86_64) - $(INSTALL_BIN) ./bin/x86_64 $(1)/usr/share/koolproxy/koolproxy -endif -endef - -$(eval $(call BuildPackage,luci-app-godproxy)) +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-godproxy/koolproxy/Makefile b/luci-app-godproxy/koolproxy/Makefile new file mode 100644 index 000000000..deb4ba096 --- /dev/null +++ b/luci-app-godproxy/koolproxy/Makefile @@ -0,0 +1,43 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=koolproxy +PKG_VERSION:=3.8.5 +PKG_RELEASE:=$(AUTORELEASE) + +include $(INCLUDE_DIR)/package.mk + +define Package/koolproxy + SECTION:=multimedia + CATEGORY:=Multimedia + DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) + TITLE:=koolproxy bin from koolshare + URL:=https://github.com/houzi-/CDN +endef + +define Build/Compile +endef + +define Package/koolproxy/install + $(INSTALL_DIR) $(1)/usr/share/koolproxy + +ifeq ($(ARCH),aarch64) + $(INSTALL_BIN) ./files/aarch64 $(1)/usr/share/koolproxy/koolproxy + +else ifeq ($(ARCH),arm) + $(INSTALL_BIN) ./files/arm $(1)/usr/share/koolproxy/koolproxy + +else ifeq ($(ARCH),i386) + $(INSTALL_BIN) ./files/i386 $(1)/usr/share/koolproxy/koolproxy + +else ifeq ($(ARCH),mips) + $(INSTALL_BIN) ./files/mips $(1)/usr/share/koolproxy/koolproxy + +else ifeq ($(ARCH),mipsel) + $(INSTALL_BIN) ./files/mipsel $(1)/usr/share/koolproxy/koolproxy + +else ifeq ($(ARCH),x86_64) + $(INSTALL_BIN) ./files/x86_64 $(1)/usr/share/koolproxy/koolproxy +endif +endef + +$(eval $(call BuildPackage,koolproxy)) diff --git a/luci-app-godproxy/bin/aarch64 b/luci-app-godproxy/koolproxy/files/aarch64 similarity index 100% rename from luci-app-godproxy/bin/aarch64 rename to luci-app-godproxy/koolproxy/files/aarch64 diff --git a/luci-app-godproxy/bin/arm b/luci-app-godproxy/koolproxy/files/arm similarity index 100% rename from luci-app-godproxy/bin/arm rename to luci-app-godproxy/koolproxy/files/arm diff --git a/luci-app-godproxy/bin/i386 b/luci-app-godproxy/koolproxy/files/i386 similarity index 100% rename from luci-app-godproxy/bin/i386 rename to luci-app-godproxy/koolproxy/files/i386 diff --git a/luci-app-godproxy/bin/mips b/luci-app-godproxy/koolproxy/files/mips similarity index 100% rename from luci-app-godproxy/bin/mips rename to luci-app-godproxy/koolproxy/files/mips diff --git a/luci-app-godproxy/bin/mipsel b/luci-app-godproxy/koolproxy/files/mipsel similarity index 100% rename from luci-app-godproxy/bin/mipsel rename to luci-app-godproxy/koolproxy/files/mipsel diff --git a/luci-app-godproxy/bin/x86_64 b/luci-app-godproxy/koolproxy/files/x86_64 similarity index 100% rename from luci-app-godproxy/bin/x86_64 rename to luci-app-godproxy/koolproxy/files/x86_64 diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index 8ca242ca5..bcf2b43cb 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,53 +1,53 @@ -2021-11-11 04:35:56: ------------------- 规则更新 ----------------------- -2021-11-11 04:35:56: ==================================================== -2021-11-11 04:35:56: 开始更新koolproxy的规则，请等待... -2021-11-11 04:35:56: --------------------------------------------------------------------------------------- -2021-11-11 04:35:58: --------------------------------------------------------------------------------------- -2021-11-11 04:36:00: ABP规则的本地版本号： 202111100441 -2021-11-11 04:36:00: ABP规则的在线版本号： 202111110431 -2021-11-11 04:36:00: 检测到 ABP规则 已更新，现在开始更新... -2021-11-11 04:36:00: 将临时的ABP规则文件移动到指定位置 -2021-11-11 04:36:01: yhosts规则本地版本号： 202111082343 -2021-11-11 04:36:01: yhosts规则在线版本号： 202111082343 -2021-11-11 04:36:01: 检测到yhosts本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-11 04:36:01: 远程视频规则md5： -2021-11-11 04:36:01: 您本地视频规则md5： -2021-11-11 04:36:01: 检测到 视频规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-11 04:36:03: fanboy规则本地版本号： 202111100400 -2021-11-11 04:36:03: fanboy规则在线版本号： 202111110400 -2021-11-11 04:36:03: 检测到新版本 fanboy规则 列表，开始更新... -2021-11-11 04:36:03: 将临时文件覆盖到原始 fanboy规则 文件 -2021-11-11 04:36:03: antiad规则本地版本号： 20211108024012 -2021-11-11 04:36:03: antiad规则在线版本号： 20211111023927 -2021-11-11 04:36:03: 检测到新版本 antiad规则 列表，开始更新... -2021-11-11 04:36:03: 将临时文件覆盖到原始 antiad规则 文件 -2021-11-11 04:36:03: Android规则本地版本号： 20211107000607 -2021-11-11 04:36:03: Android规则在线版本号： 20211107000607 -2021-11-11 04:36:03: 检测到 Android规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-11 04:36:03: StevenBlack规则本地版本号： 04 November 2021 -2021-11-11 04:36:03: StevenBlack规则在线版本号： 04 November 2021 -2021-11-11 04:36:03: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-11 04:36:04: AdAway规则本地版本号： mobile ad -2021-11-11 04:36:04: AdAway规则在线版本号： -2021-11-11 04:36:04: 检测到新版本 AdAway规则 列表，开始更新... -2021-11-11 04:36:04: 将临时文件覆盖到原始 AdAway规则 文件 -2021-11-11 04:36:04: 正在优化 fanboy规则。。。。。 -2021-11-11 04:36:04: 正在优化 ABP规则。。。。。 -2021-11-11 04:36:09: 跳过优化 补充规则yhosts。。。。。 -2021-11-11 04:36:09: 正在优化 补充规则antiad。。。。。 -2021-11-11 04:36:10: 跳过优化 补充规则Android。。。。。 -2021-11-11 04:36:10: 跳过优化 补充规则StevenBlack。。。。。 -2021-11-11 04:36:10: 正在优化 补充规则AdAway。。。。。 -2021-11-11 04:36:10: 所有规则更新并优化完毕！ -2021-11-11 04:36:10: ==================================================== -2021-11-11 04:36:14: -------------------ABP规则 version 202111110431 -2021-11-11 04:36:14: -------------------Fanboy规则 version 202111110400 -2021-11-11 04:36:14: -------------------Yhosts规则 version 202111082343 -2021-11-11 04:36:14: -------------------Antiad规则 version 20211111023927 -2021-11-11 04:36:14: -------------------AdAway规则 version -2021-11-11 04:36:14: -------------------Android规则 version 20211107000607 -2021-11-11 04:36:14: -------------------StevenBlack规则 version 04 November 2021 -2021-11-11 04:36:14: -------------------静态规则 version 2021-04-04 18:30 -2021-11-11 04:36:14: -------------------乘风视频 version 202111051 -2021-11-11 04:36:14: ------------------- 内置规则更新成功！ ------------------- -2021-11-11 04:36:14: ------------------- 规则更新成功！ ------------------- +2021-11-11 16:51:19: ------------------- 规则更新 ----------------------- +2021-11-11 16:51:19: ==================================================== +2021-11-11 16:51:19: 开始更新koolproxy的规则，请等待... +2021-11-11 16:51:19: --------------------------------------------------------------------------------------- +2021-11-11 16:51:20: --------------------------------------------------------------------------------------- +2021-11-11 16:51:22: ABP规则的本地版本号： 202111111642 +2021-11-11 16:51:22: ABP规则的在线版本号： 202111111642 +2021-11-11 16:51:22: 检测到 ABP规则本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 16:51:24: yhosts规则本地版本号： 202111082343 +2021-11-11 16:51:24: yhosts规则在线版本号： 202111082343 +2021-11-11 16:51:24: 检测到yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 16:51:24: 远程视频规则md5： +2021-11-11 16:51:24: 您本地视频规则md5：f8d84bfe1d9ef0890d0e4d8499f42936 +2021-11-11 16:51:24: 检测到新版视频规则.开始更新.......... +2021-11-11 16:51:25: 您下载的视频规则md5：742d507e87a77825498fc426308b7472 +2021-11-11 16:51:25: 视频规则md5校验不通过... +2021-11-11 16:51:26: fanboy规则本地版本号： 202111111600 +2021-11-11 16:51:26: fanboy规则在线版本号： 202111111650 +2021-11-11 16:51:26: 检测到新版本 fanboy规则 列表，开始更新... +2021-11-11 16:51:26: 将临时文件覆盖到原始 fanboy规则 文件 +2021-11-11 16:51:26: antiad规则本地版本号： 20211111023927 +2021-11-11 16:51:26: antiad规则在线版本号： 20211111023927 +2021-11-11 16:51:26: 检测到 antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 16:51:27: Android规则本地版本号： 20211107000607 +2021-11-11 16:51:27: Android规则在线版本号： 20211107000607 +2021-11-11 16:51:27: 检测到 Android规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 16:51:27: StevenBlack规则本地版本号： 04 November 2021 +2021-11-11 16:51:27: StevenBlack规则在线版本号： 04 November 2021 +2021-11-11 16:51:27: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 16:51:27: AdAway规则本地版本号： mobile ad +2021-11-11 16:51:27: AdAway规则在线版本号： +2021-11-11 16:51:27: 检测到新版本 AdAway规则 列表，开始更新... +2021-11-11 16:51:27: 将临时文件覆盖到原始 AdAway规则 文件 +2021-11-11 16:51:27: 正在优化 fanboy规则。。。。。 +2021-11-11 16:51:28: 跳过优化 ABP规则。。。。。 +2021-11-11 16:51:28: 跳过优化 补充规则yhosts。。。。。 +2021-11-11 16:51:28: 跳过优化 补充规则antiad。。。。。 +2021-11-11 16:51:28: 跳过优化 补充规则Android。。。。。 +2021-11-11 16:51:28: 跳过优化 补充规则StevenBlack。。。。。 +2021-11-11 16:51:28: 正在优化 补充规则AdAway。。。。。 +2021-11-11 16:51:28: 所有规则更新并优化完毕！ +2021-11-11 16:51:28: ==================================================== +2021-11-11 16:51:31: -------------------ABP规则 version 202111111642 +2021-11-11 16:51:31: -------------------Fanboy规则 version 202111111650 +2021-11-11 16:51:31: -------------------Yhosts规则 version 202111082343 +2021-11-11 16:51:31: -------------------Antiad规则 version 20211111023927 +2021-11-11 16:51:31: -------------------AdAway规则 version +2021-11-11 16:51:31: -------------------Android规则 version 20211107000607 +2021-11-11 16:51:31: -------------------StevenBlack规则 version 04 November 2021 +2021-11-11 16:51:31: -------------------静态规则 version 2021-10-07 18:00 +2021-11-11 16:51:31: -------------------乘风视频 version 202111051 +2021-11-11 16:51:31: ------------------- 内置规则更新成功！ ------------------- +2021-11-11 16:51:31: ------------------- 规则更新成功！ -------------------