svn commit: r425642 - in head/security/vault: . files

[Steve Wills]

Author: swills
Date: Mon Nov  7 19:42:00 2016
New Revision: 425642
URL: https://svnweb.freebsd.org/changeset/ports/425642

Log:
  security/vault: update to 6.2
  
  PR:		212863
  Submitted by:	Dave Cottlehuber <dch at skunkwerks.at> (with modifications)

Added:
  head/security/vault/files/patch-version_version.go   (contents, props changed)
Deleted:
  head/security/vault/files/patch-helper_mlock_mlock__linux.go
  head/security/vault/files/patch-helper_mlock_mlock__solaris.go
  head/security/vault/files/patch-helper_mlock_mlock__unavail.go
  head/security/vault/files/patch-helper_mlock_mlock__unix.go
Modified:
  head/security/vault/Makefile
  head/security/vault/distinfo
  head/security/vault/files/vault.in

Modified: head/security/vault/Makefile
==============================================================================
--- head/security/vault/Makefile	Mon Nov  7 18:07:51 2016	(r425641)
+++ head/security/vault/Makefile	Mon Nov  7 19:42:00 2016	(r425642)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	vault
-PORTVERSION=	0.5.3
+PORTVERSION=	0.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -10,10 +10,11 @@ COMMENT=	Tool for securely accessing sec
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+BUILD_DEPENDS=	go>=1.7.1:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 STRIP=		# stripping can break go binaries
 
@@ -25,20 +26,13 @@ GROUPS=		vault
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
-	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-	@cd ${WRKSRC} ; \
-	${MV} .gitignore .travis.yml CHANGELOG.md CONTRIBUTING.md Godeps \
-	LICENSE Makefile README.md api audit builtin cli command helper http \
-	logical main.go main_test.go make.bat physical scripts shamir terraform \
-	vault version website \
-	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/version/version.go
 
 do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
+	@cd ${WRKSRC}; \
 		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/security/vault/distinfo
==============================================================================
--- head/security/vault/distinfo	Mon Nov  7 18:07:51 2016	(r425641)
+++ head/security/vault/distinfo	Mon Nov  7 19:42:00 2016	(r425642)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464440436
-SHA256 (hashicorp-vault-v0.5.3_GH0.tar.gz) = b312f3d098ebabd4ed7647cf54bc219a0d2afeba49ee8b614a38e455900b2dae
-SIZE (hashicorp-vault-v0.5.3_GH0.tar.gz) = 3591764
+TIMESTAMP = 1478431676
+SHA256 (hashicorp-vault-v0.6.2_GH0.tar.gz) = 295197e8ec7d03d4e141733579250ed653b13862a2d83dfd0d11a6e82f28b436
+SIZE (hashicorp-vault-v0.6.2_GH0.tar.gz) = 4862801

Added: head/security/vault/files/patch-version_version.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/vault/files/patch-version_version.go	Mon Nov  7 19:42:00 2016	(r425642)
@@ -0,0 +1,13 @@
+--- version/version.go.orig	2016-09-20 13:24:40 UTC
++++ version/version.go
+@@ -10,8 +10,8 @@ var (
+ 	GitCommit   string
+ 	GitDescribe string
+ 
+-	Version           = "unknown"
+-	VersionPrerelease = "unknown"
++	Version           = "%%PORTVERSION%%"
++	VersionPrerelease = ""
+ )
+ 
+ // VersionInfo

Modified: head/security/vault/files/vault.in
==============================================================================
--- head/security/vault/files/vault.in	Mon Nov  7 18:07:51 2016	(r425641)
+++ head/security/vault/files/vault.in	Mon Nov  7 19:42:00 2016	(r425642)
@@ -36,7 +36,7 @@ load_rc_config $name
 pidfile=/var/run/vault.pid
 procname="%%PREFIX%%/bin/vault"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}"
+command_args="-f -t ${name} -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}"
 
 start_precmd=vault_startprecmd