Date: Mon, 27 Sep 2021 22:43:22 GMT From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fd74bc8eb2fe - main - security/openssh-portable: Fix default ssh-askpass path Message-ID: <202109272243.18RMhMwC083224@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd74bc8eb2fed86275167e58e9349045c6bbbaa4 commit fd74bc8eb2fed86275167e58e9349045c6bbbaa4 Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-09-27 22:39:15 +0000 Commit: Bryan Drewery <bdrewery@FreeBSD.org> CommitDate: 2021-09-27 22:42:58 +0000 security/openssh-portable: Fix default ssh-askpass path Reported by: Piotr Smyrak --- security/openssh-portable/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 306c7f4d15a4..b7b71af99747 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -2,7 +2,7 @@ PORTNAME= openssh DISTVERSION= 8.7p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -191,10 +191,15 @@ VERSION_ADDENDUM_DEFAULT?= ${OPSYS}-${PKGNAME} CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-stringop-truncation -Wno-stringop-overflow +SSH_ASKPASS_PATH?= ${LOCALBASE}/bin/ssh-askpass + post-patch: @${REINPLACE_CMD} \ -e 's|install: \(.*\) host-key check-config|install: \1|g' \ ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} \ + -e 's|$$[{(]libexecdir[})]/ssh-askpass|${SSH_ASKPASS_PATH}|' \ + ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac @${REINPLACE_CMD} \ -e 's|\(VersionAddendum\) none|\1 ${VERSION_ADDENDUM_DEFAULT}|' \ ${WRKSRC}/sshd_config
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109272243.18RMhMwC083224>