Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Nov 2019 13:12:12 +0000 (UTC)
From:      Dmitri Goutnik <dmgk@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516640 - head/net/yggdrasil
Message-ID:  <201911041312.xA4DCCqQ052626@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dmgk
Date: Mon Nov  4 13:12:12 2019
New Revision: 516640
URL: https://svnweb.freebsd.org/changeset/ports/516640

Log:
  net/yggdrasil: Update to 0.3.11
  
  - Remove custom build targets while here
  
  Changes:	https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.3.11
  
  PR:		241695
  Submitted by:	Neil Alexander <freebsd@neilalexander.dev> (maintainer)
  Approved by:	tz (mentor, implicit)

Modified:
  head/net/yggdrasil/Makefile
  head/net/yggdrasil/distinfo

Modified: head/net/yggdrasil/Makefile
==============================================================================
--- head/net/yggdrasil/Makefile	Mon Nov  4 12:55:22 2019	(r516639)
+++ head/net/yggdrasil/Makefile	Mon Nov  4 13:12:12 2019	(r516640)
@@ -2,7 +2,7 @@
 
 PORTNAME=	yggdrasil
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.6
+DISTVERSION=	0.3.11
 CATEGORIES=	net
 
 MAINTAINER=	freebsd@neilalexander.dev
@@ -11,40 +11,37 @@ COMMENT=	Experimental end-to-end encrypted self-arrang
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	yggdrasil-network
 GH_PROJECT=	yggdrasil-go
 GH_TUPLE=	\
-		docker:libcontainer:v2.2.1:docker_libcontainer/vendor/github.com/docker/libcontainer \
-		golang:crypto:4def268fd1a4:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:ca1201d0de80:golang_net/vendor/golang.org/x/net \
-		golang:sys:cbf593c0f2f3:golang_sys/vendor/golang.org/x/sys \
+		Arceliar:phony:d0c68492aca0:arceliar_phony/vendor/github.com/Arceliar/phony \
+		golang:crypto:87dc89f01550:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:ec77196f6094:golang_net/vendor/golang.org/x/net \
+		golang:sys:b4ff53e7a1cb:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		gologme:log:4e5d8ccb38e8:gologme_log/vendor/github.com/gologme/log \
 		hashicorp:go-syslog:v1.0.0:hashicorp_go_syslog/vendor/github.com/hashicorp/go-syslog \
-		hjson:hjson-go:a25ecf6bd222:hjson_hjson_go/vendor/github.com/hjson/hjson-go \
+		hjson:hjson-go:v3.0.0:hjson_hjson_go/vendor/github.com/hjson/hjson-go \
 		kardianos:minwinsvc:cad6b2b879b0:kardianos_minwinsvc/vendor/github.com/kardianos/minwinsvc \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		songgao:packets:549a10cd4091:songgao_packets/vendor/github.com/songgao/packets \
-		yggdrasil-network:water:a16161896c34:yggdrasil_network_water/vendor/github.com/yggdrasil-network/water
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
+		vishvananda:netlink:v1.0.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
+		vishvananda:netns:7109fa855b0f:vishvananda_netns/vendor/github.com/vishvananda/netns \
+		yggdrasil-network:water:c83fe40250f8:yggdrasil_network_water/vendor/github.com/yggdrasil-network/water
 
-MAKE_ENV+=	GOFLAGS=-mod=vendor
+GO_TARGET=	./cmd/yggdrasil \
+		./cmd/yggdrasilctl
 
+GO_BUILDFLAGS=	-ldflags="-s -w \
+		-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${PORTNAME} \
+		-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${PORTVERSION} \
+		"
+
 PLIST_FILES=	bin/yggdrasil \
 		bin/yggdrasilctl
 
 USE_RC_SUBR=	yggdrasil
-
-pre-build:
-	@${REINPLACE_CMD} -e 's/set -ef/set -f/' ${WRKSRC}/build
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} PKGNAME=${PORTNAME} PKGVER=${PORTVERSION} ./build
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/yggdrasil ${STAGEDIR}${PREFIX}/bin/yggdrasil
-	${INSTALL_PROGRAM} ${WRKSRC}/yggdrasilctl ${STAGEDIR}${PREFIX}/bin/yggdrasilctl
 
 .include <bsd.port.mk>

Modified: head/net/yggdrasil/distinfo
==============================================================================
--- head/net/yggdrasil/distinfo	Mon Nov  4 12:55:22 2019	(r516639)
+++ head/net/yggdrasil/distinfo	Mon Nov  4 13:12:12 2019	(r516640)
@@ -1,27 +1,31 @@
-TIMESTAMP = 1564875025
-SHA256 (yggdrasil-network-yggdrasil-go-v0.3.6_GH0.tar.gz) = dc1699064319f19a64ac57bac366a15d718008fdb75ef03bf4252d3552dff4eb
-SIZE (yggdrasil-network-yggdrasil-go-v0.3.6_GH0.tar.gz) = 152007
-SHA256 (docker-libcontainer-v2.2.1_GH0.tar.gz) = 3dc621731db53591d643611e2d7bb2efc942a6208e5178c335caecf9dc5f8826
-SIZE (docker-libcontainer-v2.2.1_GH0.tar.gz) = 348704
-SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
-SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
-SHA256 (golang-net-ca1201d0de80_GH0.tar.gz) = 1d0b1f44b64c6248ce65f4d78add4228f15ffbdbe4a559a6d1effa410ce01071
-SIZE (golang-net-ca1201d0de80_GH0.tar.gz) = 1099216
-SHA256 (golang-sys-cbf593c0f2f3_GH0.tar.gz) = 3590c55ef807ee27909fecdd771996ab55ad5306f5174b877810a9a9915f0a18
-SIZE (golang-sys-cbf593c0f2f3_GH0.tar.gz) = 1454976
+TIMESTAMP = 1572871856
+SHA256 (yggdrasil-network-yggdrasil-go-v0.3.11_GH0.tar.gz) = a831ee7ae5b7cf58950eac5f9cfab24688990db8d91b250624d9bae58da3cfb9
+SIZE (yggdrasil-network-yggdrasil-go-v0.3.11_GH0.tar.gz) = 161616
+SHA256 (Arceliar-phony-d0c68492aca0_GH0.tar.gz) = 10a586be941ff65576fd97548cdea7087a5d6d85c99c1b69bc77301d41179e67
+SIZE (Arceliar-phony-d0c68492aca0_GH0.tar.gz) = 6835
+SHA256 (golang-crypto-87dc89f01550_GH0.tar.gz) = d81e26d345c6cd9f132fd69547b14200603d6f3b50622ebceace32dfe456339b
+SIZE (golang-crypto-87dc89f01550_GH0.tar.gz) = 1709204
+SHA256 (golang-net-ec77196f6094_GH0.tar.gz) = e42b8c878a03f6133c30cf4f48c7c8ed81525416ff6d9c1b168878a09cc13bff
+SIZE (golang-net-ec77196f6094_GH0.tar.gz) = 1103189
+SHA256 (golang-sys-b4ff53e7a1cb_GH0.tar.gz) = 3dd92324dc23f577ad0e0d71c3a3f2458af119a22413ee73910a43611172dddd
+SIZE (golang-sys-b4ff53e7a1cb_GH0.tar.gz) = 1497476
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
 SHA256 (gologme-log-4e5d8ccb38e8_GH0.tar.gz) = d5873e95bd5459d9a4813e7020236f15db01277ffba0abfc9f80c5bac7477157
 SIZE (gologme-log-4e5d8ccb38e8_GH0.tar.gz) = 5613
 SHA256 (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = be4bda814c068311ea8e185e2d108077f167897cfa868ada7f56d97a10f3d602
 SIZE (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = 4517
-SHA256 (hjson-hjson-go-a25ecf6bd222_GH0.tar.gz) = b41a4011abae684a1a1d3f8650a7db4948cc55373145b62845c7957add9c483f
-SIZE (hjson-hjson-go-a25ecf6bd222_GH0.tar.gz) = 25569
+SHA256 (hjson-hjson-go-v3.0.0_GH0.tar.gz) = e3f64c3cdf711cc9f4a301bfff04080d1ced12b65e6cd5c287d99e1009cddd1b
+SIZE (hjson-hjson-go-v3.0.0_GH0.tar.gz) = 23576
 SHA256 (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) = 820c068dfee3306853cb6cc63becb96b9f972a14a97ad71df3332f98bc4866cb
 SIZE (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) = 1804
 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
 SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
 SHA256 (songgao-packets-549a10cd4091_GH0.tar.gz) = 15993683d3ab9d61baf14efe270c0ba06fe62a0b48621420e1d1da6bb24c85ac
 SIZE (songgao-packets-549a10cd4091_GH0.tar.gz) = 3517
-SHA256 (yggdrasil-network-water-a16161896c34_GH0.tar.gz) = dd00d472628013d35d9997e6bf9ea63ef9e6bd2e5dd2313404dee0c27f66edf7
-SIZE (yggdrasil-network-water-a16161896c34_GH0.tar.gz) = 17475
+SHA256 (vishvananda-netlink-v1.0.0_GH0.tar.gz) = a621be56e9a161eae72bc9f14849fef9a23076af87e6c0997d1cdf4208530a2a
+SIZE (vishvananda-netlink-v1.0.0_GH0.tar.gz) = 119941
+SHA256 (vishvananda-netns-7109fa855b0f_GH0.tar.gz) = c7b2eb08c983dfc2c2deeaec182e1cfd24fb5ff22f7448fc30f6a9480bbb9b3f
+SIZE (vishvananda-netns-7109fa855b0f_GH0.tar.gz) = 7868
+SHA256 (yggdrasil-network-water-c83fe40250f8_GH0.tar.gz) = ab6234f253a814f90e31ca625454a8c518e4420596eec1a13a36e36f0f4c9def
+SIZE (yggdrasil-network-water-c83fe40250f8_GH0.tar.gz) = 17318



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911041312.xA4DCCqQ052626>