Index: branches/2020Q4/security/vault/Makefile
===================================================================
--- branches/2020Q4/security/vault/Makefile	(revision 558329)
+++ branches/2020Q4/security/vault/Makefile	(revision 558330)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	vault
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Tool for securely accessing secrets
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 USE_GITHUB=	yes
 GH_TUPLE=	hashicorp:${PORTNAME}:${VAULTTAG}:DEFAULT \
 		swills:vaultui:${VAULTUITAG}:vaultui
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 COMMIT_ID=	685fdfa
 GO_BUILDFLAGS=	-tags=ui \
 		-ldflags="\
 		-X github.com/hashicorp/vault/sdk/version.Version=${PORTVERSION} \
 		-X github.com/hashicorp/vault/sdk/version.VersionPrerelease= \
 		-X github.com/hashicorp/vault/sdk/version.VersionMetadata= \
 		-X github.com/hashicorp/vault/sdk/version.GitCommit='${COMMIT_ID}'"
 
 VAULTTAG=	${DISTVERSIONPREFIX}${PORTVERSION}
 VAULTUITAG=	${DISTVERSIONPREFIX}${PORTVERSION}
 
 USE_RC_SUBR=	vault
 
 USERS=		vault
 GROUPS=		vault
 
 PLIST_FILES=	bin/${PORTNAME}
 SUB_FILES=	pkg-message
 
 PORTSCOUT=	limit:^(v?)[0-9]+\.[0-9]+\.[0-9]+$
 
 post-patch:
 	@${CP} ${WRKDIR}/vaultui-${PORTVERSION}/http/bindata_assetfs.go ${WRKDIR}/vault-${PORTVERSION}/http/bindata_assetfs.go
 
 .include <bsd.port.mk>
Index: branches/2020Q4/security/vault/distinfo
===================================================================
--- branches/2020Q4/security/vault/distinfo	(revision 558329)
+++ branches/2020Q4/security/vault/distinfo	(revision 558330)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1601333569
-SHA256 (hashicorp-vault-v1.5.4_GH0.tar.gz) = 99e3145a9b6f5ee6429b997f3e1f35f648d07c617ff6aef7041f91fcf34e1582
-SIZE (hashicorp-vault-v1.5.4_GH0.tar.gz) = 35116452
-SHA256 (swills-vaultui-v1.5.4_GH0.tar.gz) = 486ea116146a5d3b875d4449d2633519c9d09c0be8689a249c2ab2ad042d7dde
-SIZE (swills-vaultui-v1.5.4_GH0.tar.gz) = 1614275
+TIMESTAMP = 1608216772
+SHA256 (hashicorp-vault-v1.6.1_GH0.tar.gz) = fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+SIZE (hashicorp-vault-v1.6.1_GH0.tar.gz) = 39080880
+SHA256 (swills-vaultui-v1.6.1_GH0.tar.gz) = 2fafc8a7e523fd7cd196731b5cebdf160e4e025b80bb4c249728a7a042f1d607
+SIZE (swills-vaultui-v1.6.1_GH0.tar.gz) = 1657205
Index: branches/2020Q4/security/vault/files/pkg-message.in
===================================================================
--- branches/2020Q4/security/vault/files/pkg-message.in	(revision 558329)
+++ branches/2020Q4/security/vault/files/pkg-message.in	(revision 558330)
@@ -1,25 +1,25 @@
 [
 { type: install
   message: <<EOM
 The vault user created by the vault package is now a member of the daemon
 class, which will allow it to use mlock() when started by the rc script. This
 will not be reflected in systems where the user already exists. Please add the
 vault user to the daemon class manually by running:
 
 pw usermod -L daemon -n vault
 
 or delete the user and reinstall the package.
 
 You may also need to increase memorylocked for the daemon class in
-/etc/login.conf to 256M or more and run:
+/etc/login.conf to 1024M or more and run:
 
 cap_mkdb /etc/login.conf
 
 Or to disable mlock, add:
 
 disable_mlock = 1
 
 to %%PREFIX%%/etc/vault.hcl
 EOM
 }
 ]
Index: branches/2020Q4/security/vault/files/vault.in
===================================================================
--- branches/2020Q4/security/vault/files/vault.in	(revision 558329)
+++ branches/2020Q4/security/vault/files/vault.in	(revision 558330)
@@ -1,87 +1,87 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: vault
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # vault_enable (bool):	Set it to YES to enable vault.
 #			Default is "NO".
 # vault_user (user):	Set user to run vault.
 #			Default is "vault".
 # vault_group (group):	Set group to run vault.
 #			Default is "vault".
-# vault_config (dir):	Set vault config file.
+# vault_config (file):	Set vault config file.
 #			Default is "%%PREFIX%%/etc/vault.hcl".
 # vault_syslog_output_enable (bool):	Set to enable syslog output.
 #					Default is "NO". See daemon(8).
 # vault_syslog_output_priority (str):	Set syslog priority if syslog enabled.
 #					Default is "info". See daemon(8).
 # vault_syslog_output_facility (str):	Set syslog facility if syslog enabled.
 #					Default is "daemon". See daemon(8).
 
 . /etc/rc.subr
 
 name=vault
 rcvar=vault_enable
 
 load_rc_config $name
 
 : ${vault_enable:="NO"}
 : ${vault_user:="vault"}
 : ${vault_group:="vault"}
 : ${vault_config:="%%PREFIX%%/etc/vault.hcl"}
 
 DAEMON=$(/usr/sbin/daemon 2>&1 | grep -q syslog ; echo $?)
 if [ ${DAEMON} -eq 0 ]; then
         : ${vault_syslog_output_enable:="NO"}
         : ${vault_syslog_output_priority:="info"}
         : ${vault_syslog_output_facility:="daemon"}
         if checkyesno vault_syslog_output_enable; then
-                vault_syslog_output_flags="-t ${name} -T ${name}"
+                vault_syslog_output_flags="-T ${name}"
 
                 if [ -n "${vault_syslog_output_priority}" ]; then
                         vault_syslog_output_flags="${vault_syslog_output_flags} -s ${vault_syslog_output_priority}"
                 fi
 
                 if [ -n "${vault_syslog_output_facility}" ]; then
                         vault_syslog_output_flags="${vault_syslog_output_flags} -l ${vault_syslog_output_facility}"
                 fi
         fi
 else
         vault_syslog_output_enable="NO"
         vault_syslog_output_flags=""
 fi
 
 pidfile=/var/run/vault.pid
 procname="%%PREFIX%%/bin/vault"
 command="/usr/sbin/daemon"
-command_args="-f ${vault_syslog_output_flags} -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}"
+command_args="-f -t ${name} ${vault_syslog_output_flags} -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}"
 
 extra_commands="reload monitor"
 monitor_cmd=vault_monitor
 start_precmd=vault_startprecmd
 required_files="$vault_config"
 
 vault_monitor()
 {
 	sig_reload=USR1
 	run_rc_command "reload"
 }
 
 vault_startprecmd()
 {
         if [ ! -e ${pidfile} ]; then
                 install -o ${vault_user} -g ${vault_group} /dev/null ${pidfile};
         fi
 
         if [ ! -d ${vault_dir} ]; then
                 install -d -o ${vault_user} -g ${vault_group} ${vault_dir}
         fi
 }
 
 run_rc_command "$1"
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 558329)
+++ branches/2020Q4	(revision 558330)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r557185,558297