From ecfc4fded66709e5894bcb24dee5aba11d917b20 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Sun, 16 Mar 2025 17:08:36 +0200 Subject: [PATCH 1/5] adguardhome: add CI version check Signed-off-by: George Sapkin --- net/adguardhome/test.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 net/adguardhome/test.sh diff --git a/net/adguardhome/test.sh b/net/adguardhome/test.sh new file mode 100755 index 0000000000000..434da128262f7 --- /dev/null +++ b/net/adguardhome/test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +AdGuardHome --version 2>&1 | cut -d' ' -f4 | grep "${PKG_VERSION}" From ab264291c1bbbc7f7a222d7071e029a9e2a81b16 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Tue, 18 Mar 2025 00:38:47 +0200 Subject: [PATCH 2/5] adguardhome: assign PKG_CPE_ID Link: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&orderBy=2.3&keyword=cpe%3A2.3%3Aa%3Aadguard%3Aadguardhome Link: https://github.com/openwrt/packages/issues/8534 Signed-off-by: George Sapkin --- net/adguardhome/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 89dab22e652a0..9c58fb724b0d0 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -16,6 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION) 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 From f811f235ef239a0272b543f3eb6a665a661f4c7d Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Wed, 19 Mar 2025 18:37:03 +0200 Subject: [PATCH 3/5] adguardhome: bump to 0.107.58 Changelog: https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.58 Signed-off-by: George Sapkin --- net/adguardhome/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 9c58fb724b0d0..dace8f8901877 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.57 +PKG_VERSION:=0.107.58 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:=da6a52764090d8350d55bc14b957ec6afdee0bd21b34b010796e220bde5e9186 PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION) PKG_LICENSE:=GPL-3.0-only From 47b3c6c61d1e03eb0a8569b6ce2870828e8f4756 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Fri, 21 Mar 2025 13:37:12 +0200 Subject: [PATCH 4/5] adguardhome: use prebuilt frontend Drop node/host depenendency as a result. Signed-off-by: George Sapkin --- net/adguardhome/Makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index dace8f8901877..bbdd674de5a4a 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -14,12 +14,17 @@ PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PK PKG_HASH:=da6a52764090d8350d55bc14b957ec6afdee0bd21b34b010796e220bde5e9186 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:=7bda3b9e33757c5a58a211b8a3d71a76a0311327fd009adf0935e6a3c4313f9f + 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 @@ -54,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 @@ -72,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)) From 2c39cb4a6cac1deea8dae34ef4b1aa91b779feaf Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Fri, 21 Mar 2025 13:43:38 +0200 Subject: [PATCH 5/5] adguardhome: bump to 0.107.59 Changelog: https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.59 Signed-off-by: George Sapkin --- net/adguardhome/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index bbdd674de5a4a..fe27ab9bfc62e 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,18 +6,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.58 +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:=da6a52764090d8350d55bc14b957ec6afdee0bd21b34b010796e220bde5e9186 +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:=7bda3b9e33757c5a58a211b8a3d71a76a0311327fd009adf0935e6a3c4313f9f +FRONTEND_HASH:=955051153aafdc924a7a4b05307628bd91b3b22c68c8f3e3c49a8b44e052c285 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt