From 77de5ae65a02ef6c5e8e3a8894e70de229678a8c Mon Sep 17 00:00:00 2001 From: James White Date: Thu, 14 Apr 2022 08:14:19 +0100 Subject: [PATCH] adguardhome: Update v0.107.6 Remove Go 1.18 patch as upstream source has updated go dependencies Signed-off-by: James White (cherry picked from commit ff6946e73ec5f2e027778aa1582d38bab851f66a) --- net/adguardhome/Makefile | 6 ++-- .../patches/000-quic-go-1.18-fix.patch | 31 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 net/adguardhome/patches/000-quic-go-1.18-fix.patch diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 96a100f44..639f5d4d3 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.5 -PKG_RELEASE:=2 +PKG_VERSION:=0.107.6 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=5282d58b1a8d52f02af4ab7a5d6089aba6f7d20929bd49fd844c930110262dcb +PKG_MIRROR_HASH:=6ad030cf8e47e35354b24cd6bdfce3afb9e26006a81a0596f11aaba8cfcc9e9b PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt diff --git a/net/adguardhome/patches/000-quic-go-1.18-fix.patch b/net/adguardhome/patches/000-quic-go-1.18-fix.patch deleted file mode 100644 index ab6467d9c..000000000 --- a/net/adguardhome/patches/000-quic-go-1.18-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -16,7 +16,7 @@ require ( - github.com/google/renameio v1.0.1 - github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 - github.com/kardianos/service v1.2.0 -- github.com/lucas-clemente/quic-go v0.24.0 -+ github.com/lucas-clemente/quic-go v0.25.0 - github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 - github.com/mdlayher/netlink v1.4.0 - github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf ---- a/go.sum -+++ b/go.sum -@@ -139,6 +139,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2 - github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= - github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= -+github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= -+github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= - github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= - github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= - github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -@@ -147,6 +149,8 @@ github.com/marten-seemann/qtls-go1-16 v0 - github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= - github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= - github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= -+github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= -+github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= - github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= - github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= - github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=