Attachment 175012 Details for Bug 212863 – v1 patch

v1 patch

file_212863.txt (text/plain), 6.90 KB, created by Dave Cottlehuber on 2016-09-20 18:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2016-09-20 18:31:33 UTC

Size: 6.90 KB

patch

obsolete

>From 84f52171cff1ba1feceead98ba226fb0782e17f9 Mon Sep 17 00:00:00 2001
>From: Dave Cottlehuber <dch@skunkwerks.at>
>Date: Mon, 19 Sep 2016 19:20:37 +0000
>Subject: [PATCH] security/vault: update 0.5.3 to 0.6.1
>
>- use upstream mlock
>- add vault tag in process name to daemon(8)
>- include version from PORTVERSION into `vault version` output
>---
> security/vault/Makefile                             | 11 +++++++----
> security/vault/distinfo                             |  6 +++---
> .../vault/files/patch-helper_mlock_mlock__linux.go  | 17 -----------------
> .../files/patch-helper_mlock_mlock__solaris.go      | 20 --------------------
> .../files/patch-helper_mlock_mlock__unavail.go      |  8 --------
> .../vault/files/patch-helper_mlock_mlock__unix.go   | 21 ---------------------
> security/vault/files/patch-version_version.go       | 13 +++++++++++++
> security/vault/files/vault.in                       |  2 +-
> 8 files changed, 24 insertions(+), 74 deletions(-)
> delete mode 100644 security/vault/files/patch-helper_mlock_mlock__linux.go
> delete mode 100644 security/vault/files/patch-helper_mlock_mlock__solaris.go
> delete mode 100644 security/vault/files/patch-helper_mlock_mlock__unavail.go
> delete mode 100644 security/vault/files/patch-helper_mlock_mlock__unix.go
> create mode 100644 security/vault/files/patch-version_version.go
>
>diff --git a/security/vault/Makefile b/security/vault/Makefile
>index 9547589..96b0c75 100644
>--- a/security/vault/Makefile
>+++ b/security/vault/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	vault
>-PORTVERSION=	0.5.3
>+PORTVERSION=	0.6.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>@@ -10,7 +10,7 @@ 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
>@@ -24,13 +24,16 @@ GROUPS=		vault
> 
> PLIST_FILES=	bin/${PORTNAME}
> 
>+# GIT_COMMIT = git rev-parse HEAD
>+
> post-patch:
>+	@${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|g' ${WRKSRC}/version/version.go
> 	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
> 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
> 	@cd ${WRKSRC} ; \
>-	${MV} .gitignore .travis.yml CHANGELOG.md CONTRIBUTING.md Godeps \
>+	${MV} .gitignore .travis.yml CHANGELOG.md CONTRIBUTING.md \
> 	LICENSE Makefile README.md api audit builtin cli command helper http \
>-	logical main.go main_test.go make.bat physical scripts shamir terraform \
>+	logical main.go main_test.go make.bat meta physical scripts shamir terraform \
> 	vault version website \
> 	src/github.com/${GH_ACCOUNT}/${PORTNAME}
> 
>diff --git a/security/vault/distinfo b/security/vault/distinfo
>index a6ffdcf..b236b83 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 = 1474312846
>+SHA256 (hashicorp-vault-v0.6.1_GH0.tar.gz) = 5f90f22ba8c2be8b8324cf3794b3f1d2599238eb46cb23cd20a40eefb9b7e0ec
>+SIZE (hashicorp-vault-v0.6.1_GH0.tar.gz) = 4665607
>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 a87a133..0000000
>--- 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 28182a7..0000000
>--- 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 a131716b..0000000
>--- 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 60d01bc..0000000
>--- 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 0000000..cbaedbc
>--- /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 03125ac..2e4bcfa 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
>

Actions: View

Attachments on bug 212863: 175012 | 176682