git: c5d9f52a0525 - main - security/nebula: Update to 1.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Sat, 02 Jul 2022 12:40:14 UTC
The branch main has been updated by ashish:

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

commit c5d9f52a0525cc259219ce74368143b812dd9cd6
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2022-07-02 12:22:47 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2022-07-02 12:39:04 +0000

    security/nebula: Update to 1.6.0
    
    - Switch to GO_MODULE
    
    Reported by:    portscout
---
 security/nebula/Makefile | 50 ++----------------------------
 security/nebula/distinfo | 80 +++---------------------------------------------
 2 files changed, 7 insertions(+), 123 deletions(-)

diff --git a/security/nebula/Makefile b/security/nebula/Makefile
index 6c694cf2e81d..62242fd85b06 100644
--- a/security/nebula/Makefile
+++ b/security/nebula/Makefile
@@ -1,10 +1,7 @@
 PORTNAME=	nebula
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
-PORTREVISION=	2
+DISTVERSION=	1.6.0
 CATEGORIES=	security
-MASTER_SITES=	https://git.zx2c4.com/wintun-go/snapshot/:wintungo
-DISTFILES=	wintun-go-${GO_WINTUN_REV}.tar.xz:wintungo
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Scalable overlay networking tool
@@ -14,46 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 CPE_VENDOR=	slack
-USE_GITHUB=	yes
-GH_ACCOUNT=	slackhq
-GH_TUPLE=	\
-		anmitsu:go-shlex:38f4b401e2be:anmitsu_go_shlex/vendor/github.com/anmitsu/go-shlex \
-		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.2:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		cyberdelia:go-metrics-graphite:39f87cc3b432:cyberdelia_go_metrics_graphite/vendor/github.com/cyberdelia/go-metrics-graphite \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		flynn:noise:v1.0.0:flynn_noise/vendor/github.com/flynn/noise \
-		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:crypto:5770296d904e:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:69e39bad7dc2:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:7861aae1554b:golang_sys/vendor/golang.org/x/sys \
-		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
-		google:gopacket:v1.1.19:google_gopacket/vendor/github.com/google/gopacket \
-		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
-		kardianos:service:v1.2.0:kardianos_service/vendor/github.com/kardianos/service \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:v1.1.43:miekg_dns/vendor/github.com/miekg/dns \
-		nbrownus:go-metrics-prometheus:974a6260965f:nbrownus_go_metrics_prometheus/vendor/github.com/nbrownus/go-metrics-prometheus \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		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.32.1:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		rcrowley:go-metrics:cf1acfcdf475:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
-		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		skip2:go-qrcode:da1b6568686e:skip2_go_qrcode/vendor/github.com/skip2/go-qrcode \
-		songgao:water:2b4b6d7c09d8:songgao_water/vendor/github.com/songgao/water \
-		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		vishvananda:netlink:v1.1.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
-		vishvananda:netns:50045581ed74:vishvananda_netns/vendor/github.com/vishvananda/netns \
-		wireguard:wireguard-windows:v0.5.1:wireguard_wireguard_windows/vendor/golang.zx2c4.com/wireguard/windows
-
-GO_WINTUN_REV=	415007cec224
+GO_MODULE=	github.com/slackhq/nebula
 GO_TARGET=	./cmd/nebula ./cmd/nebula-cert
 GO_BUILDFLAGS=	-ldflags "-X main.Build=${PORTVERSION}"
 USE_RC_SUBR=	${PORTNAME}
@@ -61,10 +19,6 @@ PLIST_FILES=	bin/nebula \
 		bin/nebula-cert \
 		etc/${PORTNAME}/config.yml.example
 
-post-extract:
-	${MKDIR} ${WRKSRC}/vendor/golang.zx2c4.com
-	${MV} ${WRKDIR}/wintun-go-${GO_WINTUN_REV} ${WRKSRC}/vendor/golang.zx2c4.com/wintun
-
 post-patch:
 	${REINPLACE_CMD} -e s,/etc/nebula,${PREFIX}/etc/${PORTNAME}, \
 		-e /dev:/s/nebula1/tun1/ \
diff --git a/security/nebula/distinfo b/security/nebula/distinfo
index 9a7ad6bd8337..c9e5773f1c08 100644
--- a/security/nebula/distinfo
+++ b/security/nebula/distinfo
@@ -1,75 +1,5 @@
-TIMESTAMP = 1639808565
-SHA256 (wintun-go-415007cec224.tar.xz) = cf6a1cd5cbc3634ad722e488f78fd49a2ad60047632f5219b13dadfd568784b9
-SIZE (wintun-go-415007cec224.tar.xz) = 3940
-SHA256 (slackhq-nebula-v1.5.2_GH0.tar.gz) = 391ac38161561690a65c0fa5ad65a2efb2d187323cc8ee84caa95fa24cb6c36a
-SIZE (slackhq-nebula-v1.5.2_GH0.tar.gz) = 945337
-SHA256 (anmitsu-go-shlex-38f4b401e2be_GH0.tar.gz) = 128b9243a8ba47fb94cb6301546e665c9158a9b7e13432b53cd424cd4e94b66b
-SIZE (anmitsu-go-shlex-38f4b401e2be_GH0.tar.gz) = 3716
-SHA256 (armon-go-radix-v1.0.0_GH0.tar.gz) = 9e5238a553708bccf930d1f9d0ce62ce30d92602b64ea248585ce06ec7bfee17
-SIZE (armon-go-radix-v1.0.0_GH0.tar.gz) = 5975
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352
-SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244
-SHA256 (cyberdelia-go-metrics-graphite-39f87cc3b432_GH0.tar.gz) = 702a9c872e66b4797c682cc7d455c2bde25ee8032ee9f68afb88a36d8901e2e0
-SIZE (cyberdelia-go-metrics-graphite-39f87cc3b432_GH0.tar.gz) = 3915
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (flynn-noise-v1.0.0_GH0.tar.gz) = 64dbc5664f88bbd352de33109fa0f661c526b17f0c4a0bac3ef2a17e4fa7f2dd
-SIZE (flynn-noise-v1.0.0_GH0.tar.gz) = 210067
-SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
-SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
-SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
-SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
-SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
-SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
-SHA256 (golang-crypto-5770296d904e_GH0.tar.gz) = 3235b8f448994b031908cc54b63ca14b19b3a273bd1969898d5e240226aedc49
-SIZE (golang-crypto-5770296d904e_GH0.tar.gz) = 1734495
-SHA256 (golang-net-69e39bad7dc2_GH0.tar.gz) = 859028b1f77d72031aaeb022812f4040aeee1a64956d4751c35b8b40dea11d70
-SIZE (golang-net-69e39bad7dc2_GH0.tar.gz) = 1263995
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-7861aae1554b_GH0.tar.gz) = 4adbb37f5a96afb78bb90fb0e0b2f9b0dbe0eb1e3e15633c6711a3b0ed23dd6f
-SIZE (golang-sys-7861aae1554b_GH0.tar.gz) = 1222140
-SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
-SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
-SHA256 (google-gopacket-v1.1.19_GH0.tar.gz) = 31efa87cc9d2b41e5e66c7daa8839d841d2a43cc477bf595c9e8c24ef6903830
-SIZE (google-gopacket-v1.1.19_GH0.tar.gz) = 950745
-SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
-SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
-SHA256 (kardianos-service-v1.2.0_GH0.tar.gz) = 5fd81c968382a0e77fca970d14308e6d3d3f5adc9feb48af85ee02253f5afde1
-SIZE (kardianos-service-v1.2.0_GH0.tar.gz) = 24943
-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 (miekg-dns-v1.1.43_GH0.tar.gz) = 889d61c9ce9594ef0fa4b8b601fcf094082b8c12f5638063652d8dee7ee5339a
-SIZE (miekg-dns-v1.1.43_GH0.tar.gz) = 200617
-SHA256 (nbrownus-go-metrics-prometheus-974a6260965f_GH0.tar.gz) = 5d2703c0c0466bad506f08596698e9d4c00c9ab276d07053c12a882b957e596a
-SIZE (nbrownus-go-metrics-prometheus-974a6260965f_GH0.tar.gz) = 13776
-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.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.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6
-SIZE (prometheus-common-v0.32.1_GH0.tar.gz) = 146585
-SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b
-SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957
-SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
-SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
-SHA256 (rcrowley-go-metrics-cf1acfcdf475_GH0.tar.gz) = e15251850bd93b7e01a191d165a06027f7d8e9022e163c1b3a7cb58794de5d0c
-SIZE (rcrowley-go-metrics-cf1acfcdf475_GH0.tar.gz) = 37581
-SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74
-SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
-SHA256 (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = af179c37da861a43242fb4383186724b34866d7b5bd3e54ca44031a2b9f92046
-SIZE (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = 36693
-SHA256 (songgao-water-2b4b6d7c09d8_GH0.tar.gz) = f86ac1799a18ce44e3528af120f23ee5ba8a00615c5fc5464d180f60034bc334
-SIZE (songgao-water-2b4b6d7c09d8_GH0.tar.gz) = 17242
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
-SHA256 (vishvananda-netlink-v1.1.0_GH0.tar.gz) = c72754916ac1551cea4e1f801d5b2c26c1476f11bd3130382a4a890822eb5929
-SIZE (vishvananda-netlink-v1.1.0_GH0.tar.gz) = 147026
-SHA256 (vishvananda-netns-50045581ed74_GH0.tar.gz) = 491c3a54b0a5ca3b0f4efe3a770163fbc9fdd30bbab9a19de9ed110e77037a73
-SIZE (vishvananda-netns-50045581ed74_GH0.tar.gz) = 8711
-SHA256 (wireguard-wireguard-windows-v0.5.1_GH0.tar.gz) = c6b6c6657f8a34bb3202d2d253c0e52a53ca926c8c125c4f8552f90ef2643c9b
-SIZE (wireguard-wireguard-windows-v0.5.1_GH0.tar.gz) = 2446145
+TIMESTAMP = 1656763727
+SHA256 (go/security_nebula/nebula-v1.6.0/v1.6.0.mod) = b555f4be50246ff2d5373474de23bffccbea76514879dc2400fc5031cde73c3c
+SIZE (go/security_nebula/nebula-v1.6.0/v1.6.0.mod) = 2042
+SHA256 (go/security_nebula/nebula-v1.6.0/v1.6.0.zip) = afb52280dad6fe143d0b3b8dd21ab95cc9e9d8a7f4df2a66e72e1fbcfcbf06ec
+SIZE (go/security_nebula/nebula-v1.6.0/v1.6.0.zip) = 1057825