Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 May 2021 16:52:52 GMT
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 815e582a58e3 - main - security/duo_openvpn: Add OPTION for overriding USERNAME
Message-ID:  <202105201652.14KGqqGq055879@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=815e582a58e3dca11e9a926a3c0e91573ed0469b

commit 815e582a58e3dca11e9a926a3c0e91573ed0469b
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2021-05-20 16:52:42 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2021-05-20 16:52:42 +0000

    security/duo_openvpn: Add OPTION for overriding USERNAME
---
 security/duo_openvpn/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/security/duo_openvpn/Makefile b/security/duo_openvpn/Makefile
index de121d3320e9..5947ef2b5598 100644
--- a/security/duo_openvpn/Makefile
+++ b/security/duo_openvpn/Makefile
@@ -18,13 +18,14 @@ GH_ACCOUNT=	duosecurity
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	METHOD
+OPTIONS_DEFINE=	METHOD USERNAME
 OPTIONS_SINGLE=	HELPER
 OPTIONS_SINGLE_HELPER=	PERL PYTHON
 OPTIONS_DEFAULT=PERL
 OPTIONS_SUB=	yes
 
 METHOD_DESC=		Force an authentication method (defaults to push, via METHOD)
+USERNAME_DESC=		Force duo to use username variable, instead of common_name
 METHOD?=		push
 PERL_USES=		perl5
 PERL_VARS=		USE_PERL5=run CFLAGS+=-DUSE_PERL
@@ -39,6 +40,9 @@ PYTHON_USES=		python:3.7+,run
 post-patch:
 	${REINPLACE_CMD} 's|%%SHEBANG%%|${PYTHON_CMD}|' ${WRKSRC}/duo_openvpn.py
 	${REINPLACE_CMD} 's|PREFIX "|"${DATADIR}|' ${WRKSRC}/duo_openvpn.c
+.if ${PORT_OPTIONS:MUSERNAME}
+	${REINPLACE_CMD} 's|common_name|username|' ${WRKSRC}/duo_openvpn.c
+.endif
 .if ${PORT_OPTIONS:MMETHOD}
 	${REINPLACE_CMD} 's|get_env("password", envp);|"${METHOD}";|' ${WRKSRC}/duo_openvpn.c
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105201652.14KGqqGq055879>