Attachment 242213 Details for Bug 271452 – patch for crowdsec-firewall-bouncer 0.0.27

[patch] patch for crowdsec-firewall-bouncer 0.0.27

0001-security-crowdsec-firewall-bouncer-update-to-0.0.27.patch (text/plain), 51.98 KB, created by marco on 2023-05-16 14:15:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marco

Created: 2023-05-16 14:15:57 UTC

Size: 51.98 KB

patch

obsolete

>From 4fcf9a8a2bb0e23fdb7cb2c372e9d05d851fdc3b Mon Sep 17 00:00:00 2001
>From: Marco Mariani <marco@crowdsec.net>
>Date: Wed, 10 May 2023 11:48:37 +0200
>Subject: [PATCH 1/2] security/crowdsec-firewall-bouncer: update to 0.0.27
>
>---
> security/crowdsec-firewall-bouncer/Makefile   |  22 +-
> security/crowdsec-firewall-bouncer/distinfo   |   8 +-
> .../files/crowdsec_firewall.in                |   3 +-
> .../files/patch-Makefile                      |  15 -
> .../files/patch-go.mod                        |  69 ----
> .../files/patch-go.sum                        | 369 ------------------
> .../files/patch-vendor_modules.txt            | 187 ---------
> .../files/pkg-deinstall.in                    |   4 +-
> .../files/pkg-message.in                      |  10 +-
> 9 files changed, 18 insertions(+), 669 deletions(-)
> delete mode 100644 security/crowdsec-firewall-bouncer/files/patch-Makefile
> delete mode 100644 security/crowdsec-firewall-bouncer/files/patch-go.mod
> delete mode 100644 security/crowdsec-firewall-bouncer/files/patch-go.sum
> delete mode 100644 security/crowdsec-firewall-bouncer/files/patch-vendor_modules.txt
>
>diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile
>index 4c519e0e6ee2..ce239d5a742f 100644
>--- a/security/crowdsec-firewall-bouncer/Makefile
>+++ b/security/crowdsec-firewall-bouncer/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	crowdsec-firewall-bouncer
>-PORTVERSION=	0.0.23.r2  # NOTE: change BUILD_VERSION and BUILD_TAG as well
>-PORTREVISION=	12
> DISTVERSIONPREFIX=	v
>+DISTVERSION=	0.0.27
> CATEGORIES=	security
> 
> MAINTAINER=	marco@crowdsec.net
>@@ -18,25 +17,18 @@ USES=		gmake go:no_targets
> USE_GITHUB=	yes
> GH_ACCOUNT=	crowdsecurity
> GH_PROJECT=	cs-firewall-bouncer
>-GH_TAGNAME=	v0.0.23.r2-freebsd
>-#GH_TAGNAME is automatically set from DISTVERSION
>-GH_TUPLE=	golang:sys:v0.6.0:sys
>-
>+GH_TAGNAME=	${DISTVERSIONFULL}-freebsd
>+_BUILD_TAG=	f1f8b379
> USE_RC_SUBR=	crowdsec_firewall
> 
>-SUB_FILES=	pkg-deinstall pkg-install pkg-message
>+MAKE_ARGS=	BUILD_VERSION="${DISTVERSIONFULL}" \
>+		BUILD_TAG="${_BUILD_TAG}" \
>+		BUILD_VENDOR_FLAGS="-mod=vendor -modcacherw"
> 
>-# BUILD_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
>-# BUILD_TAG=$(git rev-parse HEAD)
>-MAKE_ENV=	BUILD_TAG="bc4bb1d531d47ad94ead2dce3a11f6391b1e8619" \
>-		BUILD_VERSION="v0.0.23-rc2"
>+SUB_FILES=	pkg-deinstall pkg-install pkg-message
> 
> ETCDIR=		${PREFIX}/etc/crowdsec/bouncers
> 
>-pre-patch:
>-	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
>-	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
>-
> post-patch:
> 	${REINPLACE_CMD} 's,$${BACKEND},pf,g' \
> 		${WRKSRC}/config/crowdsec-firewall-bouncer.yaml
>diff --git a/security/crowdsec-firewall-bouncer/distinfo b/security/crowdsec-firewall-bouncer/distinfo
>index 3551e6bc2948..660ae34d16b5 100644
>--- a/security/crowdsec-firewall-bouncer/distinfo
>+++ b/security/crowdsec-firewall-bouncer/distinfo
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1679928584
>-SHA256 (crowdsecurity-cs-firewall-bouncer-v0.0.23.r2-v0.0.23.r2-freebsd_GH0.tar.gz) = efb34044e8a648c1ec505fef64de3e4901ac760e732b647650f8e46547c7fe87
>-SIZE (crowdsecurity-cs-firewall-bouncer-v0.0.23.r2-v0.0.23.r2-freebsd_GH0.tar.gz) = 3053462
>-SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
>-SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
>+TIMESTAMP = 1684225377
>+SHA256 (crowdsecurity-cs-firewall-bouncer-v0.0.27-v0.0.27-freebsd_GH0.tar.gz) = 1dba0604d0ff7d9035e2e2adcff42cddf7d0b63f23dd973ce692b6e18ee65126
>+SIZE (crowdsecurity-cs-firewall-bouncer-v0.0.27-v0.0.27-freebsd_GH0.tar.gz) = 2600838
>diff --git a/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>index 9ae41cef717b..475bb4ae0e53 100755
>--- a/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>+++ b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>@@ -37,8 +37,7 @@ crowdsec_firewall_precmd() {
>     orig_line="api_key: \${API_KEY}"
>     # IF the bouncer is not configured
>     if grep -q "^${orig_line}" "${crowdsec_firewall_config}"; then
>-        SUFFIX=$(LC_CTYPE=C tr -dc A-Za-z0-9 </dev/urandom | head -c 8)
>-        BOUNCER="cs-firewall-bouncer-${SUFFIX}"
>+        BOUNCER="cs-firewall-bouncer-$(date +%s)"
>         # AND crowdsec is installed..
>         if command -v "$CSCLI" >/dev/null; then
>             # THEN, register it to the local API
>diff --git a/security/crowdsec-firewall-bouncer/files/patch-Makefile b/security/crowdsec-firewall-bouncer/files/patch-Makefile
>deleted file mode 100644
>index d8f1e8f79f4e..000000000000
>--- a/security/crowdsec-firewall-bouncer/files/patch-Makefile
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- Makefile.orig	2022-02-11 13:22:37 UTC
>-+++ Makefile
>-@@ -54,10 +54,10 @@ lint:
>- 	golangci-lint run
>- 
>- static: goversion clean
>--	$(GOBUILD) -ldflags "$(LDFLAGS_STATIC)" -o $(BINARY_NAME) -v -a -tags netgo
>-+	$(GOBUILD) -mod vendor -modcacherw -ldflags "$(LDFLAGS_STATIC)" -o $(BINARY_NAME) -v -a -tags netgo
>- 
>- build: goversion clean
>--	$(GOBUILD) -ldflags "$(LDFLAGS_DYNAMIC)" -o $(BINARY_NAME) -v
>-+	$(GOBUILD) -mod vendor -modcacherw -ldflags "$(LDFLAGS_DYNAMIC)" -o $(BINARY_NAME) -v
>- 
>- test:
>- 	@$(GOTEST) -ldflags "$(LDFLAGS_DYNAMIC)" -v ./...
>diff --git a/security/crowdsec-firewall-bouncer/files/patch-go.mod b/security/crowdsec-firewall-bouncer/files/patch-go.mod
>deleted file mode 100644
>index 624da7843b97..000000000000
>--- a/security/crowdsec-firewall-bouncer/files/patch-go.mod
>+++ /dev/null
>@@ -1,69 +0,0 @@
>---- go.mod.orig	2023-03-27 14:53:33 UTC
>-+++ go.mod
>-@@ -1,30 +1,55 @@
>- module github.com/crowdsecurity/cs-firewall-bouncer
>- 
>--go 1.14
>-+go 1.17
>- 
>- require (
>--	github.com/ahmetb/dlog v0.0.0-20170105205344-4fb5f8204f26 // indirect
>--	github.com/antonmedv/expr v1.9.0 // indirect
>- 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
>- 	github.com/crowdsecurity/crowdsec v1.3.0
>- 	github.com/crowdsecurity/go-cs-bouncer v0.0.0-20220209104231-631313ec9d39
>-+	github.com/google/nftables v0.0.0-20220206174406-91d3b4571db1
>-+	github.com/pkg/errors v0.9.1
>-+	github.com/sirupsen/logrus v1.8.1
>-+	golang.org/x/sys v0.6.0
>-+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
>-+	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
>-+	gopkg.in/yaml.v2 v2.4.0
>-+)
>-+
>-+require (
>-+	github.com/PuerkitoBio/purell v1.1.1 // indirect
>-+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
>-+	github.com/antonmedv/expr v1.9.0 // indirect
>-+	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
>-+	github.com/buger/jsonparser v1.1.1 // indirect
>-+	github.com/crowdsecurity/grokky v0.0.0-20220120093523-d5b3478363fa // indirect
>-+	github.com/davecgh/go-spew v1.1.1 // indirect
>-+	github.com/go-openapi/analysis v0.21.2 // indirect
>-+	github.com/go-openapi/errors v0.20.2 // indirect
>-+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
>-+	github.com/go-openapi/jsonreference v0.19.6 // indirect
>- 	github.com/go-openapi/loads v0.21.1 // indirect
>- 	github.com/go-openapi/runtime v0.23.0 // indirect
>-+	github.com/go-openapi/spec v0.20.4 // indirect
>- 	github.com/go-openapi/strfmt v0.21.2 // indirect
>- 	github.com/go-openapi/swag v0.21.1 // indirect
>-+	github.com/go-openapi/validate v0.20.3 // indirect
>- 	github.com/go-stack/stack v1.8.1 // indirect
>--	github.com/google/nftables v0.0.0-20220206174406-91d3b4571db1
>-+	github.com/google/go-cmp v0.5.7 // indirect
>-+	github.com/google/go-querystring v1.1.0 // indirect
>- 	github.com/hashicorp/go-version v1.4.0 // indirect
>--	github.com/logrusorgru/grokky v0.0.0-20180829062225-47edf017d42c // indirect
>-+	github.com/josharian/intern v1.0.0 // indirect
>-+	github.com/josharian/native v1.0.0 // indirect
>-+	github.com/koneu/natend v0.0.0-20150829182554-ec0926ea948d // indirect
>-+	github.com/mailru/easyjson v0.7.7 // indirect
>- 	github.com/mdlayher/netlink v1.6.0 // indirect
>--	github.com/pkg/errors v0.9.1
>--	github.com/sirupsen/logrus v1.8.1
>-+	github.com/mdlayher/socket v0.1.1 // indirect
>-+	github.com/mitchellh/mapstructure v1.4.3 // indirect
>-+	github.com/oklog/ulid v1.3.1 // indirect
>- 	github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect
>- 	go.mongodb.org/mongo-driver v1.8.3 // indirect
>--	golang.org/x/sys v0.0.0-20220207234003-57398862261d
>--	gopkg.in/natefinch/lumberjack.v2 v2.0.0
>--	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
>--	gopkg.in/yaml.v2 v2.4.0
>-+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
>-+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
>-+	golang.org/x/text v0.3.7 // indirect
>- )
>- 
>- exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
>diff --git a/security/crowdsec-firewall-bouncer/files/patch-go.sum b/security/crowdsec-firewall-bouncer/files/patch-go.sum
>deleted file mode 100644
>index 78cbbccce214..000000000000
>--- a/security/crowdsec-firewall-bouncer/files/patch-go.sum
>+++ /dev/null
>@@ -1,369 +0,0 @@
>---- go.sum.orig	2023-03-27 14:53:35 UTC
>-+++ go.sum
>-@@ -14,8 +14,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666
>- entgo.io/ent v0.9.1/go.mod h1:6NUeTfUN5mp5YN+5tgoH1SlakSvYPTBOYotSOvaI4ak=
>- github.com/AlecAivazis/survey/v2 v2.2.7/go.mod h1:9DYvHgXtiXm6nCn+jXnOXLKbH+Yo9u8fAS/SduGdoPk=
>- github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
>--github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
>- github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
>-+github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
>- github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
>- github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
>- github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
>-@@ -39,7 +39,6 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf
>- github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
>- github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
>- github.com/ahmetalpbalkan/dlog v0.0.0-20170105205344-4fb5f8204f26/go.mod h1:ilK+u7u1HoqaDk0mjhh27QJB7PyWMreGffEvOCoEKiY=
>--github.com/ahmetb/dlog v0.0.0-20170105205344-4fb5f8204f26 h1:3YVZUqkoev4mL+aCwVOSWV4M7pN+NURHL38Z2zq5JKA=
>- github.com/ahmetb/dlog v0.0.0-20170105205344-4fb5f8204f26/go.mod h1:ymXt5bw5uSNu4jveerFxE0vNYxF8ncqbptntMaFMg3k=
>- github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
>- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
>-@@ -53,7 +52,6 @@ github.com/antonmedv/expr v1.9.0 h1:j4HI3NHEdgDnN9p6oI
>- github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8=
>- github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
>- github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
>--github.com/appleboy/gin-jwt/v2 v2.6.4/go.mod h1:CZpq1cRw+kqi0+yD2CwVw7VGXrrx4AqBdeZnwxVmoAs=
>- github.com/appleboy/gin-jwt/v2 v2.8.0/go.mod h1:KsK7E8HTvRg3vOiumTsr/ntNTHbZ3IbHLe4Eto31p7k=
>- github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
>- github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
>-@@ -70,7 +68,6 @@ github.com/asaskevich/govalidator v0.0.0-2021030708111
>- github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
>- github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
>- github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
>--github.com/aws/aws-sdk-go v1.38.34/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
>- github.com/aws/aws-sdk-go v1.42.25/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs=
>- github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
>- github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
>-@@ -85,7 +82,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod
>- github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
>- github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
>- github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
>--github.com/cilium/ebpf v0.5.0 h1:E1KshmrMEtkMP2UjlWzfmUV1owWY+BnbL5FxxuatnrU=
>- github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
>- github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
>- github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
>-@@ -112,21 +108,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7
>- github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
>- github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
>- github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
>--github.com/crowdsecurity/crowdsec v1.2.1 h1:9Iz3+zX6sNHbxpbHtB+ZeAfA00OGb3XClIOs3/Gm/84=
>--github.com/crowdsecurity/crowdsec v1.2.1/go.mod h1:D9GaXkGEJkemrGTswIJO4OS+cQoUR++pvR1rTjKxK6E=
>--github.com/crowdsecurity/crowdsec v1.2.2 h1:wDc0KDpOAqXUClLSxHaXw36R/j7FNv6gmwu/2uL20R0=
>--github.com/crowdsecurity/crowdsec v1.2.2/go.mod h1:Jeqw+HjyujeG0yZT+ytk1F+1Xew7VSHigFvAk86RFcY=
>- github.com/crowdsecurity/crowdsec v1.3.0 h1:jpyc9maPtovQuXwxBYGHYvAjNyxqAXVIDET/yYf4fI4=
>- github.com/crowdsecurity/crowdsec v1.3.0/go.mod h1:IB6xii+loNJ+F/uqurWzgXuiJeDrt8+/OHcojpAWHE4=
>--github.com/crowdsecurity/go-cs-bouncer v0.0.0-20211102133442-6337f533409f h1:eoVKw28rGoTKSPJztwgq6Xd6aSBynP5UyGTFc6Ivufo=
>--github.com/crowdsecurity/go-cs-bouncer v0.0.0-20211102133442-6337f533409f/go.mod h1:YuzzcqxZxnn1KjfHhhz82zGSTAAR5PyOySHtPqcy6XA=
>--github.com/crowdsecurity/go-cs-bouncer v0.0.0-20211102140123-4cf1e1b3f89b h1:87M5TJgIDa+BJrEeT2GeTVFRh9pAO2p34bBZF2vQfy4=
>--github.com/crowdsecurity/go-cs-bouncer v0.0.0-20211102140123-4cf1e1b3f89b/go.mod h1:JtknuLIXb7hwuwqSnLoBSSNMYQ8Y38sqCz1ItVhvsEg=
>- github.com/crowdsecurity/go-cs-bouncer v0.0.0-20220209104231-631313ec9d39 h1:ghgtXAJFlKGHLoRH5CFdHzUPCV0DHmPf+rExm9BfPYU=
>- github.com/crowdsecurity/go-cs-bouncer v0.0.0-20220209104231-631313ec9d39/go.mod h1:cxXIFx2UphkyeZ/fcL/xIbzOM8l7YNLzx5OejiPjiFU=
>--github.com/crowdsecurity/grokky v0.0.0-20210908095311-0b3373925934/go.mod h1:fx5UYUYAFIrOUNAkFCUOM2wJcsp9EWSQE9R0/9kaFJg=
>--github.com/crowdsecurity/grokky v0.0.0-20210908140943-c4460be565eb h1:+V/jiJ9fvj8ZOobAF1z9c5Xu+O/w1mKEsvWbtRio0/Q=
>--github.com/crowdsecurity/grokky v0.0.0-20210908140943-c4460be565eb/go.mod h1:fx5UYUYAFIrOUNAkFCUOM2wJcsp9EWSQE9R0/9kaFJg=
>- github.com/crowdsecurity/grokky v0.0.0-20220120093523-d5b3478363fa h1:pcHZgbBbIkNDO1cAgipEgaGeFJ0se+FOPvq6A4d/g9c=
>- github.com/crowdsecurity/grokky v0.0.0-20220120093523-d5b3478363fa/go.mod h1:fx5UYUYAFIrOUNAkFCUOM2wJcsp9EWSQE9R0/9kaFJg=
>- github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
>-@@ -158,7 +143,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXn
>- github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
>- github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
>- github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
>--github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
>- github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
>- github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
>- github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
>-@@ -166,7 +150,6 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c
>- github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
>- github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
>- github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
>--github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
>- github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
>- github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
>- github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
>-@@ -190,8 +173,6 @@ github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS
>- github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk=
>- github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og=
>- github.com/go-openapi/analysis v0.20.1/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og=
>--github.com/go-openapi/analysis v0.21.1 h1:krcNCEvCttpSUFBPOrfvn7nniejvrOkoNYRlZwQFpEs=
>--github.com/go-openapi/analysis v0.21.1/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
>- github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU=
>- github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
>- github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
>-@@ -202,8 +183,6 @@ github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKU
>- github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>- github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>- github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>--github.com/go-openapi/errors v0.20.0/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>--github.com/go-openapi/errors v0.20.1 h1:j23mMDtRxMwIobkpId7sWh7Ddcx4ivaoqUbfXx5P+a8=
>- github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>- github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8=
>- github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
>-@@ -231,7 +210,6 @@ github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j
>- github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc=
>- github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4=
>- github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o=
>--github.com/go-openapi/loads v0.21.0 h1:jYtUO4wwP7psAweisP/MDoOpdzsYEESdoPcsWjHDR68=
>- github.com/go-openapi/loads v0.21.0/go.mod h1:rHYve9nZrQ4CJhyeIIFJINGCg1tQpx2yJrrNo8sf1ws=
>- github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlDW0=
>- github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
>-@@ -241,9 +219,6 @@ github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bw
>- github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
>- github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98=
>- github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk=
>--github.com/go-openapi/runtime v0.19.28/go.mod h1:BvrQtn6iVb2QmiVXRsFAm6ZCAZBpbVKFfN6QWCp582M=
>--github.com/go-openapi/runtime v0.21.0 h1:giZ8eT26R+/rx6RX2MkYjZPY8vPYVKDhP/mOazrQHzM=
>--github.com/go-openapi/runtime v0.21.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs=
>- github.com/go-openapi/runtime v0.21.1/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs=
>- github.com/go-openapi/runtime v0.23.0 h1:HX6ET2sHCIvaKeDDQoU01CtO1ekg5EkekHSkLTtWXH0=
>- github.com/go-openapi/runtime v0.23.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs=
>-@@ -268,9 +243,7 @@ github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTl
>- github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
>- github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
>- github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
>--github.com/go-openapi/strfmt v0.20.1/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk=
>- github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk=
>--github.com/go-openapi/strfmt v0.21.0 h1:hX2qEZKmYks+t0hKeb4VTJpUm2UYsdL3+DCid5swxIs=
>- github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
>- github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
>- github.com/go-openapi/strfmt v0.21.2 h1:5NDNgadiX1Vhemth/TH4gCGopWSTdDjxl60H3B7f+os=
>-@@ -284,7 +257,6 @@ github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPy
>- github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M=
>- github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
>- github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
>--github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
>- github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
>- github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU=
>- github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
>-@@ -296,7 +268,6 @@ github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou
>- github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI=
>- github.com/go-openapi/validate v0.20.0/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0=
>- github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0=
>--github.com/go-openapi/validate v0.20.2/go.mod h1:e7OJoKNgd0twXZwIn0A43tHbvIcr/rZIVCbJBpTUoY0=
>- github.com/go-openapi/validate v0.20.3 h1:GZPPhhKSZrE8HjB4eEkoYAZmoWA4+tCemSgINH1/vKw=
>- github.com/go-openapi/validate v0.20.3/go.mod h1:goDdqVGiigM3jChcrYJxD2joalke3ZXeftD16byIjA4=
>- github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
>-@@ -304,7 +275,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taP
>- github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
>- github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
>- github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
>--github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
>- github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
>- github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
>- github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
>-@@ -380,7 +350,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kI
>- github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
>- github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
>- github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
>--github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
>- github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
>- github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
>- github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
>-@@ -389,8 +358,6 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4Z
>- github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
>- github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
>- github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
>--github.com/google/nftables v0.0.0-20210916140115-16a134723a96 h1:bCm0Cf+suMHiri9F+ss5n5W0AVas85K5Z0Hekgpe7N0=
>--github.com/google/nftables v0.0.0-20210916140115-16a134723a96/go.mod h1:cfspEyr/Ap+JDIITA+N9a0ernqG0qZ4W1aqMRgDZa1g=
>- github.com/google/nftables v0.0.0-20220206174406-91d3b4571db1 h1:9cPDIMM5vlZPfZgMRwOWE/7eqyKO0F88/IdraPBxww4=
>- github.com/google/nftables v0.0.0-20220206174406-91d3b4571db1/go.mod h1:jQsJtZ/NHsAH3Y56xYIctcqNgAymBIJ59dXX/2RsmF4=
>- github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
>-@@ -433,8 +400,6 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/
>- github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
>- github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
>- github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
>--github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw=
>--github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
>- github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4=
>- github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
>- github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
>-@@ -501,7 +466,6 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkO
>- github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
>- github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
>- github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
>--github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
>- github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
>- github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
>- github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
>-@@ -513,7 +477,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-
>- github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
>- github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
>- github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
>--github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190 h1:iycCSDo8EKVueI9sfVBBJmtNn9DnXV/K1YWwEJO+uOs=
>- github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo=
>- github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs=
>- github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
>-@@ -536,15 +499,13 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7
>- github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
>- github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
>- github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
>--github.com/koneu/natend v0.0.0-20150829182554-ec0926ea948d h1:MFX8DxRnKMY/2M3H61iSsVbo/n3h0MWGmWNN1UViOU0=
>--github.com/koneu/natend v0.0.0-20150829182554-ec0926ea948d/go.mod h1:QHb4k4cr1fQikUahfcRVPcEXiUgFsdIstGqlurL0XL4=
>- github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
>- github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
>- github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
>- github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
>- github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
>--github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
>- github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
>-+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
>- github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
>- github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
>- github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
>-@@ -562,7 +523,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5
>- github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
>- github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
>- github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
>--github.com/logrusorgru/grokky v0.0.0-20180829062225-47edf017d42c/go.mod h1:YnDG6D6tn35XF4NJXUtoqoC84FYlBPao8PZ8QzN4Zxo=
>- github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
>- github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
>- github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
>-@@ -598,13 +558,10 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJm
>- github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
>- github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
>- github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
>--github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
>- github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
>- github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE=
>--github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
>- github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
>- github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
>--github.com/mdlayher/netlink v0.0.0-20191009155606-de872b0d824b/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
>- github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
>- github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
>- github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
>-@@ -613,13 +570,11 @@ github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhq
>- github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
>- github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
>- github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
>--github.com/mdlayher/netlink v1.4.1 h1:I154BCU+mKlIf7BgcAJB2r7QjveNPty6uNY1g9ChVfI=
>- github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q=
>- github.com/mdlayher/netlink v1.4.2/go.mod h1:13VaingaArGUTUxFLf/iEovKxXji32JAtF858jZYEug=
>- github.com/mdlayher/netlink v1.6.0 h1:rOHX5yl7qnlpiVkFWoqccueppMtXzeziFjWAjLg6sz0=
>- github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
>- github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
>--github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267 h1:Sii9ha8FHgdPEO3XW1rQ6SdUs8qNBERc64/v2tUyvis=
>- github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
>- github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
>- github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
>-@@ -641,8 +596,6 @@ github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFU
>- github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
>- github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
>- github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
>--github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
>--github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
>- github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
>- github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
>- github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
>-@@ -664,7 +617,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ
>- github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
>- github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
>- github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
>--github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
>- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
>- github.com/nxadm/tail v1.4.6/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
>- github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
>-@@ -750,6 +702,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDs
>- github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
>- github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
>- github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
>-+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
>- github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
>- github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
>- github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
>-@@ -802,21 +755,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR5
>- github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
>- github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
>- github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
>--github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
>- github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
>- github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
>--github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
>- github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
>--github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
>- github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
>-+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
>- github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
>- github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
>- github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
>- github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
>--github.com/ugorji/go v1.2.3/go.mod h1:5l8GZ8hZvmL4uMdy+mhCO1LjswGRYco9Q3HfuisB21A=
>- github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
>- github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
>--github.com/ugorji/go/codec v1.2.3/go.mod h1:5FxzDJIgeiWJZslYHPj+LS1dq1ZBQVelZFnjsFGI/Uc=
>- github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
>- github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
>- github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
>-@@ -851,8 +800,6 @@ go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/I
>- go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
>- go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
>- go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw=
>--go.mongodb.org/mongo-driver v1.5.3/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw=
>--go.mongodb.org/mongo-driver v1.7.3 h1:G4l/eYY9VrQAK/AUgkV0koQKzQnyddnWxrd/Etf0jIs=
>- go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
>- go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
>- go.mongodb.org/mongo-driver v1.8.2/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
>-@@ -893,7 +840,6 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
>- golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
>- golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
>- golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
>--golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
>- golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
>- golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
>- golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
>-@@ -943,7 +889,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go
>- golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>- golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>- golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>--golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>- golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>- golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
>- golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
>-@@ -963,8 +908,6 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go
>- golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>- golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>- golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>--golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 h1:VrJZAjbekhoRn7n5FBujY31gboH+iB3pdLxn3gE9FjU=
>--golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>- golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>- golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>- golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
>-@@ -1016,7 +959,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go
>- golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>- golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>- golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>--golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>- golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>- golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>- golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
>-@@ -1051,12 +993,9 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go
>- golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>--golang.org/x/sys v0.0.0-20210921065528-437939a70204/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>--golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c h1:QOfDMdrf/UwlVR0UBq2Mpr58UzNtvgJRXA4BgPfFACs=
>--golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>-@@ -1064,6 +1003,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go
>- golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/sys v0.0.0-20220207234003-57398862261d h1:Bm7BNOQt2Qv7ZqysjeLjgCBanX+88Z/OtdvsrEv1Djc=
>- golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>-+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
>-+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
>- golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
>- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
>- golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
>-@@ -1186,8 +1127,8 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mE
>- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
>- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
>- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
>--gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
>- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
>-+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
>- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
>- gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
>- gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
>diff --git a/security/crowdsec-firewall-bouncer/files/patch-vendor_modules.txt b/security/crowdsec-firewall-bouncer/files/patch-vendor_modules.txt
>deleted file mode 100644
>index f0cacfcecf3e..000000000000
>--- a/security/crowdsec-firewall-bouncer/files/patch-vendor_modules.txt
>+++ /dev/null
>@@ -1,187 +0,0 @@
>---- vendor/modules.txt.orig	2023-03-27 14:54:34 UTC
>-+++ vendor/modules.txt
>-@@ -1,11 +1,11 @@
>- # github.com/PuerkitoBio/purell v1.1.1
>-+## explicit
>- github.com/PuerkitoBio/purell
>- # github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
>--github.com/PuerkitoBio/urlesc
>--# github.com/ahmetb/dlog v0.0.0-20170105205344-4fb5f8204f26
>- ## explicit
>-+github.com/PuerkitoBio/urlesc
>- # github.com/antonmedv/expr v1.9.0
>--## explicit
>-+## explicit; go 1.13
>- github.com/antonmedv/expr
>- github.com/antonmedv/expr/ast
>- github.com/antonmedv/expr/checker
>-@@ -17,27 +17,32 @@ github.com/antonmedv/expr/parser
>- github.com/antonmedv/expr/parser/lexer
>- github.com/antonmedv/expr/vm
>- # github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
>-+## explicit; go 1.13
>- github.com/asaskevich/govalidator
>- # github.com/buger/jsonparser v1.1.1
>-+## explicit; go 1.13
>- github.com/buger/jsonparser
>- # github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
>- ## explicit
>- github.com/coreos/go-systemd/daemon
>- # github.com/crowdsecurity/crowdsec v1.3.0
>--## explicit
>-+## explicit; go 1.17
>- github.com/crowdsecurity/crowdsec/pkg/apiclient
>- github.com/crowdsecurity/crowdsec/pkg/cwversion
>- github.com/crowdsecurity/crowdsec/pkg/exprhelpers
>- github.com/crowdsecurity/crowdsec/pkg/models
>- github.com/crowdsecurity/crowdsec/pkg/types
>- # github.com/crowdsecurity/go-cs-bouncer v0.0.0-20220209104231-631313ec9d39
>--## explicit
>-+## explicit; go 1.15
>- github.com/crowdsecurity/go-cs-bouncer
>- # github.com/crowdsecurity/grokky v0.0.0-20220120093523-d5b3478363fa
>-+## explicit
>- github.com/crowdsecurity/grokky
>- # github.com/davecgh/go-spew v1.1.1
>-+## explicit
>- github.com/davecgh/go-spew/spew
>- # github.com/go-openapi/analysis v0.21.2
>-+## explicit; go 1.13
>- github.com/go-openapi/analysis
>- github.com/go-openapi/analysis/internal/debug
>- github.com/go-openapi/analysis/internal/flatten/normalize
>-@@ -46,40 +51,47 @@ github.com/go-openapi/analysis/internal/flatten/replac
>- github.com/go-openapi/analysis/internal/flatten/schutils
>- github.com/go-openapi/analysis/internal/flatten/sortref
>- # github.com/go-openapi/errors v0.20.2
>-+## explicit; go 1.14
>- github.com/go-openapi/errors
>- # github.com/go-openapi/jsonpointer v0.19.5
>-+## explicit; go 1.13
>- github.com/go-openapi/jsonpointer
>- # github.com/go-openapi/jsonreference v0.19.6
>-+## explicit; go 1.13
>- github.com/go-openapi/jsonreference
>- # github.com/go-openapi/loads v0.21.1
>--## explicit
>-+## explicit; go 1.13
>- github.com/go-openapi/loads
>- # github.com/go-openapi/runtime v0.23.0
>--## explicit
>-+## explicit; go 1.15
>- github.com/go-openapi/runtime
>- # github.com/go-openapi/spec v0.20.4
>-+## explicit; go 1.13
>- github.com/go-openapi/spec
>- # github.com/go-openapi/strfmt v0.21.2
>--## explicit
>-+## explicit; go 1.13
>- github.com/go-openapi/strfmt
>- # github.com/go-openapi/swag v0.21.1
>--## explicit
>-+## explicit; go 1.11
>- github.com/go-openapi/swag
>- # github.com/go-openapi/validate v0.20.3
>-+## explicit; go 1.14
>- github.com/go-openapi/validate
>- # github.com/go-stack/stack v1.8.1
>--## explicit
>-+## explicit; go 1.17
>- github.com/go-stack/stack
>- # github.com/google/go-cmp v0.5.7
>-+## explicit; go 1.11
>- github.com/google/go-cmp/cmp
>- github.com/google/go-cmp/cmp/internal/diff
>- github.com/google/go-cmp/cmp/internal/flags
>- github.com/google/go-cmp/cmp/internal/function
>- github.com/google/go-cmp/cmp/internal/value
>- # github.com/google/go-querystring v1.1.0
>-+## explicit; go 1.10
>- github.com/google/go-querystring/query
>- # github.com/google/nftables v0.0.0-20220206174406-91d3b4571db1
>--## explicit
>-+## explicit; go 1.12
>- github.com/google/nftables
>- github.com/google/nftables/binaryutil
>- github.com/google/nftables/expr
>-@@ -87,39 +99,44 @@ github.com/google/nftables/expr
>- ## explicit
>- github.com/hashicorp/go-version
>- # github.com/josharian/intern v1.0.0
>-+## explicit; go 1.5
>- github.com/josharian/intern
>- # github.com/josharian/native v1.0.0
>-+## explicit; go 1.13
>- github.com/josharian/native
>- # github.com/koneu/natend v0.0.0-20150829182554-ec0926ea948d => ./koneu/natend
>-+## explicit; go 1.17
>- github.com/koneu/natend
>--# github.com/logrusorgru/grokky v0.0.0-20180829062225-47edf017d42c
>--## explicit
>- # github.com/mailru/easyjson v0.7.7
>-+## explicit; go 1.12
>- github.com/mailru/easyjson/buffer
>- github.com/mailru/easyjson/jlexer
>- github.com/mailru/easyjson/jwriter
>- # github.com/mdlayher/netlink v1.6.0
>--## explicit
>-+## explicit; go 1.13
>- github.com/mdlayher/netlink
>- github.com/mdlayher/netlink/nlenc
>- github.com/mdlayher/netlink/nltest
>- # github.com/mdlayher/socket v0.1.1
>-+## explicit; go 1.17
>- github.com/mdlayher/socket
>- # github.com/mitchellh/mapstructure v1.4.3
>-+## explicit; go 1.14
>- github.com/mitchellh/mapstructure
>- # github.com/oklog/ulid v1.3.1
>-+## explicit
>- github.com/oklog/ulid
>- # github.com/pkg/errors v0.9.1
>- ## explicit
>- github.com/pkg/errors
>- # github.com/sirupsen/logrus v1.8.1
>--## explicit
>-+## explicit; go 1.13
>- github.com/sirupsen/logrus
>- github.com/sirupsen/logrus/hooks/writer
>- # github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f
>- ## explicit
>- # go.mongodb.org/mongo-driver v1.8.3
>--## explicit
>-+## explicit; go 1.10
>- go.mongodb.org/mongo-driver/bson
>- go.mongodb.org/mongo-driver/bson/bsoncodec
>- go.mongodb.org/mongo-driver/bson/bsonoptions
>-@@ -128,17 +145,20 @@ go.mongodb.org/mongo-driver/bson/bsontype
>- go.mongodb.org/mongo-driver/bson/primitive
>- go.mongodb.org/mongo-driver/x/bsonx/bsoncore
>- # golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
>-+## explicit; go 1.17
>- golang.org/x/net/bpf
>- golang.org/x/net/context
>- golang.org/x/net/idna
>- # golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
>--golang.org/x/sync/errgroup
>--# golang.org/x/sys v0.0.0-20220207234003-57398862261d
>- ## explicit
>-+golang.org/x/sync/errgroup
>-+# golang.org/x/sys v0.6.0
>-+## explicit; go 1.17
>- golang.org/x/sys/internal/unsafeheader
>- golang.org/x/sys/unix
>- golang.org/x/sys/windows
>- # golang.org/x/text v0.3.7
>-+## explicit; go 1.17
>- golang.org/x/text/secure/bidirule
>- golang.org/x/text/transform
>- golang.org/x/text/unicode/bidi
>-@@ -151,6 +171,6 @@ gopkg.in/natefinch/lumberjack.v2
>- ## explicit
>- gopkg.in/tomb.v2
>- # gopkg.in/yaml.v2 v2.4.0
>--## explicit
>-+## explicit; go 1.15
>- gopkg.in/yaml.v2
>- # github.com/koneu/natend => ./koneu/natend
>diff --git a/security/crowdsec-firewall-bouncer/files/pkg-deinstall.in b/security/crowdsec-firewall-bouncer/files/pkg-deinstall.in
>index 8167b3f0167f..21e946d75a27 100755
>--- a/security/crowdsec-firewall-bouncer/files/pkg-deinstall.in
>+++ b/security/crowdsec-firewall-bouncer/files/pkg-deinstall.in
>@@ -2,8 +2,8 @@
> 
> case $2 in
>        "DEINSTALL")
>-               service crowdsec_firewall status && touch /var/run/crowdsec_firewall.running
>-               service crowdsec_firewall stop || :
>+               service crowdsec_firewall status 2>/dev/null && touch /var/run/crowdsec_firewall.running
>+               service crowdsec_firewall stop 2>/dev/null || :
>                ;;
> esac
> 
>diff --git a/security/crowdsec-firewall-bouncer/files/pkg-message.in b/security/crowdsec-firewall-bouncer/files/pkg-message.in
>index 489267594020..85b8a16382d5 100644
>--- a/security/crowdsec-firewall-bouncer/files/pkg-message.in
>+++ b/security/crowdsec-firewall-bouncer/files/pkg-message.in
>@@ -4,12 +4,12 @@
> 
> crowdsec-firewall-bouncer is installed.
> 
>-The bouncer should register itself with the Local API but you may want to check the
>-configuration file, which has been moved to %%ETCDIR%%/crowdsec-firewall-bouncer.yaml
>-(for consistency with the other platforms).
>+If you are running crowdsec on this machine, the bouncer will register itself with
>+the Local API when it's started the first time.
> 
>-In previous versions, the configuration was in /usr/local/etc/crowdsec-firewall-bouncer, you may need
>-to check if you made any changes there.
>+If the LAPI is on another machine, you need to manually register the bouncer
>+and fill api_key and api_url in %%ETCDIR%%/crowdsec-firewall-bouncer.yaml before
>+starting the service.
> 
> This package depends on the Packet Filter service.
> To make sure it's active:
>-- 
>2.39.2
>

Flags:

marco: maintainer-approval+

Actions: View | Diff

Attachments on bug 271452: 242213