git: df81f424d8df - main - dns/blocky: Fix incomplete update to 0.19

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Fri, 10 Jun 2022 06:17:32 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df81f424d8df2d8612df0f81184051050f8c5f95

commit df81f424d8df2d8612df0f81184051050f8c5f95
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-06-10 05:56:09 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-06-10 06:14:24 +0000

    dns/blocky: Fix incomplete update to 0.19
    
    Update GH_TUPLE and reflect changes in configuration sample.
    
    PR:     264565
    Reported by:    diizzy@
    Fixes:  668b46a45c7f
---
 dns/blocky/Makefile                       |  63 ++++++++--------
 dns/blocky/distinfo                       | 120 ++++++++++++++----------------
 dns/blocky/files/blocky-config.yml.sample |   5 +-
 3 files changed, 89 insertions(+), 99 deletions(-)

diff --git a/dns/blocky/Makefile b/dns/blocky/Makefile
index 3ebde7922422..9b5dc7900b05 100644
--- a/dns/blocky/Makefile
+++ b/dns/blocky/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	blocky
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	dns
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,46 +14,43 @@ USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	0xERR0R
 USE_RC_SUBR=	blocky
-
-GH_TUPLE=	\
+GH_TUPLE=       \
 		KyleBanks:depth:v1.2.1:kylebanks_depth/vendor/github.com/KyleBanks/depth \
 		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
 		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
 		alicebob:gopher-json:a9ecdc9d1d3a:alicebob_gopher_json/vendor/github.com/alicebob/gopher-json \
-		alicebob:miniredis:v2.18.0:alicebob_miniredis_v2/vendor/github.com/alicebob/miniredis/v2 \
+		alicebob:miniredis:v2.21.0:alicebob_miniredis_v2/vendor/github.com/alicebob/miniredis/v2 \
 		asaskevich:EventBus:49d423059eef:asaskevich_eventbus/vendor/github.com/asaskevich/EventBus \
-		avast:retry-go:v4.0.3:avast_retry_go_v4/vendor/github.com/avast/retry-go/v4 \
+		avast:retry-go:v4.0.5:avast_retry_go_v4/vendor/github.com/avast/retry-go/v4 \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		cespare:xxhash:v2.1.2:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		creasty:defaults:v1.5.2:creasty_defaults/vendor/github.com/creasty/defaults \
+		creasty:defaults:v1.6.0:creasty_defaults/vendor/github.com/creasty/defaults \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgryski:go-rendezvous:9f7001d12a5f:dgryski_go_rendezvous/vendor/github.com/dgryski/go-rendezvous \
-		fsnotify:fsnotify:v1.5.1:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-check:check:10cb98267c6c:go_check_check/vendor/gopkg.in/check.v1 \
 		go-chi:chi:v5.0.7:go_chi_chi_v5/vendor/github.com/go-chi/chi/v5 \
-		go-chi:cors:v1.2.0:go_chi_cors/vendor/github.com/go-chi/cors \
-		go-gorm:gorm:v1.22.5:go_gorm_gorm/vendor/gorm.io/gorm \
-		go-gorm:mysql:v1.2.3:go_gorm_mysql/vendor/gorm.io/driver/mysql \
-		go-gorm:postgres:v1.2.3:go_gorm_postgres/vendor/gorm.io/driver/postgres \
-		go-gorm:sqlite:v1.2.6:go_gorm_sqlite/vendor/gorm.io/driver/sqlite \
+		go-chi:cors:v1.2.1:go_chi_cors/vendor/github.com/go-chi/cors \
+		go-gorm:gorm:v1.23.5:go_gorm_gorm/vendor/gorm.io/gorm \
+		go-gorm:mysql:v1.3.4:go_gorm_mysql/vendor/gorm.io/driver/mysql \
+		go-gorm:postgres:v1.3.7:go_gorm_postgres/vendor/gorm.io/driver/postgres \
+		go-gorm:sqlite:v1.3.2:go_gorm_sqlite/vendor/gorm.io/driver/sqlite \
 		go-openapi:jsonpointer:v0.19.5:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
 		go-openapi:jsonreference:v0.19.6:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
 		go-openapi:spec:v0.20.4:go_openapi_spec/vendor/github.com/go-openapi/spec \
 		go-openapi:swag:v0.19.15:go_openapi_swag/vendor/github.com/go-openapi/swag \
-		go-redis:redis:v8.11.4:go_redis_redis_v8/vendor/github.com/go-redis/redis/v8 \
+		go-redis:redis:v8.11.5:go_redis_redis_v8/vendor/github.com/go-redis/redis/v8 \
 		go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
-		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
-		go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		golang:crypto:4570a0811e8b:golang_crypto/vendor/golang.org/x/crypto \
-		golang:mod:v0.5.0:golang_mod/vendor/golang.org/x/mod \
-		golang:net:491a49abca63:golang_net/vendor/golang.org/x/net \
+		golang:mod:9b9b3d81d5e3:golang_mod/vendor/golang.org/x/mod \
+		golang:net:2871e0cb64e4:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:da31bd327af9:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:a9b59b0215f8:golang_sys/vendor/golang.org/x/sys \
 		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
-		golang:tools:v0.1.7:golang_tools/vendor/golang.org/x/tools \
+		golang:tools:v0.1.10:golang_tools/vendor/golang.org/x/tools \
 		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
 		google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
 		hako:durafmt:5c1018a4e16b:hako_durafmt/vendor/github.com/hako/durafmt \
@@ -61,41 +59,40 @@ GH_TUPLE=	\
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		jackc:chunkreader:v2.0.1:jackc_chunkreader_v2/vendor/github.com/jackc/chunkreader/v2 \
-		jackc:pgconn:v1.10.1:jackc_pgconn/vendor/github.com/jackc/pgconn \
+		jackc:pgconn:v1.12.1:jackc_pgconn/vendor/github.com/jackc/pgconn \
 		jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \
 		jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \
-		jackc:pgproto3:v2.2.0:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
+		jackc:pgproto3:v2.3.0:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
 		jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \
-		jackc:pgtype:v1.9.0:jackc_pgtype/vendor/github.com/jackc/pgtype \
-		jackc:pgx:v4.14.0:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
+		jackc:pgtype:v1.11.0:jackc_pgtype/vendor/github.com/jackc/pgtype \
+		jackc:pgx:v4.16.1:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
 		jinzhu:inflection:v1.0.0:jinzhu_inflection/vendor/github.com/jinzhu/inflection \
-		jinzhu:now:v1.1.4:jinzhu_now/vendor/github.com/jinzhu/now \
+		jinzhu:now:v1.1.5:jinzhu_now/vendor/github.com/jinzhu/now \
 		josharian:intern:v1.0.0:josharian_intern/vendor/github.com/josharian/intern \
 		mailru:easyjson:v0.7.6:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		mattn:go-colorable:v0.1.12:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-sqlite3:v1.14.9:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		mattn:go-sqlite3:v1.14.12:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		mgutz:ansi:d51e80ef957d:mgutz_ansi/vendor/github.com/mgutz/ansi \
-		miekg:dns:v1.1.46:miekg_dns/vendor/github.com/miekg/dns \
+		miekg:dns:v1.1.49:miekg_dns/vendor/github.com/miekg/dns \
 		mroth:weightedrand:v0.4.1:mroth_weightedrand/vendor/github.com/mroth/weightedrand \
-		nxadm:tail:v1.4.8:nxadm_tail/vendor/github.com/nxadm/tail \
-		onsi:ginkgo:v1.16.5:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
-		onsi:gomega:v1.18.1:onsi_gomega/vendor/github.com/onsi/gomega \
+		onsi:ginkgo:v2.1.4:onsi_ginkgo_v2/vendor/github.com/onsi/ginkgo/v2 \
+		onsi:gomega:v1.19.0:onsi_gomega/vendor/github.com/onsi/gomega \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v1.12.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.12.2:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.32.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		spf13:cobra:v1.3.0:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:cobra:v1.4.0:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stretchr:objx:v0.3.0:stretchr_objx/vendor/github.com/stretchr/objx \
-		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		swaggo:swag:v1.7.8:swaggo_swag/vendor/github.com/swaggo/swag \
+		stretchr:testify:v1.7.2:stretchr_testify/vendor/github.com/stretchr/testify \
+		swaggo:swag:v1.8.2:swaggo_swag/vendor/github.com/swaggo/swag \
 		x-cray:logrus-prefixed-formatter:v0.5.2:x_cray_logrus_prefixed_formatter/vendor/github.com/x-cray/logrus-prefixed-formatter \
-		yuin:gopher-lua:ee81675732da:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
+		yuin:gopher-lua:f4c35e4016d9:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
 
 GO_TARGET=	main.go:${PREFIX}/sbin/${PORTNAME}
 
diff --git a/dns/blocky/distinfo b/dns/blocky/distinfo
index be4fb4c5ab30..14ca133fb839 100644
--- a/dns/blocky/distinfo
+++ b/dns/blocky/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1654752849
+TIMESTAMP = 1654841143
 SHA256 (0xERR0R-blocky-v0.19_GH0.tar.gz) = 25aa341a836ded4f2c60eb7e3a578d8723148c327c297fdc572c342f8fc79c41
 SIZE (0xERR0R-blocky-v0.19_GH0.tar.gz) = 662597
 SHA256 (KyleBanks-depth-v1.2.1_GH0.tar.gz) = 8417300d559ec88f24fb3eef3eb8e76c1a6f5bf861d3e46a83d303dc5601f8ed
@@ -11,38 +11,36 @@ SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504
 SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
 SHA256 (alicebob-gopher-json-a9ecdc9d1d3a_GH0.tar.gz) = ce51bf794d26ef3a8a4d0e4e8a4b477ce4e78bbad6d317fd7c839af9ebfcc68a
 SIZE (alicebob-gopher-json-a9ecdc9d1d3a_GH0.tar.gz) = 3630
-SHA256 (alicebob-miniredis-v2.18.0_GH0.tar.gz) = 2ce426370377b18d9fdc905cd4cac93244fe81532c306ca37be85318e1103546
-SIZE (alicebob-miniredis-v2.18.0_GH0.tar.gz) = 153299
+SHA256 (alicebob-miniredis-v2.21.0_GH0.tar.gz) = 20b76926091b21644d37086920c08f5a82eba5e76e795dca6122c4ccc2e272d9
+SIZE (alicebob-miniredis-v2.21.0_GH0.tar.gz) = 157089
 SHA256 (asaskevich-EventBus-49d423059eef_GH0.tar.gz) = d410b23e38de9a9e98422ee1ddf5750b35456753cc9c5e5d7aa406a2cd71180a
 SIZE (asaskevich-EventBus-49d423059eef_GH0.tar.gz) = 7529
-SHA256 (avast-retry-go-v4.0.3_GH0.tar.gz) = cdeac9a5cd0ad6c8735caf40a689cc34c0a20b07d0d6f3a40d6b6e74e8c28998
-SIZE (avast-retry-go-v4.0.3_GH0.tar.gz) = 12561
+SHA256 (avast-retry-go-v4.0.5_GH0.tar.gz) = 2019f54cc27b9d9c0f8e86c67cb6f12d284311aca4df094558ac086d9390cb8a
+SIZE (avast-retry-go-v4.0.5_GH0.tar.gz) = 12573
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352
 SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244
-SHA256 (creasty-defaults-v1.5.2_GH0.tar.gz) = 92ab38ad101080f8617a17847106ef7cbe84504c8669808e37564187f3cbf481
-SIZE (creasty-defaults-v1.5.2_GH0.tar.gz) = 7634
+SHA256 (creasty-defaults-v1.6.0_GH0.tar.gz) = 74319ab368e48c6fc9c6fb7660a7da1bd9c3f80c9c639282b98f4cfd37054a86
+SIZE (creasty-defaults-v1.6.0_GH0.tar.gz) = 7681
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 29584550745fd4b8fce2e2f3def7b9d9ffe2b86cf9b6596b53a660c9bbfe27b6
 SIZE (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 1699
-SHA256 (fsnotify-fsnotify-v1.5.1_GH0.tar.gz) = bf4be597aef95796bec7c7def6701581c5e153376ba5a5aa31c2d04470d84f1d
-SIZE (fsnotify-fsnotify-v1.5.1_GH0.tar.gz) = 32691
 SHA256 (go-check-check-10cb98267c6c_GH0.tar.gz) = 0a42d9d5a49ebc30174e5840238e446f5fb16899bfaa6a6f63d12ab9953df293
 SIZE (go-check-check-10cb98267c6c_GH0.tar.gz) = 32375
 SHA256 (go-chi-chi-v5.0.7_GH0.tar.gz) = 23873c5982e0c9929d46f4432ff9c89dcfbce29ca2db54f2058e67e5361a2b1f
 SIZE (go-chi-chi-v5.0.7_GH0.tar.gz) = 82798
-SHA256 (go-chi-cors-v1.2.0_GH0.tar.gz) = f9da3db2ad76085112fb6b47e7a2f22ab0adac88cdc5071ea5faf3e862139cc0
-SIZE (go-chi-cors-v1.2.0_GH0.tar.gz) = 8405
-SHA256 (go-gorm-gorm-v1.22.5_GH0.tar.gz) = e337957d5ad581c8777bd3035a1cc1e4697d1ec15edc9df02d455bfb3173a7ba
-SIZE (go-gorm-gorm-v1.22.5_GH0.tar.gz) = 143970
-SHA256 (go-gorm-mysql-v1.2.3_GH0.tar.gz) = ddaa34eba0021ed76020036d0004ee3e266984344fb65ad1090ba8c3300bdeb6
-SIZE (go-gorm-mysql-v1.2.3_GH0.tar.gz) = 7473
-SHA256 (go-gorm-postgres-v1.2.3_GH0.tar.gz) = b8b80ebf01cbd6b29cf00eb7d2df9cc4fff3fef7647fc94425051a780d30a080
-SIZE (go-gorm-postgres-v1.2.3_GH0.tar.gz) = 13862
-SHA256 (go-gorm-sqlite-v1.2.6_GH0.tar.gz) = 23dcc165d8cb9a178af503249508cfafb70d479547069bc9e05bdf02384e98ae
-SIZE (go-gorm-sqlite-v1.2.6_GH0.tar.gz) = 9371
+SHA256 (go-chi-cors-v1.2.1_GH0.tar.gz) = d3fa42948b4b365db19c9a6639090c6869b968fa8c5ecb9635dce1a9bf4cf8d8
+SIZE (go-chi-cors-v1.2.1_GH0.tar.gz) = 8827
+SHA256 (go-gorm-gorm-v1.23.5_GH0.tar.gz) = 15d55765b28c3c5ce52be501a0c1e644b5650a0eeefb8dbee9b101af9c1b9b48
+SIZE (go-gorm-gorm-v1.23.5_GH0.tar.gz) = 155939
+SHA256 (go-gorm-mysql-v1.3.4_GH0.tar.gz) = 31b38e2a85c88c77f9885527cdeb8782e1f4edecef819448a6978f0999be8b52
+SIZE (go-gorm-mysql-v1.3.4_GH0.tar.gz) = 7696
+SHA256 (go-gorm-postgres-v1.3.7_GH0.tar.gz) = 976a5f04ed43c9eeaa0d21b9ddbdc8f2db6cf468437ca07e479a9dba7d1d8807
+SIZE (go-gorm-postgres-v1.3.7_GH0.tar.gz) = 15760
+SHA256 (go-gorm-sqlite-v1.3.2_GH0.tar.gz) = 58ec8d6e88932160df45acdabd80fab13e701b8bdeca1e96c52d94221cba989b
+SIZE (go-gorm-sqlite-v1.3.2_GH0.tar.gz) = 10911
 SHA256 (go-openapi-jsonpointer-v0.19.5_GH0.tar.gz) = 587217a2edeedbe6de0f0ba62d7c347f31be2f7016da4fafdeda3aba5dd6b1a9
 SIZE (go-openapi-jsonpointer-v0.19.5_GH0.tar.gz) = 15456
 SHA256 (go-openapi-jsonreference-v0.19.6_GH0.tar.gz) = c242ce452709ce73a2fd46ce2ac0cf82009c8957730cff691d255a9f9ad96bc3
@@ -51,32 +49,30 @@ SHA256 (go-openapi-spec-v0.20.4_GH0.tar.gz) = dba29b77baae28be12aa653dcb53ba63b3
 SIZE (go-openapi-spec-v0.20.4_GH0.tar.gz) = 296927
 SHA256 (go-openapi-swag-v0.19.15_GH0.tar.gz) = 5d22d5a44970926178102eb80926f4cbfd00f3f1f2810cbbd4d8e7c62547afe6
 SIZE (go-openapi-swag-v0.19.15_GH0.tar.gz) = 35515
-SHA256 (go-redis-redis-v8.11.4_GH0.tar.gz) = d76236e7a385820e003c94ac60031c37a0d54927d2c96dbddc5e5712a4089fd9
-SIZE (go-redis-redis-v8.11.4_GH0.tar.gz) = 153794
+SHA256 (go-redis-redis-v8.11.5_GH0.tar.gz) = 49f307ad85960c25d98bea3b2d155c893e43f41831c1bb4891e1eb867ead1245
+SIZE (go-redis-redis-v8.11.5_GH0.tar.gz) = 168188
 SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28
 SIZE (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168
-SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
-SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
-SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
-SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
+SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
+SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
 SHA256 (golang-crypto-4570a0811e8b_GH0.tar.gz) = 3928242f5c64763c8e259a7032e7334031f537893a6ed0bdb52c84238e364c91
 SIZE (golang-crypto-4570a0811e8b_GH0.tar.gz) = 1734767
-SHA256 (golang-mod-v0.5.0_GH0.tar.gz) = 9176aaaa49f9441047cc8768025e30af94048656f8261fe683ca11729dbdf7c7
-SIZE (golang-mod-v0.5.0_GH0.tar.gz) = 111977
-SHA256 (golang-net-491a49abca63_GH0.tar.gz) = aa6aa87bb950aa94e0b44ebd29b707b272863baefb7ad7613a9753f0487bec42
-SIZE (golang-net-491a49abca63_GH0.tar.gz) = 1226608
+SHA256 (golang-mod-9b9b3d81d5e3_GH0.tar.gz) = 17a6e030b6e35cce6189203a8f86f0c4d26cb70f16cfd10c510b0876ff9852fc
+SIZE (golang-mod-9b9b3d81d5e3_GH0.tar.gz) = 119489
+SHA256 (golang-net-2871e0cb64e4_GH0.tar.gz) = d8e95c07e6b4a0da251c332c26e927cdd0733eef5c676653d546f9bb4de9245f
+SIZE (golang-net-2871e0cb64e4_GH0.tar.gz) = 1229659
 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-da31bd327af9_GH0.tar.gz) = 0c834c593096084aa9458c2ad0ff9177a6397950f4dc7376c9d67367f0687623
-SIZE (golang-sys-da31bd327af9_GH0.tar.gz) = 1257001
+SHA256 (golang-sys-a9b59b0215f8_GH0.tar.gz) = 4e6665e541c3c56968778aa9b4096306260223f759a2b4e8bc4f2c5bdf65de12
+SIZE (golang-sys-a9b59b0215f8_GH0.tar.gz) = 1288957
 SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
 SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
 SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
 SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
-SHA256 (golang-tools-v0.1.7_GH0.tar.gz) = b88cae9ca14fc3f18ff714c8014929c8c2c63d15805416d49d88b51f201e9fbf
-SIZE (golang-tools-v0.1.7_GH0.tar.gz) = 2884220
+SHA256 (golang-tools-v0.1.10_GH0.tar.gz) = 9791babef393ab33e90b6045eead923abf37a9a30f79737aed309befa8e01740
+SIZE (golang-tools-v0.1.10_GH0.tar.gz) = 3014465
 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
 SHA256 (google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921
@@ -93,24 +89,24 @@ SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e31
 SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
 SHA256 (jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4
 SIZE (jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038
-SHA256 (jackc-pgconn-v1.10.1_GH0.tar.gz) = 7045b8e2059025229f1b1344d28289b753e0b1f1f6196adbcb10f07e56e10462
-SIZE (jackc-pgconn-v1.10.1_GH0.tar.gz) = 54190
+SHA256 (jackc-pgconn-v1.12.1_GH0.tar.gz) = 30f2a257e00e0583413c154a76244b73547aad7ccab14a5ad3372b99a8170e98
+SIZE (jackc-pgconn-v1.12.1_GH0.tar.gz) = 57362
 SHA256 (jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab
 SIZE (jackc-pgio-v1.0.0_GH0.tar.gz) = 1884
 SHA256 (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603
 SIZE (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254
-SHA256 (jackc-pgproto3-v2.2.0_GH0.tar.gz) = 752bf556fd414ca91e4ef0947c63a42566f46b9c26a4493deca7e9f135044f21
-SIZE (jackc-pgproto3-v2.2.0_GH0.tar.gz) = 23690
+SHA256 (jackc-pgproto3-v2.3.0_GH0.tar.gz) = b13fa994f194ab8e6c9518d3bdd23e58138c5ad78544ad798f3ea77eea608059
+SIZE (jackc-pgproto3-v2.3.0_GH0.tar.gz) = 24607
 SHA256 (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e
 SIZE (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991
-SHA256 (jackc-pgtype-v1.9.0_GH0.tar.gz) = a6b67604990e8813101553ca5be89f13917c451e3dca3e7189ac35aa95dc95fa
-SIZE (jackc-pgtype-v1.9.0_GH0.tar.gz) = 177338
-SHA256 (jackc-pgx-v4.14.0_GH0.tar.gz) = 70002159268a2f94c0dd7a52ebd059f9222e4c43c573a95e8bd013271e43c1dc
-SIZE (jackc-pgx-v4.14.0_GH0.tar.gz) = 110518
+SHA256 (jackc-pgtype-v1.11.0_GH0.tar.gz) = 7b910c71059d1cda93776515c4b895285c68f4a9798edc5834a08d07dbb9a2df
+SIZE (jackc-pgtype-v1.11.0_GH0.tar.gz) = 184350
+SHA256 (jackc-pgx-v4.16.1_GH0.tar.gz) = 14a2c18644dba1ab9d1a3937775b882253bc7cb3d174c3bc7302b04edc69ef42
+SIZE (jackc-pgx-v4.16.1_GH0.tar.gz) = 111232
 SHA256 (jinzhu-inflection-v1.0.0_GH0.tar.gz) = 582808364cc268544e3e6775b15d7fffbc28ccfb930a29840bb25e32d7d95e1f
 SIZE (jinzhu-inflection-v1.0.0_GH0.tar.gz) = 4766
-SHA256 (jinzhu-now-v1.1.4_GH0.tar.gz) = 6a93d8e01633cd0c505adccac8c06bc7b7aaf025d7e51bf03bb453ccf9ae865b
-SIZE (jinzhu-now-v1.1.4_GH0.tar.gz) = 8480
+SHA256 (jinzhu-now-v1.1.5_GH0.tar.gz) = 6660b00538ebb0e0ade120371f2a891c692650e9126bd45a805b8f4d65293127
+SIZE (jinzhu-now-v1.1.5_GH0.tar.gz) = 8636
 SHA256 (josharian-intern-v1.0.0_GH0.tar.gz) = 7c7df6e792ed5db0b1a63c8ec74236b70958ad36c9fe5a02b52b1a418b177b5e
 SIZE (josharian-intern-v1.0.0_GH0.tar.gz) = 1927
 SHA256 (mailru-easyjson-v0.7.6_GH0.tar.gz) = 36849ef77dc92330e2d9f006a4fb2ef871e11abfddcedec771b84ebfc2380ecc
@@ -119,26 +115,24 @@ SHA256 (mattn-go-colorable-v0.1.12_GH0.tar.gz) = 32493594aee411896ffe13aaed14df4
 SIZE (mattn-go-colorable-v0.1.12_GH0.tar.gz) = 9801
 SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
 SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
-SHA256 (mattn-go-sqlite3-v1.14.9_GH0.tar.gz) = 89a2997834479f58d9c259f83fb6d3fa4f9f907b437ea3246f951eccc090f685
-SIZE (mattn-go-sqlite3-v1.14.9_GH0.tar.gz) = 2404097
+SHA256 (mattn-go-sqlite3-v1.14.12_GH0.tar.gz) = 7ab1e45fa69b1465eaaf42578b5c6166d07ae1d49f37cccca5303e580e1864ae
+SIZE (mattn-go-sqlite3-v1.14.12_GH0.tar.gz) = 2450412
 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
 SHA256 (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 91cc2a4b9179dca81b3169ad32d4ef854d043c268251abf9a004bf7606fe3222
 SIZE (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 5097
-SHA256 (miekg-dns-v1.1.46_GH0.tar.gz) = 621516f09dfc32b214cf0bf670554739b25e95c7cf9c6dd2965d68178ab398df
-SIZE (miekg-dns-v1.1.46_GH0.tar.gz) = 204183
+SHA256 (miekg-dns-v1.1.49_GH0.tar.gz) = f61b57a36e14f8cbe1a644dff68d86b2ed84d7b25639fad3b5a1dcad79e18ca8
+SIZE (miekg-dns-v1.1.49_GH0.tar.gz) = 208660
 SHA256 (mroth-weightedrand-v0.4.1_GH0.tar.gz) = 1257eb150f0886131dc9ef816f9f5cee4dce75453774732b370e8aebe3a90220
 SIZE (mroth-weightedrand-v0.4.1_GH0.tar.gz) = 7660
-SHA256 (nxadm-tail-v1.4.8_GH0.tar.gz) = 8208362046819275a0809000dceacbd7b2a7caa07bcd6547dd2ff9b2104fa56c
-SIZE (nxadm-tail-v1.4.8_GH0.tar.gz) = 1255770
-SHA256 (onsi-ginkgo-v1.16.5_GH0.tar.gz) = 0380c81321b764b75e76a7aa8fc8ab1ab361232a88d5b6124ef8b9a9e75d5287
-SIZE (onsi-ginkgo-v1.16.5_GH0.tar.gz) = 164965
-SHA256 (onsi-gomega-v1.18.1_GH0.tar.gz) = b6d309c413f706dd3f060332295b8a43f60922db64f2a57facecbf97f02c674f
-SIZE (onsi-gomega-v1.18.1_GH0.tar.gz) = 234606
+SHA256 (onsi-ginkgo-v2.1.4_GH0.tar.gz) = 8eecf0775b3a238289a4e3ae33b07e093d59cd6e360b92d05f31b7f44cc4a718
+SIZE (onsi-ginkgo-v2.1.4_GH0.tar.gz) = 543061
+SHA256 (onsi-gomega-v1.19.0_GH0.tar.gz) = c9faea2e1988e426680952213d5a31fc75e88b0961fdffa337ab95d299186c05
+SIZE (onsi-gomega-v1.19.0_GH0.tar.gz) = 238526
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (prometheus-client_golang-v1.12.1_GH0.tar.gz) = 3f7929ec4837932e68a0e7da9e0f1ff5aa19bc02de7a67823d0533a0d6852014
-SIZE (prometheus-client_golang-v1.12.1_GH0.tar.gz) = 194206
+SHA256 (prometheus-client_golang-v1.12.2_GH0.tar.gz) = ab01b65e6c24a41e856986076d0de2d38d379253eb78160edd8d8235f789c94a
+SIZE (prometheus-client_golang-v1.12.2_GH0.tar.gz) = 197117
 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
 SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
 SHA256 (prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6
@@ -149,17 +143,17 @@ SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0d
 SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
 SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74
 SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
-SHA256 (spf13-cobra-v1.3.0_GH0.tar.gz) = 5b6a1d841561112a68a46dfa58f8fd86a06abb8838cf86d085738a306fe91357
-SIZE (spf13-cobra-v1.3.0_GH0.tar.gz) = 169515
+SHA256 (spf13-cobra-v1.4.0_GH0.tar.gz) = de32a9d3f94c55ddc433aa4eefe05fc85ae621d182114b6e628258753fc03148
+SIZE (spf13-cobra-v1.4.0_GH0.tar.gz) = 94547
 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
 SHA256 (stretchr-objx-v0.3.0_GH0.tar.gz) = 831cb044305e573d9ed18928b87feb1d31d1f17f3f54ec962d037c36f5463e24
 SIZE (stretchr-objx-v0.3.0_GH0.tar.gz) = 80456
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
-SHA256 (swaggo-swag-v1.7.8_GH0.tar.gz) = 973da05a1534c2f7001ba31b22e2380e9640e05356f7bbbf7dadeaf590b6aa20
-SIZE (swaggo-swag-v1.7.8_GH0.tar.gz) = 205939
+SHA256 (stretchr-testify-v1.7.2_GH0.tar.gz) = 4714e9f37e4a46b461c49638ce0625db330d3c7ebcbde07e06cf4fcc1418fc48
+SIZE (stretchr-testify-v1.7.2_GH0.tar.gz) = 94021
+SHA256 (swaggo-swag-v1.8.2_GH0.tar.gz) = ec611489917583314e819558bdd381431c473c4861dff871e06b12c3eea4eab7
+SIZE (swaggo-swag-v1.8.2_GH0.tar.gz) = 222003
 SHA256 (x-cray-logrus-prefixed-formatter-v0.5.2_GH0.tar.gz) = a966d81bbaef60a98073b589c2054f0171ccc09539589b71c30c936009fbb164
 SIZE (x-cray-logrus-prefixed-formatter-v0.5.2_GH0.tar.gz) = 6873
-SHA256 (yuin-gopher-lua-ee81675732da_GH0.tar.gz) = 692b5d80487b2940b6e5bd85a413e1b2a10a81d656a0574c22acac3ca9b0a1d1
-SIZE (yuin-gopher-lua-ee81675732da_GH0.tar.gz) = 162030
+SHA256 (yuin-gopher-lua-f4c35e4016d9_GH0.tar.gz) = 4694620cb5ae735933bdd5bb7921de0daa0ed930c0e877cb8f2049d9fbeca16b
+SIZE (yuin-gopher-lua-f4c35e4016d9_GH0.tar.gz) = 162941
diff --git a/dns/blocky/files/blocky-config.yml.sample b/dns/blocky/files/blocky-config.yml.sample
index 978c57082d31..aae167cd4a9f 100644
--- a/dns/blocky/files/blocky-config.yml.sample
+++ b/dns/blocky/files/blocky-config.yml.sample
@@ -1,7 +1,6 @@
 upstream:
-  externalResolvers:
-    - 46.182.19.48
-    - 80.241.218.68
+  default:
+    - 1.1.1.1
     - tcp-tls:fdns1.dismail.de:853
     - https://dns.digitale-gesellschaft.ch/dns-query
 blocking: