diff --git a/adguardhome/Makefile b/adguardhome/Makefile index a0c20b35e..0ba9fc875 100644 --- a/adguardhome/Makefile +++ b/adguardhome/Makefile @@ -9,39 +9,39 @@ PKG_NAME:=adguardhome PKG_VERSION:=0.107.40 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=926fc08866a7670a73f413e91672587f73c3e112a912364730ea3df31b783141 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=926fc08866a7670a73f413e91672587f73c3e112a912364730ea3df31b783141 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Dobroslaw Kijowski -PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host +PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/AdguardTeam/AdGuardHome -GO_PKG_BUILD_PKG:=github.com/AdguardTeam/AdGuardHome +GO_PKG_BUILD_PKG:=$(GO_PKG) AGH_BUILD_TIME:=$(shell date -d @$(SOURCE_DATE_EPOCH) +%FT%TZ%z) -AGH_VERSION_PKG:=github.com/AdguardTeam/AdGuardHome/internal/version -GO_PKG_LDFLAGS_X:=$(AGH_VERSION_PKG).channel=release \ - $(AGH_VERSION_PKG).version=$(PKG_SOURCE_VERSION) \ - $(AGH_VERSION_PKG).buildtime=$(AGH_BUILD_TIME) \ - $(AGH_VERSION_PKG).goarm=$(GO_ARM) \ - $(AGH_VERSION_PKG).gomips=$(GO_MIPS) +GO_PKG_LDFLAGS_X:= \ + $(GO_PKG)/internal/version.channel=release \ + $(GO_PKG)/internal/version.version=v$(PKG_VERSION) \ + $(GO_PKG)/internal/version.buildtime=$(AGH_BUILD_TIME) \ + $(GO_PKG)/internal/version.goarm=$(GO_ARM) \ + $(GO_PKG)/internal/version.gomips=$(GO_MIPS) include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/adguardhome - SECTION:=net - CATEGORY:=Network - TITLE:=Network-wide ads and trackers blocking DNS server - URL:=https://github.com/AdguardTeam/AdGuardHome - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle + SECTION:=net + CATEGORY:=Network + TITLE:=Network-wide ads and trackers blocking DNS server + URL:=https://github.com/AdguardTeam/AdGuardHome + DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef define Package/adguardhome/conffiles @@ -50,17 +50,32 @@ define Package/adguardhome/conffiles endef define Package/adguardhome/description -Free and open source, powerful network-wide ads and trackers blocking DNS server. + Free and open source, powerful network-wide ads and trackers blocking DNS server. endef -define Build/Compile - ( \ - pushd $(PKG_BUILD_DIR) ; \ - make js-deps js-build ; \ - popd ; \ - $(call GoPackage/Build/Compile) ; \ - ) +FRONTEND_FILE:=$(PKG_NAME)-frontend-$(PKG_VERSION).tar.gz +define Download/adguardhome-frontend + URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/ + URL_FILE:=AdGuardHome_frontend.tar.gz + FILE:=$(FRONTEND_FILE) + HASH:=skip endef +define Build/Prepare + $(call Build/Prepare/Default) + + gzip -dc $(DL_DIR)/$(FRONTEND_FILE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/ $(TAR_OPTIONS) +endef + +define Package/adguardhome/install + $(call GoPackage/Package/Install/Bin,$(1)) + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome + + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome +endef + +$(eval $(call Download,adguardhome-frontend)) $(eval $(call GoBinPackage,adguardhome)) $(eval $(call BuildPackage,adguardhome)) diff --git a/hysteria/Makefile b/hysteria/Makefile index 34acb003c..47fcb15a3 100644 --- a/hysteria/Makefile +++ b/hysteria/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hysteria -PKG_VERSION:=2.1.0 +PKG_VERSION:=2.1.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)? -PKG_HASH:=f3163b5918bcc197e32a1448aa6b7f2dcf3c0f67eed8d603f8bd5bedb460f68c +PKG_HASH:=a9ccbd7b38ccb9b8d0f3f75c18bd6846e32a58442dbdc2946629be4b3c5f6424 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION) PKG_LICENSE:=MIT diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index c8af9b5dd..ae424b7a3 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=bc989d73a81be233e57b7bb4d6aed2b8e60f8d3e33f76cb78b89e14b67d12725 endef -GEOSITE_VER:=20231018223244 +GEOSITE_VER:=20231020062846 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=35f37e5d8467835602946de00e87953dab0a13355e01aae92d3937097a25747a + HASH:=329782c2b99061ee4f153d081c5d0a8574e67ae9936a69f4c54dab8ea057bec6 endef GEOSITE_IRAN_VER:=202310161455