diff --git a/homebox/Makefile b/homebox/Makefile index b85bdc173..b2b475196 100644 --- a/homebox/Makefile +++ b/homebox/Makefile @@ -1,8 +1,13 @@ +# SPDX-License-Identifier: GPL-3.0-only +# Copyright (c) 2020-2024 sirpdboy herboy2008@gmail.com +# + include $(TOPDIR)/rules.mk PKG_NAME:=homebox -PKG_VERSION:=0.0.0-dev.2024101306 -PKG_RELEASE:=2 +PKG_VERSION:=0.0.0.2024101306 +PKG_REAL_VER:=0.0.0-dev.2024101306 +PKG_RELEASE:=3 ifeq ($(ARCH),aarch64) H_ARCH:=arm64 @@ -39,7 +44,7 @@ endef define Build/Prepare mkdir -p $(PKG_BUILD_DIR) - [ ! -f $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz ] && wget https://github.com/XGHeaven/homebox/releases/download/v$(PKG_VERSION)/server-linux-$(H_ARCH).tar.gz -O $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz + [ ! -f $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz ] && wget https://github.com/XGHeaven/homebox/releases/download/v$(PKG_REAL_VER)/server-linux-$(H_ARCH).tar.gz -O $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz tar -xzvf $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz -C $(PKG_BUILD_DIR) endef @@ -47,11 +52,8 @@ define Build/Compile endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d $(1)/etc/uci-defaults + $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/server-linux-$(H_ARCH) $(1)/usr/bin/homebox - $(INSTALL_CONF) ./files/homebox.config $(1)/etc/config/homebox - $(INSTALL_BIN) ./files/homebox.init $(1)/etc/init.d/homebox - $(INSTALL_BIN) ./files/homebox.uci-default $(1)/etc/uci-defaults/homebox endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index b880031af..7769ccbd8 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1578,7 +1578,7 @@ end local function curl(url, file, ua, mode) if not url or url == "" then return 404 end local curl_args = { - "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" + "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3", "-H 'Accept-Encoding: identity'" } if ua and ua ~= "" and ua ~= "curl" then ua = (ua == "passwall") and ("passwall/" .. api.get_version()) or ua diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua index f20d83a08..aa4a4085d 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua +++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua @@ -1562,7 +1562,7 @@ end local function curl(url, file, ua, mode) if not url or url == "" then return 404 end local curl_args = { - "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" + "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3", "-H 'Accept-Encoding: identity'" } if ua and ua ~= "" and ua ~= "curl" then ua = (ua == "passwall2") and ("passwall2/" .. api.get_version()) or ua