diff options
author | Steve Wills <swills@FreeBSD.org> | 2016-11-07 19:42:00 +0000 |
---|---|---|
committer | Steve Wills <swills@FreeBSD.org> | 2016-11-07 19:42:00 +0000 |
commit | 82664d50ea7a0e6829d4313515e9714c5b750c45 (patch) | |
tree | 3dc76fb9a2b237f21dde9538f491655d9ac79e77 /security | |
parent | multimedia/ffmpeg: switch to clang on 9.x (diff) |
security/vault: update to 6.2
PR: 212863
Submitted by: Dave Cottlehuber <dch@skunkwerks.at> (with modifications)
Notes
Notes:
svn path=/head/; revision=425642
Diffstat (limited to 'security')
-rw-r--r-- | security/vault/Makefile | 18 | ||||
-rw-r--r-- | security/vault/distinfo | 6 | ||||
-rw-r--r-- | security/vault/files/patch-helper_mlock_mlock__linux.go | 17 | ||||
-rw-r--r-- | security/vault/files/patch-helper_mlock_mlock__solaris.go | 20 | ||||
-rw-r--r-- | security/vault/files/patch-helper_mlock_mlock__unavail.go | 8 | ||||
-rw-r--r-- | security/vault/files/patch-helper_mlock_mlock__unix.go | 21 | ||||
-rw-r--r-- | security/vault/files/patch-version_version.go | 13 | ||||
-rw-r--r-- | security/vault/files/vault.in | 2 |
8 files changed, 23 insertions, 82 deletions
diff --git a/security/vault/Makefile b/security/vault/Makefile index 954758955e02..5a714d191f4e 100644 --- a/security/vault/Makefile +++ b/security/vault/Makefile @@ -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 secrets 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> diff --git a/security/vault/distinfo b/security/vault/distinfo index a6ffdcf6c25e..d08616e9cda0 100644 --- a/security/vault/distinfo +++ b/security/vault/distinfo @@ -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 diff --git a/security/vault/files/patch-helper_mlock_mlock__linux.go b/security/vault/files/patch-helper_mlock_mlock__linux.go deleted file mode 100644 index a87a133fe02d..000000000000 --- a/security/vault/files/patch-helper_mlock_mlock__linux.go +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 deleted file mode 100644 index 28182a7fad60..000000000000 --- a/security/vault/files/patch-helper_mlock_mlock__solaris.go +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index a131716b4287..000000000000 --- a/security/vault/files/patch-helper_mlock_mlock__unavail.go +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 deleted file mode 100644 index 60d01bc8fd56..000000000000 --- a/security/vault/files/patch-helper_mlock_mlock__unix.go +++ /dev/null @@ -1,21 +0,0 @@ ---- 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) -+} diff --git a/security/vault/files/patch-version_version.go b/security/vault/files/patch-version_version.go new file mode 100644 index 000000000000..fe7657909134 --- /dev/null +++ b/security/vault/files/patch-version_version.go @@ -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 diff --git a/security/vault/files/vault.in b/security/vault/files/vault.in index 03125ac62d03..2e4bcfad6913 100644 --- a/security/vault/files/vault.in +++ b/security/vault/files/vault.in @@ -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 |