From fbccdc8f617e7ea93a6ada8956d7d1022f74bb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Sat, 16 Jan 2021 02:17:56 +0000 Subject: [PATCH] Update to 0.19.0 With hat: puppet --- sysutils/choria/Makefile | 53 ++++++---- sysutils/choria/distinfo | 100 ++++++++++-------- .../patch-plugin__0__choria__provision.go | 17 --- .../files/patch-plugin__1__externalmco.go | 17 --- .../files/patch-plugin__2__golangmco.go | 17 --- .../choria/files/patch-plugin__3__rubymco.go | 17 --- .../choria/files/patch-plugin__4__scout.go | 17 --- ...ts-io_nats-server_v2_server_disk__avail.go | 11 -- 8 files changed, 86 insertions(+), 163 deletions(-) delete mode 100644 sysutils/choria/files/patch-plugin__0__choria__provision.go delete mode 100644 sysutils/choria/files/patch-plugin__1__externalmco.go delete mode 100644 sysutils/choria/files/patch-plugin__2__golangmco.go delete mode 100644 sysutils/choria/files/patch-plugin__3__rubymco.go delete mode 100644 sysutils/choria/files/patch-plugin__4__scout.go delete mode 100644 sysutils/choria/files/patch-vendor_github.com_nats-io_nats-server_v2_server_disk__avail.go diff --git a/sysutils/choria/Makefile b/sysutils/choria/Makefile index 53e71429ce0b..58aa8594c91b 100644 --- a/sysutils/choria/Makefile +++ b/sysutils/choria/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= choria -PORTVERSION= 0.18.0 +PORTVERSION= 0.19.0 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -21,25 +21,26 @@ GH_PROJECT= go-choria USE_RC_SUBR= choria-broker choria-server GH_TUPLE= \ - AlecAivazis:survey:v2.2.2:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \ + AlecAivazis:survey:v2.2.7:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ Freman:eventloghook:e4d803b6b48b:freman_eventloghook/vendor/github.com/Freman/eventloghook \ Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \ Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \ Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \ - OneOfOne:xxhash:v1.2.7:oneofone_xxhash/vendor/github.com/OneOfOne/xxhash \ + OneOfOne:xxhash:v1.2.8:oneofone_xxhash/vendor/github.com/OneOfOne/xxhash \ achanda:go-sysctl:6be7678c45d2:achanda_go_sysctl/vendor/github.com/achanda/go-sysctl \ aelsabbahy:GOnetstat:edf89f784e08:aelsabbahy_gonetstat/vendor/github.com/aelsabbahy/GOnetstat \ aelsabbahy:go-ps:61c449472dcf:aelsabbahy_go_ps/vendor/github.com/aelsabbahy/go-ps \ - aelsabbahy:goss:v0.3.14:aelsabbahy_goss/vendor/github.com/aelsabbahy/goss \ + aelsabbahy:goss:v0.3.16:aelsabbahy_goss/vendor/github.com/aelsabbahy/goss \ alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \ alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \ alecthomas:units:f65c72e2690d:alecthomas_units/vendor/github.com/alecthomas/units \ + antonmedv:expr:v1.8.9:antonmedv_expr/vendor/github.com/antonmedv/expr \ awesome-gocui:gocui:v0.6.0:awesome_gocui_gocui/vendor/github.com/awesome-gocui/gocui \ awesome-gocui:termbox-go:c0aef3d18bcc:awesome_gocui_termbox_go/vendor/github.com/awesome-gocui/termbox-go \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \ - brutella:dnssd:v1.1.1:brutella_dnssd/vendor/github.com/brutella/dnssd \ + brutella:dnssd:df0d88646bc5:brutella_dnssd/vendor/github.com/brutella/dnssd \ brutella:hc:v1.2.3:brutella_hc/vendor/github.com/brutella/hc \ census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ @@ -51,27 +52,29 @@ GH_TUPLE= \ dominikh:go-tools:v0.0.1-2019.2.3:dominikh_go_tools/vendor/honnef.co/go/tools \ dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \ + fatih:structtag:v1.2.0:fatih_structtag/vendor/github.com/fatih/structtag \ fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \ go-errors:errors:v1.0.1:go_errors_errors/vendor/github.com/go-errors/errors \ go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \ - go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \ gofrs:uuid:v3.3.0:gofrs_uuid/vendor/github.com/gofrs/uuid \ gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ - golang:crypto:c8d3bf9c5392:golang_crypto/vendor/golang.org/x/crypto \ + golang:crypto:5f87f3452ae9:golang_crypto/vendor/golang.org/x/crypto \ golang:groupcache:869f871628b6:golang_groupcache/vendor/github.com/golang/groupcache \ - golang:lint:16217165b5de:golang_lint/vendor/golang.org/x/lint \ + golang:lint:738671d3881b:golang_lint/vendor/golang.org/x/lint \ golang:mock:v1.4.4:golang_mock/vendor/github.com/golang/mock \ golang:mod:v0.3.0:golang_mod/vendor/golang.org/x/mod \ - golang:net:f5854403a974:golang_net/vendor/golang.org/x/net \ + golang:net:c7110b5ffcbb:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:f84b799fce68:golang_sys/vendor/golang.org/x/sys \ - golang:term:f5c789dd3221:golang_term/vendor/golang.org/x/term \ + golang:sys:8ad439b19e0f:golang_sys/vendor/golang.org/x/sys \ + golang:term:2321bbc49cbf:golang_term/vendor/golang.org/x/term \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ golang:time:89c76fbcd5d1:golang_time/vendor/golang.org/x/time \ - golang:tools:299f270db459:golang_tools/vendor/golang.org/x/tools \ + golang:tools:d93e913c1a58:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ + google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \ google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ gosuri:uilive:v0.0.3:gosuri_uilive/vendor/github.com/gosuri/uilive \ @@ -84,7 +87,7 @@ GH_TUPLE= \ looplab:fsm:v0.2.0:looplab_fsm/vendor/github.com/looplab/fsm \ mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.7:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ + mattn:go-runewidth:v0.0.9: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.35:miekg_dns/vendor/github.com/miekg/dns \ @@ -93,24 +96,25 @@ GH_TUPLE= \ mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ mitchellh:go-wordwrap:v1.0.0:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \ + mitchellh:mapstructure:v1.4.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \ moby:moby:v1.13.1:moby_moby/vendor/github.com/docker/docker \ nats-io:cliprompts:372d79b36768:nats_io_cliprompts_v2/vendor/github.com/nats-io/cliprompts \ - nats-io:jsm.go:ecfafe3d1627:nats_io_jsm_go/vendor/github.com/nats-io/jsm.go \ - nats-io:jwt:057ba30017be:nats_io_jwt_v2 \ - nats-io:jwt:v1.2.0:nats_io_jwt/vendor/github.com/nats-io/jwt \ - nats-io:nats-server:f61fa8529a0f:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \ + nats-io:jsm.go:v0.0.20:nats_io_jsm_go/vendor/github.com/nats-io/jsm.go \ + nats-io:jwt:18c5cc45d263:nats_io_jwt_v2 \ + nats-io:jwt:v1.2.2:nats_io_jwt/vendor/github.com/nats-io/jwt \ + nats-io:nats-server:b88cbe2e0df3:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \ nats-io:nats.go:a35836eca1a8:nats_io_nats_go/vendor/github.com/nats-io/nats.go \ nats-io:nkeys:v0.2.0:nats_io_nkeys/vendor/github.com/nats-io/nkeys \ - nats-io:nsc:be3b53072017:nats_io_nsc/vendor/github.com/nats-io/nsc \ + nats-io:nsc:40dcea882554:nats_io_nsc/vendor/github.com/nats-io/nsc \ nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \ nats-io:stan.go:v0.7.0:nats_io_stan_go/vendor/github.com/nats-io/stan.go \ nxadm:tail:v1.4.4:nxadm_tail/vendor/github.com/nxadm/tail \ oleiade:reflections:0e86b3c98b2f:oleiade_reflections/vendor/github.com/oleiade/reflections \ olekukonko:tablewriter:v0.0.4:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ onsi:ginkgo:v1.14.2:onsi_ginkgo/vendor/github.com/onsi/ginkgo \ - onsi:gomega:v1.10.3:onsi_gomega/vendor/github.com/onsi/gomega \ - open-policy-agent:opa:v0.24.0:open_policy_agent_opa/vendor/github.com/open-policy-agent/opa \ + onsi:gomega:v1.10.4:onsi_gomega/vendor/github.com/onsi/gomega \ + open-policy-agent:opa:v0.25.2:open_policy_agent_opa/vendor/github.com/open-policy-agent/opa \ opencontainers:runc:8779fa57eb4a:opencontainers_runc/vendor/github.com/opencontainers/runc \ patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \ pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ @@ -119,18 +123,19 @@ GH_TUPLE= \ prometheus:common:v0.14.0:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \ protocolbuffers:protobuf-go:v1.24.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ - rcrowley:go-metrics:3113b8401b8a:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \ + rcrowley:go-metrics:10cdbea86bc0:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \ robfig:cron:v1.2.0:robfig_cron/vendor/github.com/robfig/cron \ rsc:goversion:v1.2.0:rsc_goversion/vendor/rsc.io/goversion \ sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ tadglines:go-pkgs:1f86682992f1:tadglines_go_pkgs/vendor/github.com/tadglines/go-pkgs \ - tidwall:gjson:v1.6.3:tidwall_gjson/vendor/github.com/tidwall/gjson \ + tidwall:gjson:v1.6.4:tidwall_gjson/vendor/github.com/tidwall/gjson \ tidwall:match:v1.0.1:tidwall_match/vendor/github.com/tidwall/match \ tidwall:pretty:v1.0.2:tidwall_pretty/vendor/github.com/tidwall/pretty \ uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ uber-go:multierr:v1.3.0:uber_go_multierr/vendor/go.uber.org/multierr \ uber-go:tools:2cfd321de3ee:uber_go_tools/vendor/go.uber.org/tools \ uber-go:zap:v1.13.0:uber_go_zap/vendor/go.uber.org/zap \ + wasmerio:wasmer-go:v0.3.1:wasmerio_go_ext_wasm/vendor/github.com/wasmerio/go-ext-wasm \ xeipuuv:gojsonpointer:02993c407bfb:xeipuuv_gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \ xeipuuv:gojsonreference:bd5ef7bd5415:xeipuuv_gojsonreference/vendor/github.com/xeipuuv/gojsonreference \ xeipuuv:gojsonschema:v1.2.0:xeipuuv_gojsonschema/vendor/github.com/xeipuuv/gojsonschema \ @@ -147,6 +152,10 @@ post-patch: ${REINPLACE_CMD} -e 's/{{cpkg_name}}/choria-server/' \ ${WRKSRC}/packager/templates/debian/global/server.conf +pre-build: + (cd ${GO_WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate ${GO_BUILDFLAGS}) + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/choria ${INSTALL_DATA} ${WRKSRC}/packager/templates/debian/global/broker.conf ${STAGEDIR}${PREFIX}/etc/choria/broker.conf.sample diff --git a/sysutils/choria/distinfo b/sysutils/choria/distinfo index d3fbd1b280e4..37b850718bc8 100644 --- a/sysutils/choria/distinfo +++ b/sysutils/choria/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1606336281 -SHA256 (choria-io-go-choria-v0.18.0_GH0.tar.gz) = cbf6ba8a44ea85dfa419af9f31d9e6d5c8f65de7392f200c0f293502b3c07e37 -SIZE (choria-io-go-choria-v0.18.0_GH0.tar.gz) = 591450 -SHA256 (AlecAivazis-survey-v2.2.2_GH0.tar.gz) = 1ac966e99130f893cc7519ab3b1c1942b1c823f263824b12baabf42515abf3ce -SIZE (AlecAivazis-survey-v2.2.2_GH0.tar.gz) = 1566337 +TIMESTAMP = 1610763418 +SHA256 (choria-io-go-choria-v0.19.0_GH0.tar.gz) = 1da228035ff279b74f98a3f2ed3d9f6d6ba7e8102fcd353e07a5ba4f447056a1 +SIZE (choria-io-go-choria-v0.19.0_GH0.tar.gz) = 654665 +SHA256 (AlecAivazis-survey-v2.2.7_GH0.tar.gz) = ccb13a9f19d40d2ca74584dcfd8515fc76a4f4ddc96a3bd214222bab829303e3 +SIZE (AlecAivazis-survey-v2.2.7_GH0.tar.gz) = 1566851 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (Freman-eventloghook-e4d803b6b48b_GH0.tar.gz) = 3e98b6df8714a08b4ef6f0160f9cea00a72a763d3b0bd814e12ca9ffbb4eb222 @@ -13,22 +13,24 @@ SHA256 (Masterminds-semver-v1.5.0_GH0.tar.gz) = c9140eddfb03dc862f826e7761561260 SIZE (Masterminds-semver-v1.5.0_GH0.tar.gz) = 21188 SHA256 (Masterminds-sprig-v2.22.0_GH0.tar.gz) = c6d0f6e2a3b2aecc888b62c15defcccf16a44e7435c47c7f158b98946c5ee970 SIZE (Masterminds-sprig-v2.22.0_GH0.tar.gz) = 42051 -SHA256 (OneOfOne-xxhash-v1.2.7_GH0.tar.gz) = 2b3c10fdb6d478139b01a28331fcb1a14b67dc9ab3c2967b7a1f68ded4f33801 -SIZE (OneOfOne-xxhash-v1.2.7_GH0.tar.gz) = 14156 +SHA256 (OneOfOne-xxhash-v1.2.8_GH0.tar.gz) = 93af6ad43643a0c61bd548e4e0f0cf37a389ddcd8651ac16f81f9c45207e1bd2 +SIZE (OneOfOne-xxhash-v1.2.8_GH0.tar.gz) = 15513 SHA256 (achanda-go-sysctl-6be7678c45d2_GH0.tar.gz) = 7fe45edc53fbb7afeb2767c0514ba8743d39a26844023639cb1122475a356c7f SIZE (achanda-go-sysctl-6be7678c45d2_GH0.tar.gz) = 5306 SHA256 (aelsabbahy-GOnetstat-edf89f784e08_GH0.tar.gz) = 49498aedcef66168dcdd2b8ff0ac4e5d1a04118c786c60a408f03c4f45efc072 SIZE (aelsabbahy-GOnetstat-edf89f784e08_GH0.tar.gz) = 3970 SHA256 (aelsabbahy-go-ps-61c449472dcf_GH0.tar.gz) = 969fa40ea0a8f9be47938018b9d182a1570b4d6ef7870b064032b667eb881e27 SIZE (aelsabbahy-go-ps-61c449472dcf_GH0.tar.gz) = 7554 -SHA256 (aelsabbahy-goss-v0.3.14_GH0.tar.gz) = 121f99f999a8cdcbf415930aee17805fdb6782fb3d3303a8419f84c60f5dc2b9 -SIZE (aelsabbahy-goss-v0.3.14_GH0.tar.gz) = 103713 +SHA256 (aelsabbahy-goss-v0.3.16_GH0.tar.gz) = 8c17a59ba849a55283169589a3d46a922ee52f65d021411d59971b1b073e244a +SIZE (aelsabbahy-goss-v0.3.16_GH0.tar.gz) = 105517 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383 SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339 SHA256 (alecthomas-units-f65c72e2690d_GH0.tar.gz) = ece06024b01821e013bd7158dfe8ec8cc697f586ce8d3cfaa22edde8c2f022c3 SIZE (alecthomas-units-f65c72e2690d_GH0.tar.gz) = 4925 +SHA256 (antonmedv-expr-v1.8.9_GH0.tar.gz) = 687a7d14989754090141683a10a69d5f9d582e706f7daa84ff37ed334aeb3f68 +SIZE (antonmedv-expr-v1.8.9_GH0.tar.gz) = 4007487 SHA256 (awesome-gocui-gocui-v0.6.0_GH0.tar.gz) = ff2c420ad12b561a1a72dbdc19043489a86c28fb70d3c25d4b999e1290f0ee8a SIZE (awesome-gocui-gocui-v0.6.0_GH0.tar.gz) = 37489 SHA256 (awesome-gocui-termbox-go-c0aef3d18bcc_GH0.tar.gz) = fa29e9a5ab162b6fbdaa5585f7dffede8d436cfc47b635383c4cb8dc0fcd0552 @@ -37,8 +39,8 @@ SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57 SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831 -SHA256 (brutella-dnssd-v1.1.1_GH0.tar.gz) = f1a606d4b6685032e162086842fbced9bc94de650863a3a5830710e9feacd879 -SIZE (brutella-dnssd-v1.1.1_GH0.tar.gz) = 257048 +SHA256 (brutella-dnssd-df0d88646bc5_GH0.tar.gz) = 96462ca6da16444d643d5a60542552dc9f96d731fd339eb78520f9ae5c0407d0 +SIZE (brutella-dnssd-df0d88646bc5_GH0.tar.gz) = 256829 SHA256 (brutella-hc-v1.2.3_GH0.tar.gz) = b9bf3ab0e0c7b9ce19eb877e9d2bd06943cb5a02a081d945f0d826403fdddaf3 SIZE (brutella-hc-v1.2.3_GH0.tar.gz) = 123725 SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d @@ -61,6 +63,8 @@ SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532 +SHA256 (fatih-structtag-v1.2.0_GH0.tar.gz) = f39a7edcb38f70f8b12f8b4f18b386d508c6a5b7f6fbddcee52d299b795fdaab +SIZE (fatih-structtag-v1.2.0_GH0.tar.gz) = 5702 SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900 SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44 @@ -69,40 +73,42 @@ SHA256 (go-errors-errors-v1.0.1_GH0.tar.gz) = f3c4e21affe3f563ab6ab5de4086be9eff SIZE (go-errors-errors-v1.0.1_GH0.tar.gz) = 8647 SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554 SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631 -SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07 -SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816 +SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 +SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962 SHA256 (gofrs-uuid-v3.3.0_GH0.tar.gz) = e9e33d86dfb753b1569414d733e8483d565345df302240a5c9f2930c02951ccb SIZE (gofrs-uuid-v3.3.0_GH0.tar.gz) = 17919 SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236 SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188 -SHA256 (golang-crypto-c8d3bf9c5392_GH0.tar.gz) = 15fc3b4dec3dfdc32756371072c5095fb1505e301c12820c9c1c16ea4ff2039e -SIZE (golang-crypto-c8d3bf9c5392_GH0.tar.gz) = 1721622 +SHA256 (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 8e905a4ce396416a8c8afd8075b93da404f77a9ec1475ad2814d289a1e21a0ee +SIZE (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 1721681 SHA256 (golang-groupcache-869f871628b6_GH0.tar.gz) = c997da82585593a4d69a24e3e25c074bb96a7a84b1ef7d2dad4fa1002e93c928 SIZE (golang-groupcache-869f871628b6_GH0.tar.gz) = 26041 -SHA256 (golang-lint-16217165b5de_GH0.tar.gz) = e1b870caa2e428d183d6a467be064578582bacc19615e50867c24d53080ba496 -SIZE (golang-lint-16217165b5de_GH0.tar.gz) = 31428 +SHA256 (golang-lint-738671d3881b_GH0.tar.gz) = c3c30939f0592da3a4b470afd40cdf2924a2749e251b4188f53a918445fb67b4 +SIZE (golang-lint-738671d3881b_GH0.tar.gz) = 31848 SHA256 (golang-mock-v1.4.4_GH0.tar.gz) = a3e25a2c234f82f6685e143681e223462bd1cc0098375a48dc042e227f2cd677 SIZE (golang-mock-v1.4.4_GH0.tar.gz) = 55141 SHA256 (golang-mod-v0.3.0_GH0.tar.gz) = bc97bb300928a00cfe64d97b3240c760668060cda0767e0d0b413e506fc3fa0a SIZE (golang-mod-v0.3.0_GH0.tar.gz) = 93941 -SHA256 (golang-net-f5854403a974_GH0.tar.gz) = 75e94d61e00b4aec6b7baea0927e51a92239caf876214f45394258855c73f92f -SIZE (golang-net-f5854403a974_GH0.tar.gz) = 1178323 +SHA256 (golang-net-c7110b5ffcbb_GH0.tar.gz) = 605f6a51c193b119a568c40151f74ec8a4634fe94cb01627bb7a1ad7cfe684fe +SIZE (golang-net-c7110b5ffcbb_GH0.tar.gz) = 1248997 SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610 SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969 -SHA256 (golang-sys-f84b799fce68_GH0.tar.gz) = 460f5326b83bac46e12e1fd6ec1fed7ddba3756cdc9c9de7ba3f3226c588fa81 -SIZE (golang-sys-f84b799fce68_GH0.tar.gz) = 1087830 -SHA256 (golang-term-f5c789dd3221_GH0.tar.gz) = 1973ece67e473ecb76ee5de7ffb7d6afa014f6b1d066c39e1c5126108a4ca537 -SIZE (golang-term-f5c789dd3221_GH0.tar.gz) = 15239 +SHA256 (golang-sys-8ad439b19e0f_GH0.tar.gz) = 0b5b291718d4f5a6d7c68f734432cc33dc0d46fd8526fc9905f6ca1a644cc1ff +SIZE (golang-sys-8ad439b19e0f_GH0.tar.gz) = 1086461 +SHA256 (golang-term-2321bbc49cbf_GH0.tar.gz) = 72896f6aa3deb053da5b597ab072ba5c3540b29d0fb56f350397b7f94c010e21 +SIZE (golang-term-2321bbc49cbf_GH0.tar.gz) = 15281 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 SHA256 (golang-time-89c76fbcd5d1_GH0.tar.gz) = 376a3855d3a951c848f1d3dc8eddf4b91b035f0e7ec3577359aa490b7b056abb SIZE (golang-time-89c76fbcd5d1_GH0.tar.gz) = 9605 -SHA256 (golang-tools-299f270db459_GH0.tar.gz) = 306c788655614e3e1aec77e4d5561c41ce10a5963741c3362d0e4417508cd1be -SIZE (golang-tools-299f270db459_GH0.tar.gz) = 2639460 +SHA256 (golang-tools-d93e913c1a58_GH0.tar.gz) = a3118a39268f05a971a03dfea860ebb365759090f38dc396b0999a3b68fb678c +SIZE (golang-tools-d93e913c1a58_GH0.tar.gz) = 2655214 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 +SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a +SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600 SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 @@ -127,8 +133,8 @@ SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af7020 SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548 -SHA256 (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 09270ddb93b2d77d4b3903bbadacbb3a3d4f0cce93c373fb21503840829d8697 -SIZE (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 16089 +SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835 +SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714 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-9520e82c474b_GH0.tar.gz) = f9203c71aceb8b7ffa87181fd8f51dc69acce3d2161c4c017ea92c6840f85093 @@ -145,26 +151,28 @@ SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b6 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 SHA256 (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 9bcf5c1f8b66594c73f606502bb3d9713d862a71ea66d8641e2a0b7bb66cb252 SIZE (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 2777 +SHA256 (mitchellh-mapstructure-v1.4.0_GH0.tar.gz) = 7629b5821ec91aa7fe5a786a9af46f81c22b78946d24a978b67cbf98552a96b6 +SIZE (mitchellh-mapstructure-v1.4.0_GH0.tar.gz) = 27238 SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3 SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143 SHA256 (moby-moby-v1.13.1_GH0.tar.gz) = 0d24e814f7adf19dc281b29fef69d0dfec7994966de9aaed7d4207d3034b9ee0 SIZE (moby-moby-v1.13.1_GH0.tar.gz) = 7788124 SHA256 (nats-io-cliprompts-372d79b36768_GH0.tar.gz) = 1c6b1b1d0114360419faf0ba0ed122d97f91e7570d4c6700153c2fbd7b231c31 SIZE (nats-io-cliprompts-372d79b36768_GH0.tar.gz) = 12769 -SHA256 (nats-io-jsm.go-ecfafe3d1627_GH0.tar.gz) = 6d0fe8d78c9ec0d0b484931e68746532aabb6832b52b946ba87b2318651c4b86 -SIZE (nats-io-jsm.go-ecfafe3d1627_GH0.tar.gz) = 77981 -SHA256 (nats-io-jwt-057ba30017be_GH0.tar.gz) = 0b69701bba8095ce1f2a2989f6167c16bc0fe2ee0e0229a38043ff570bea7662 -SIZE (nats-io-jwt-057ba30017be_GH0.tar.gz) = 70897 -SHA256 (nats-io-jwt-v1.2.0_GH0.tar.gz) = b9e48e2715380a550dc277bb4220ea2827e9c1d37e679d32113d0fe17715764f -SIZE (nats-io-jwt-v1.2.0_GH0.tar.gz) = 70876 -SHA256 (nats-io-nats-server-f61fa8529a0f_GH0.tar.gz) = 77ba7d3cc6f7c594e3197efef44bad54683291a8941d9360dbf3bf107300052c -SIZE (nats-io-nats-server-f61fa8529a0f_GH0.tar.gz) = 1351452 +SHA256 (nats-io-jsm.go-v0.0.20_GH0.tar.gz) = 6857ea7d97976781d1112dff61244bd4cf79f3398ca6c78a74d22abb76188ab5 +SIZE (nats-io-jsm.go-v0.0.20_GH0.tar.gz) = 81734 +SHA256 (nats-io-jwt-18c5cc45d263_GH0.tar.gz) = 0c492243299d24dff5afa46d0ba26f7314c6d72f5201109c1545f98c25e7aa12 +SIZE (nats-io-jwt-18c5cc45d263_GH0.tar.gz) = 77772 +SHA256 (nats-io-jwt-v1.2.2_GH0.tar.gz) = 67de1c53bb1762b67e06cc98fb11141a31d4222c26765e1ba4640ed1b6722069 +SIZE (nats-io-jwt-v1.2.2_GH0.tar.gz) = 71040 +SHA256 (nats-io-nats-server-b88cbe2e0df3_GH0.tar.gz) = 37c35cefd85acb22ba0bfca3624b486fef6f7c327cd7f21c66325b39cbefa618 +SIZE (nats-io-nats-server-b88cbe2e0df3_GH0.tar.gz) = 2640513 SHA256 (nats-io-nats.go-a35836eca1a8_GH0.tar.gz) = a92b2101c09e51eccaa774f68c732944d90083b5d8a76f677d0c1f194281af1f SIZE (nats-io-nats.go-a35836eca1a8_GH0.tar.gz) = 146226 SHA256 (nats-io-nkeys-v0.2.0_GH0.tar.gz) = fd9bfdc96ad711470e9acc811a1182ab3cb8ecf595e7e7397a9ded18eaf5e3af SIZE (nats-io-nkeys-v0.2.0_GH0.tar.gz) = 19980 -SHA256 (nats-io-nsc-be3b53072017_GH0.tar.gz) = 92ec1fe66fdad21d076ae8d79d47abe27feac8e42c54e70f5d93bf405682de80 -SIZE (nats-io-nsc-be3b53072017_GH0.tar.gz) = 3459987 +SHA256 (nats-io-nsc-40dcea882554_GH0.tar.gz) = 471ebce2bc85ac6550580baaaf6591642b2b9d951cdf70968113846bc957f98a +SIZE (nats-io-nsc-40dcea882554_GH0.tar.gz) = 3604585 SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529 SHA256 (nats-io-stan.go-v0.7.0_GH0.tar.gz) = 9982d01532364a87df09d0fc9c35bb4a2d9f1be45c96749c82e8238d1d554a27 @@ -177,10 +185,10 @@ SHA256 (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = a86028430fb4dd99ce0030a7c4d3 SIZE (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = 19252 SHA256 (onsi-ginkgo-v1.14.2_GH0.tar.gz) = 53246dc56de75ceb7e144daacb07096083020b58cf4006056ca393f34f68c499 SIZE (onsi-ginkgo-v1.14.2_GH0.tar.gz) = 146966 -SHA256 (onsi-gomega-v1.10.3_GH0.tar.gz) = 7f7d2c47869950f02f794ee6064a7c0d3068c6a974c2fb63abfb534a6ded89d8 -SIZE (onsi-gomega-v1.10.3_GH0.tar.gz) = 97869 -SHA256 (open-policy-agent-opa-v0.24.0_GH0.tar.gz) = 6401f8ce1c99fe90fddd27e1fb54b04477faee8d6ce0a1e4565405df26e47383 -SIZE (open-policy-agent-opa-v0.24.0_GH0.tar.gz) = 19526310 +SHA256 (onsi-gomega-v1.10.4_GH0.tar.gz) = 80eac8047eac1fcc5ce38fdc54916e006c07cba13db09f95ad2818203f546633 +SIZE (onsi-gomega-v1.10.4_GH0.tar.gz) = 98238 +SHA256 (open-policy-agent-opa-v0.25.2_GH0.tar.gz) = 014e7828b0530a18e23f6ff883502ae67070440707cb9c8bd9c0adf6d354caa2 +SIZE (open-policy-agent-opa-v0.25.2_GH0.tar.gz) = 24953003 SHA256 (opencontainers-runc-8779fa57eb4a_GH0.tar.gz) = f1f19d6ed8169b699e0670c1ee42a39ecc6a122a5a2f6b42b75516cff658fc97 SIZE (opencontainers-runc-8779fa57eb4a_GH0.tar.gz) = 560910 SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be @@ -197,8 +205,8 @@ SHA256 (prometheus-procfs-v0.2.0_GH0.tar.gz) = b6c013031ac8b9f8f9e1595103c48feb8 SIZE (prometheus-procfs-v0.2.0_GH0.tar.gz) = 157368 SHA256 (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56 SIZE (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640 -SHA256 (rcrowley-go-metrics-3113b8401b8a_GH0.tar.gz) = e9351ac1affff550a698b364c07df232b5c8fa99f1a34666c2bc6a76a2f86964 -SIZE (rcrowley-go-metrics-3113b8401b8a_GH0.tar.gz) = 36754 +SHA256 (rcrowley-go-metrics-10cdbea86bc0_GH0.tar.gz) = 3f1c492e20be6214a1211602bf2675d42cff5fa59c452a231557e3add587e57c +SIZE (rcrowley-go-metrics-10cdbea86bc0_GH0.tar.gz) = 37583 SHA256 (robfig-cron-v1.2.0_GH0.tar.gz) = c0670687f803388d1655773d097c7c623b4c7e552f5ee5f7dc5e27e313e70c64 SIZE (robfig-cron-v1.2.0_GH0.tar.gz) = 14978 SHA256 (rsc-goversion-v1.2.0_GH0.tar.gz) = 65e9c181995ed8c9207ea08d79a148ab53307b7fad2172a5a0764d6aa393a98e @@ -207,8 +215,8 @@ SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b6 SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392 SHA256 (tadglines-go-pkgs-1f86682992f1_GH0.tar.gz) = 96cbd9945679d5ac0f53aa513d3f17d2f4db2002d34d5f490a1278b737566d5c SIZE (tadglines-go-pkgs-1f86682992f1_GH0.tar.gz) = 11772 -SHA256 (tidwall-gjson-v1.6.3_GH0.tar.gz) = d3dd050aec7d3b976738a1fd3e0089bc01c00db51b9e5cc1cc47de0a019851a5 -SIZE (tidwall-gjson-v1.6.3_GH0.tar.gz) = 50946 +SHA256 (tidwall-gjson-v1.6.4_GH0.tar.gz) = 3c0edd6838a552e6239ce9bfb5fa73a440433eeb34e7dff42f70c120e0f41ff9 +SIZE (tidwall-gjson-v1.6.4_GH0.tar.gz) = 51035 SHA256 (tidwall-match-v1.0.1_GH0.tar.gz) = e20457b7f9fbcdc60c239b4651e70b9a8caded8e5e09cd285078ba7f9c4e639f SIZE (tidwall-match-v1.0.1_GH0.tar.gz) = 4367 SHA256 (tidwall-pretty-v1.0.2_GH0.tar.gz) = 820d92d4bb31a9f5a03f4168a5c4ff4ca50d8fd4a72bdf24257b5e4a0acf0ee5 @@ -221,6 +229,8 @@ SHA256 (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = a7d91d3ddea6d8a83240af46436e02d SIZE (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = 11054 SHA256 (uber-go-zap-v1.13.0_GH0.tar.gz) = dcadd2fc1a93124b594e2fd951456bb1727f922f5ef005e388273851d0607ae7 SIZE (uber-go-zap-v1.13.0_GH0.tar.gz) = 122949 +SHA256 (wasmerio-wasmer-go-v0.3.1_GH0.tar.gz) = 41cca0ea92269ddfc58a0c3266a9762562cfabe79a54d0465d1bed806eaca517 +SIZE (wasmerio-wasmer-go-v0.3.1_GH0.tar.gz) = 5146398 SHA256 (xeipuuv-gojsonpointer-02993c407bfb_GH0.tar.gz) = 36e17c61a2a9384cfdaa1817327f368a1eec66722a7c72ce26abcf8e36ace446 SIZE (xeipuuv-gojsonpointer-02993c407bfb_GH0.tar.gz) = 7698 SHA256 (xeipuuv-gojsonreference-bd5ef7bd5415_GH0.tar.gz) = f99765bc8692e620f8abc3f36e10df36a4161c5634505632599ce88abc2d8f55 diff --git a/sysutils/choria/files/patch-plugin__0__choria__provision.go b/sysutils/choria/files/patch-plugin__0__choria__provision.go deleted file mode 100644 index 0ffc94ad8044..000000000000 --- a/sysutils/choria/files/patch-plugin__0__choria__provision.go +++ /dev/null @@ -1,17 +0,0 @@ ---- plugin_0_choria_provision.go.orig 2020-09-30 01:19:24 UTC -+++ plugin_0_choria_provision.go -@@ -0,0 +1,14 @@ -+// auto generated 2020-09-28 11:42:32.813446154 -1000 -10 m=+0.007024270 -+package main -+ -+import ( -+ "github.com/choria-io/go-choria/plugin" -+ p "github.com/choria-io/provisioning-agent/agent" -+) -+ -+func init() { -+ err := plugin.Register("choria_provision", p.ChoriaPlugin()) -+ if err != nil { -+ panic(err) -+ } -+} diff --git a/sysutils/choria/files/patch-plugin__1__externalmco.go b/sysutils/choria/files/patch-plugin__1__externalmco.go deleted file mode 100644 index 89a2d97da6fa..000000000000 --- a/sysutils/choria/files/patch-plugin__1__externalmco.go +++ /dev/null @@ -1,17 +0,0 @@ ---- plugin_1_externalmco.go.orig 2020-09-30 01:19:24 UTC -+++ plugin_1_externalmco.go -@@ -0,0 +1,14 @@ -+// auto generated 2020-09-28 11:42:33.57430812 -1000 -10 m=+0.767886243 -+package main -+ -+import ( -+ "github.com/choria-io/go-choria/plugin" -+ p "github.com/choria-io/go-choria/providers/agent/mcorpc/external" -+) -+ -+func init() { -+ err := plugin.Register("externalmco", p.ChoriaPlugin()) -+ if err != nil { -+ panic(err) -+ } -+} diff --git a/sysutils/choria/files/patch-plugin__2__golangmco.go b/sysutils/choria/files/patch-plugin__2__golangmco.go deleted file mode 100644 index 6824fb7650f0..000000000000 --- a/sysutils/choria/files/patch-plugin__2__golangmco.go +++ /dev/null @@ -1,17 +0,0 @@ ---- plugin_2_golangmco.go.orig 2020-09-30 01:19:24 UTC -+++ plugin_2_golangmco.go -@@ -0,0 +1,14 @@ -+// auto generated 2020-09-28 11:42:34.321643234 -1000 -10 m=+1.515221354 -+package main -+ -+import ( -+ "github.com/choria-io/go-choria/plugin" -+ p "github.com/choria-io/go-choria/providers/agent/mcorpc/golang" -+) -+ -+func init() { -+ err := plugin.Register("golangmco", p.ChoriaPlugin()) -+ if err != nil { -+ panic(err) -+ } -+} diff --git a/sysutils/choria/files/patch-plugin__3__rubymco.go b/sysutils/choria/files/patch-plugin__3__rubymco.go deleted file mode 100644 index b5536b7f0b82..000000000000 --- a/sysutils/choria/files/patch-plugin__3__rubymco.go +++ /dev/null @@ -1,17 +0,0 @@ ---- plugin_3_rubymco.go.orig 2020-09-30 01:19:24 UTC -+++ plugin_3_rubymco.go -@@ -0,0 +1,14 @@ -+// auto generated 2020-09-28 11:42:35.067195884 -1000 -10 m=+2.260774017 -+package main -+ -+import ( -+ "github.com/choria-io/go-choria/plugin" -+ p "github.com/choria-io/go-choria/providers/agent/mcorpc/ruby" -+) -+ -+func init() { -+ err := plugin.Register("rubymco", p.ChoriaPlugin()) -+ if err != nil { -+ panic(err) -+ } -+} diff --git a/sysutils/choria/files/patch-plugin__4__scout.go b/sysutils/choria/files/patch-plugin__4__scout.go deleted file mode 100644 index 09e3b70390e5..000000000000 --- a/sysutils/choria/files/patch-plugin__4__scout.go +++ /dev/null @@ -1,17 +0,0 @@ ---- plugin_4_scout.go.orig 2020-09-30 01:19:24 UTC -+++ plugin_4_scout.go -@@ -0,0 +1,14 @@ -+// auto generated 2020-09-28 11:42:35.811480582 -1000 -10 m=+3.005058727 -+package main -+ -+import ( -+ "github.com/choria-io/go-choria/plugin" -+ p "github.com/choria-io/go-choria/scout/agent/scout" -+) -+ -+func init() { -+ err := plugin.Register("scout", p.ChoriaPlugin()) -+ if err != nil { -+ panic(err) -+ } -+} diff --git a/sysutils/choria/files/patch-vendor_github.com_nats-io_nats-server_v2_server_disk__avail.go b/sysutils/choria/files/patch-vendor_github.com_nats-io_nats-server_v2_server_disk__avail.go deleted file mode 100644 index 02f306f779f1..000000000000 --- a/sysutils/choria/files/patch-vendor_github.com_nats-io_nats-server_v2_server_disk__avail.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/nats-io/nats-server/v2/server/disk_avail.go.orig 2020-11-25 20:36:11 UTC -+++ vendor/github.com/nats-io/nats-server/v2/server/disk_avail.go -@@ -28,7 +28,7 @@ func diskAvailable(storeDir string) int64 { - var fs syscall.Statfs_t - if err := syscall.Statfs(storeDir, &fs); err == nil { - // Estimate 75% of available storage. -- ba = int64(fs.Bavail * uint64(fs.Bsize) / 4 * 3) -+ ba = int64(uint64(fs.Bavail) * uint64(fs.Bsize) / 4 * 3) - } else { - // Used 1TB default as a guess if all else fails. - ba = JetStreamMaxStoreDefault