diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 89dab22e652a04..fe27ab9bfc62e4 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,19 +6,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.57 +PKG_VERSION:=0.107.59 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=9df951486dab0e83485b596c0393f91d4ff2994de26101b43af8344efb7c1536 +PKG_HASH:=b8bbc2d16394770520da4febd000e66d6df5839a230abea4d160f117bf3f11ed PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION) +FRONTEND_SOURCE:=AdGuardHome_frontend.tar.gz +FRONTEND_DEST:=$(PKG_NAME)-frontend-$(PKG_VERSION).tar.gz +FRONTEND_URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/ +FRONTEND_HASH:=955051153aafdc924a7a4b05307628bd91b3b22c68c8f3e3c49a8b44e052c285 + PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt +PKG_CPE_ID:=cpe:/a:adguard:adguardhome PKG_MAINTAINER:=Dobroslaw Kijowski -PKG_BUILD_DEPENDS:=golang/host node/host +PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 @@ -53,13 +59,17 @@ define Package/adguardhome/description 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) ; \ - ) +define Download/adguardhome-frontend + URL:=$(FRONTEND_URL) + URL_FILE:=$(FRONTEND_SOURCE) + FILE:=$(FRONTEND_DEST) + HASH:=$(FRONTEND_HASH) +endef + +define Build/Prepare + $(call Build/Prepare/Default) + + gzip -dc $(DL_DIR)/$(FRONTEND_DEST) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/ $(TAR_OPTIONS) endef define Package/adguardhome/install @@ -71,5 +81,6 @@ define Package/adguardhome/install $(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/net/adguardhome/test.sh b/net/adguardhome/test.sh new file mode 100755 index 00000000000000..434da128262f77 --- /dev/null +++ b/net/adguardhome/test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +AdGuardHome --version 2>&1 | cut -d' ' -f4 | grep "${PKG_VERSION}"