security/vault: update to 0.5.2

6 files changed, 76 insertions, 8 deletions

diff --git a/security/vault/Makefile b/security/vault/Makefile
index 736970245b01..358803b7659e 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	vault
-PORTVERSION=	0.3.0
+PORTVERSION=	0.5.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -24,13 +24,14 @@ GROUPS=		vault
 
 PLIST_FILES=	bin/${PORTNAME}
 
-post-extract:
-	@${MV} ${WRKSRC}/Godeps/_workspace/src ${WRKSRC}
+post-patch:
+	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 	@cd ${WRKSRC} ; \
-	${MV} .gitignore .travis.yml CHANGELOG.md LICENSE Makefile README.md \
-	api audit builtin cli command helper http logical main.go main_test.go \
-	make.bat physical scripts shamir terraform test vault website \
+	${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}
 
 do-build:
diff --git a/security/vault/distinfo b/security/vault/distinfo
index 517e112752e1..b381eb20548a 100644
--- a/security/vault/distinfo
+++ b/security/vault/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hashicorp-vault-v0.3.0_GH0.tar.gz) = 9c7d4016d4f6949265072efad41ba24ed7d1029a19bc57ee05b7bcb2a79e227b
-SIZE (hashicorp-vault-v0.3.0_GH0.tar.gz) = 1922377
+TIMESTAMP = 1463719469
+SHA256 (hashicorp-vault-v0.5.2_GH0.tar.gz) = f68382963a339d8e078d2b5dae55f4ce45f5637903646d842e1c99dff0108c96
+SIZE (hashicorp-vault-v0.5.2_GH0.tar.gz) = 3590947
diff --git a/security/vault/files/patch-helper_mlock_mlock__linux.go b/security/vault/files/patch-helper_mlock_mlock__linux.go
new file mode 100644
index 000000000000..a87a133fe02d
--- /dev/null
+++ b/security/vault/files/patch-helper_mlock_mlock__linux.go
@@ -0,0 +1,17 @@
+--- helper/mlock/mlock_linux.go.orig	2016-03-16 19:48:36 UTC
++++ helper/mlock/mlock_linux.go
+@@ -1,14 +0,0 @@
+-// +build linux
+-
+-package mlock
+-
+-import "syscall"
+-
+-func init() {
+-	supported = true
+-}
+-
+-func lockMemory() error {
+-	// Mlockall prevents all current and future pages from being swapped out.
+-	return syscall.Mlockall(syscall.MCL_CURRENT | syscall.MCL_FUTURE)
+-}
diff --git a/security/vault/files/patch-helper_mlock_mlock__solaris.go b/security/vault/files/patch-helper_mlock_mlock__solaris.go
new file mode 100644
index 000000000000..28182a7fad60
--- /dev/null
+++ b/security/vault/files/patch-helper_mlock_mlock__solaris.go
@@ -0,0 +1,20 @@
+--- helper/mlock/mlock_solaris.go.orig	2016-03-16 19:48:36 UTC
++++ helper/mlock/mlock_solaris.go
+@@ -1,17 +0,0 @@
+-// +build solaris
+-
+-package mlock
+-
+-import (
+-       "syscall"
+-       "golang.org/x/sys/unix"
+-)
+-
+-func init() {
+-       supported = true
+-}
+-
+-func lockMemory() error {
+-       // Mlockall prevents all current and future pages from being swapped out.
+-       return unix.Mlockall(syscall.MCL_CURRENT | syscall.MCL_FUTURE)
+-}
diff --git a/security/vault/files/patch-helper_mlock_mlock__unavail.go b/security/vault/files/patch-helper_mlock_mlock__unavail.go
new file mode 100644
index 000000000000..a131716b4287
--- /dev/null
+++ b/security/vault/files/patch-helper_mlock_mlock__unavail.go
@@ -0,0 +1,8 @@
+--- helper/mlock/mlock_unavail.go.orig	2016-03-16 19:48:36 UTC
++++ helper/mlock/mlock_unavail.go
+@@ -1,4 +1,4 @@
+-// +build windows plan9 darwin freebsd openbsd netbsd
++// +build android nacl plan9 windows
+ 
+ package mlock
+ 
diff --git a/security/vault/files/patch-helper_mlock_mlock__unix.go b/security/vault/files/patch-helper_mlock_mlock__unix.go
new file mode 100644
index 000000000000..60d01bc8fd56
--- /dev/null
+++ b/security/vault/files/patch-helper_mlock_mlock__unix.go
@@ -0,0 +1,21 @@
+--- helper/mlock/mlock_unix.go.orig	2016-04-11 17:33:59 UTC
++++ helper/mlock/mlock_unix.go
+@@ -0,0 +1,18 @@
++// +build darwin dragonfly freebsd linux netbsd openbsd solaris
++
++package mlock
++
++import (
++	"syscall"
++
++	"golang.org/x/sys/unix"
++)
++
++func init() {
++	supported = true
++}
++
++func lockMemory() error {
++	// Mlockall prevents all current and future pages from being swapped out.
++	return unix.Mlockall(syscall.MCL_CURRENT | syscall.MCL_FUTURE)
++}