Attachment 226946 Details for Bug 257620 – Patch for blocky

[patch] Patch for blocky

blocky-015.patch (text/plain), 13.54 KB, created by Daniel Engberg on 2021-08-04 16:02:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-08-04 16:02:25 UTC

Size: 13.54 KB

patch

obsolete

>diff --git a/dns/blocky/Makefile b/dns/blocky/Makefile
>index 48683e30defa..16c417a745eb 100644
>--- a/dns/blocky/Makefile
>+++ b/dns/blocky/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	blocky
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.14
>+DISTVERSION=	0.15
> CATEGORIES=	dns
> 
> MAINTAINER=	gregf@beastie.tech
>@@ -15,6 +15,8 @@ GH_ACCOUNT=	0xERR0R
> USE_RC_SUBR=	blocky
> 
> GH_TUPLE=	\
>+		0xERR0R:go-cache:v1.5.0:0xerr0r_go_cache/vendor/github.com/0xERR0R/go-cache \
>+		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
> 		asaskevich:EventBus:49d423059eef:asaskevich_eventbus/vendor/github.com/asaskevich/EventBus \
> 		asaskevich:govalidator:f61b66f89f4a:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
> 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
>@@ -27,13 +29,13 @@ GH_TUPLE=	\
> 		go-openapi:strfmt:v0.19.4:go_openapi_strfmt/vendor/github.com/go-openapi/strfmt \
> 		go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \
> 		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
>-		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
>+		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 \
> 		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
>-		golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
>-		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
>-		golang:sys:68d13333faf2:golang_sys/vendor/golang.org/x/sys \
>-		golang:text:v0.3.4:golang_text/vendor/golang.org/x/text \
>+		golang:net:89ef3d95e781:golang_net/vendor/golang.org/x/net \
>+		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
>+		golang:sys:ebe580a85c40:golang_sys/vendor/golang.org/x/sys \
>+		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
> 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
> 		jedib0t:go-pretty:v4.3.0:jedib0t_go_pretty/vendor/github.com/jedib0t/go-pretty \
> 		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
>@@ -41,28 +43,27 @@ GH_TUPLE=	\
> 		mattn:go-runewidth:v0.0.8:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
> 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
> 		mgutz:ansi:9520e82c474b:mgutz_ansi/vendor/github.com/mgutz/ansi \
>-		miekg:dns:v1.1.41:miekg_dns/vendor/github.com/miekg/dns \
>-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
>+		miekg:dns:v1.1.43:miekg_dns/vendor/github.com/miekg/dns \
>+		mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
> 		mongodb:mongo-go-driver:v1.0.3:mongodb_mongo_go_driver/vendor/go.mongodb.org/mongo-driver \
> 		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.1:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
>-		onsi:gomega:v1.11.0:onsi_gomega/vendor/github.com/onsi/gomega \
>-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
>+		onsi:ginkgo:v1.16.4:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
>+		onsi:gomega:v1.14.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.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
>+		prometheus:client_golang:v1.11.0: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.18.0:prometheus_common/vendor/github.com/prometheus/common \
>+		prometheus:common:v0.26.0:prometheus_common/vendor/github.com/prometheus/common \
> 		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
>-		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
>+		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
> 		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
>-		spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
>+		spf13:cobra:v1.2.1:spf13_cobra/vendor/github.com/spf13/cobra \
> 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
> 		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
> 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
>+		swaggo:swag:v1.7.0: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
> 
>-
> GO_TARGET=	main.go:${PREFIX}/sbin/${PORTNAME}
> 
> SUB_FILES=	pkg-message
>diff --git a/dns/blocky/distinfo b/dns/blocky/distinfo
>index 486f123bc06e..28197b52da75 100644
>--- a/dns/blocky/distinfo
>+++ b/dns/blocky/distinfo
>@@ -1,6 +1,10 @@
>-TIMESTAMP = 1619818819
>-SHA256 (0xERR0R-blocky-v0.14_GH0.tar.gz) = aa1b1b2b48a1d6e199a87d919ee0f99f7f95f618adb9c280cb147c59f0a60242
>-SIZE (0xERR0R-blocky-v0.14_GH0.tar.gz) = 431640
>+TIMESTAMP = 1628069497
>+SHA256 (0xERR0R-blocky-v0.15_GH0.tar.gz) = 7763fe73c76374af564026da849254d1a8bdf317396214a64179941e127c1773
>+SIZE (0xERR0R-blocky-v0.15_GH0.tar.gz) = 434009
>+SHA256 (0xERR0R-go-cache-v1.5.0_GH0.tar.gz) = 57acf5586de2b7807b6e999bff692585294e64125cd18af8f185526731f24d8c
>+SIZE (0xERR0R-go-cache-v1.5.0_GH0.tar.gz) = 15547
>+SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
>+SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
> SHA256 (asaskevich-EventBus-49d423059eef_GH0.tar.gz) = d410b23e38de9a9e98422ee1ddf5750b35456753cc9c5e5d7aa406a2cd71180a
> SIZE (asaskevich-EventBus-49d423059eef_GH0.tar.gz) = 7529
> SHA256 (asaskevich-govalidator-f61b66f89f4a_GH0.tar.gz) = 7e241314ac30b59d9dc6ead8e902de94e07135486694e4e7ef0dc97eaf42c40e
>@@ -25,20 +29,20 @@ SHA256 (go-stack-stack-v1.8.0_GH0.tar.gz) = 3b8987e137d76f4f35db1e8005ec7fb766b6
> SIZE (go-stack-stack-v1.8.0_GH0.tar.gz) = 8039
> SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
> SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
>-SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
>-SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
>+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 (golang-crypto-75b288015ac9_GH0.tar.gz) = 6e74e21bf9dfdbf0a8dac8cb205fbc3bfd8dff308a24080b9d6093a3858f0db2
> SIZE (golang-crypto-75b288015ac9_GH0.tar.gz) = 1729931
>-SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
>-SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
>-SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
>-SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
>-SHA256 (golang-sys-68d13333faf2_GH0.tar.gz) = 5c3c90ba4825031c3b528655871fa23218c401f6f47ef097ce8e2c90e84f8d00
>-SIZE (golang-sys-68d13333faf2_GH0.tar.gz) = 1217255
>-SHA256 (golang-text-v0.3.4_GH0.tar.gz) = 39eabfef83413361eafd4353ee9d9821707853235f2e55f3d5b1d38ce698fe89
>-SIZE (golang-text-v0.3.4_GH0.tar.gz) = 8354508
>+SHA256 (golang-net-89ef3d95e781_GH0.tar.gz) = af0ad30ddac9b752cc156b88d8db6a49ac252629b4ce69e7de39b9989f9f7e27
>+SIZE (golang-net-89ef3d95e781_GH0.tar.gz) = 1247563
>+SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
>+SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
>+SHA256 (golang-sys-ebe580a85c40_GH0.tar.gz) = b70e2301ad08c3ae255b004b8160f866798b95c0c1f88f12641343ed81ce523b
>+SIZE (golang-sys-ebe580a85c40_GH0.tar.gz) = 1197502
>+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
>+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
> SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
> SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
> SHA256 (jedib0t-go-pretty-v4.3.0_GH0.tar.gz) = 563c07ce1dc3bfaf88d3dad0e965c09e449993f775f30396b2e399953ffd7294
>@@ -53,43 +57,43 @@ SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12
> SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
> SHA256 (mgutz-ansi-9520e82c474b_GH0.tar.gz) = f9203c71aceb8b7ffa87181fd8f51dc69acce3d2161c4c017ea92c6840f85093
> SIZE (mgutz-ansi-9520e82c474b_GH0.tar.gz) = 4876
>-SHA256 (miekg-dns-v1.1.41_GH0.tar.gz) = c807ee900b039dfb117b86548702459f4902cf18020b41797d337ec33d9eeee8
>-SIZE (miekg-dns-v1.1.41_GH0.tar.gz) = 199522
>-SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
>-SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
>+SHA256 (miekg-dns-v1.1.43_GH0.tar.gz) = 889d61c9ce9594ef0fa4b8b601fcf094082b8c12f5638063652d8dee7ee5339a
>+SIZE (miekg-dns-v1.1.43_GH0.tar.gz) = 200617
>+SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048
>+SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = 27826
> SHA256 (mongodb-mongo-go-driver-v1.0.3_GH0.tar.gz) = 8a26f0989a516b6ee9c3e3ddfc453d58141e375d0bd06465e0aac4dbfe815f3e
> SIZE (mongodb-mongo-go-driver-v1.0.3_GH0.tar.gz) = 3307263
> 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.1_GH0.tar.gz) = 976ba34e4346d2bc2c6063d3bbab3158b2197af60a99e3af7377ce4e64ceb6b1
>-SIZE (onsi-ginkgo-v1.16.1_GH0.tar.gz) = 163382
>-SHA256 (onsi-gomega-v1.11.0_GH0.tar.gz) = 474c31779682826b62fed14f7599acb3ac11b6c135b43beda2eca592aa4f74c9
>-SIZE (onsi-gomega-v1.11.0_GH0.tar.gz) = 102337
>-SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
>-SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
>+SHA256 (onsi-ginkgo-v1.16.4_GH0.tar.gz) = f4b9e08e035f5521a4572ce7bb534a3ba0d3c90b0a2d1ae84b9359d59b6ca486
>+SIZE (onsi-ginkgo-v1.16.4_GH0.tar.gz) = 164036
>+SHA256 (onsi-gomega-v1.14.0_GH0.tar.gz) = c71c0be2e8e660c1eae864ef9688c44de8699931175675504150c96fb660784e
>+SIZE (onsi-gomega-v1.14.0_GH0.tar.gz) = 130234
> 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.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1
>-SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316
>+SHA256 (prometheus-client_golang-v1.11.0_GH0.tar.gz) = a3bc3312bde4182e507042ca0e7ca88aac6656bbf8d516d732e34c3f14bb612a
>+SIZE (prometheus-client_golang-v1.11.0_GH0.tar.gz) = 168706
> 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.18.0_GH0.tar.gz) = 64b0963add6f1945d8da40452d9bf796db263e4d8aba26cf17fdcc3f76b8f940
>-SIZE (prometheus-common-v0.18.0_GH0.tar.gz) = 123693
>+SHA256 (prometheus-common-v0.26.0_GH0.tar.gz) = 35cfd6f896655c848042802652394cc9da57ef01437f0d78bffb85a467f62a1b
>+SIZE (prometheus-common-v0.26.0_GH0.tar.gz) = 116907
> SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
> SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
>-SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
>-SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
>+SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
>+SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
> SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74
> SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
>-SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
>-SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
>+SHA256 (spf13-cobra-v1.2.1_GH0.tar.gz) = 382d414ff7b8f421ae07d32d5a17161718b45bdd00de86dc107a34e639857794
>+SIZE (spf13-cobra-v1.2.1_GH0.tar.gz) = 161312
> SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
> SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
> SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
> SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
> 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.0_GH0.tar.gz) = ed19f5d21018430fc981fe6795b0e8bc568ef07659028e56bb4809535f464f23
>+SIZE (swaggo-swag-v1.7.0_GH0.tar.gz) = 174851
> 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

Actions: View | Diff

Attachments on bug 257620: 226946