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 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}" 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 89dab22e652a04..9c58fb724b0d02 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 9c58fb724b0d02..dace8f8901877c 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 a60f90701d5988a688c03762c6e8afbc5a2c226a Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Thu, 20 Mar 2025 21:53:05 +0200 Subject: [PATCH 4/5] adguardhome: fix building UI with webpack in buildworker Addresses UI builds failing in buildworker and containerized SDK. Signed-off-by: George Sapkin --- ...-fix_postcss_config_lookup_in_buildworker.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch diff --git a/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch b/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch new file mode 100644 index 00000000000000..935363b6a0a657 --- /dev/null +++ b/net/adguardhome/patches/001-fix_postcss_config_lookup_in_buildworker.patch @@ -0,0 +1,14 @@ +--- a/client/webpack.common.js ++++ b/client/webpack.common.js +@@ -63,6 +63,11 @@ const config = { + }, + { + loader: 'postcss-loader', ++ options: { ++ postcssOptions: { ++ config: false, ++ }, ++ }, + }, + ], + }, From c26c61456f2ef5dfded8899e726da1cc7495d5f5 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Thu, 20 Mar 2025 21:54:18 +0200 Subject: [PATCH 5/5] adguardhome: fix UI build errors being ignored Addresses failing of UI builds being ignored in buildworker and containerized SDK. Signed-off-by: George Sapkin --- net/adguardhome/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index dace8f8901877c..7fc5d28c3ea9b0 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -55,12 +55,10 @@ 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) ; \ - ) + pushd $(PKG_BUILD_DIR) && \ + make js-deps js-build && \ + popd && \ + $(call GoPackage/Build/Compile) endef define Package/adguardhome/install