From 85766a1fee0e3bc027de4973574b3b8671d040f1 Mon Sep 17 00:00:00 2001 From: ImmortalWrt AutoUpdate Bot Date: Fri, 8 Sep 2023 09:03:17 +0000 Subject: [PATCH] adguardhome: Update to 0.107.37 Signed-off-by: ImmortalWrt AutoUpdate Bot --- net/adguardhome/Makefile | 6 +-- ...t-github.com-quic-go-quic-go-v0.37.6.patch | 45 ------------------- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index b4b8f1c3be..c7c50d0751 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.36 +PKG_VERSION:=0.107.37 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:=c606d44200625827ef8bd432bed7ebf15ae952ad2d4ccec8a9fa07b91df1013b +PKG_HASH:=cff71e4a75e54ae5cccaa12b9c127c595ca95d6279fdd19eec1bbda27ded6e2c PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION) PKG_LICENSE:=GPL-3.0-only @@ -58,7 +58,7 @@ 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:=610328889dc08ddbe6a92415b80182424f465134b7071377829b01a725dcc783 + HASH:=a81318da8cd50f68475ba357a06f47fda8da62524c70a3b752a3b9db22e11f68 endef define Build/Prepare diff --git a/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch b/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch deleted file mode 100644 index c158b2368c..0000000000 --- a/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 61c2e12116147fab716221009b3a14fa5792a72d Mon Sep 17 00:00:00 2001 -From: Dobroslaw Kijowski -Date: Mon, 21 Aug 2023 10:22:27 +0200 -Subject: [PATCH] go get github.com/quic-go/quic-go@v0.37.6 - ---- - go.mod | 4 ++-- - go.sum | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - ---- a/go.mod -+++ b/go.mod -@@ -28,7 +28,7 @@ require ( - github.com/mdlayher/raw v0.1.0 - github.com/miekg/dns v1.1.55 - // TODO(a.garipov): Update to ≥ v0.37.0 once we update to Go 1.20. -- github.com/quic-go/quic-go v0.36.2 -+ github.com/quic-go/quic-go v0.37.6 - github.com/stretchr/testify v1.8.4 - github.com/ti-mo/netfilter v0.5.0 - go.etcd.io/bbolt v1.3.7 -@@ -60,7 +60,7 @@ require ( - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-19 v0.3.2 // indirect -- github.com/quic-go/qtls-go1-20 v0.2.2 // indirect -+ github.com/quic-go/qtls-go1-20 v0.3.1 // indirect - github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect ---- a/go.sum -+++ b/go.sum -@@ -108,8 +108,12 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1 - github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= - github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= - github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= -+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg= -+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= - github.com/quic-go/quic-go v0.36.2 h1:ZX/UNQ4gvpCv2RmwdbA6lrRjF6EBm5yZ7TMoT4NQVrA= - github.com/quic-go/quic-go v0.36.2/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ= -+github.com/quic-go/quic-go v0.37.6 h1:2IIUmQzT5YNxAiaPGjs++Z4hGOtIR0q79uS5qE9ccfY= -+github.com/quic-go/quic-go v0.37.6/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= - github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA= - github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=