diff options
| -rw-r--r-- | doc/TODO | 3 | ||||
| -rw-r--r-- | mk/defaults/options.description | 1 | ||||
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh/options.mk | 15 |
4 files changed, 14 insertions, 8 deletions
@@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.18952 2019/04/23 09:52:00 wiz Exp $ +$NetBSD: TODO,v 1.18953 2019/04/25 14:55:03 tron Exp $ Suggested new packages ====================== @@ -1041,7 +1041,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o opensc-0.19.0 o openslp-2.0.0 o opensmtpd-6.0.0 - o openssh-7.9p1 o openssl-1.0.2q o openvas-libraries-8.0.8 o opera-26 diff --git a/mk/defaults/options.description b/mk/defaults/options.description index 6c1cc46d1f2..3cb6733b248 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -159,6 +159,7 @@ eb Enable EB dictionary library support. ecap Enable eCAP support. ecl Use Embeddable Common Lisp. ecore Enable ecore library support. +editline Enable use of the NetBSD Editline library. eekboard Use eekboard for virtual keyboard support. efence Build with Electric Fence malloc() debugger support. efnet Enable tweaks to support EFNet. diff --git a/security/openssh/Makefile b/security/openssh/Makefile index fcb3322e56e..97ace9773d6 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.257 2019/01/18 20:13:36 tnn Exp $ +# $NetBSD: Makefile,v 1.258 2019/04/25 14:55:04 tron Exp $ DISTNAME= openssh-7.9p1 PKGNAME= ${DISTNAME:S/p1/.1/} +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenSSH/portable/} diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 940447d7fcd..6e941d6b5bb 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.35 2017/07/24 16:33:22 he Exp $ - -.include "../../mk/bsd.prefs.mk" +# $NetBSD: options.mk,v 1.36 2019/04/25 14:55:04 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openssh -PKG_SUPPORTED_OPTIONS= kerberos openssl pam -PKG_SUGGESTED_OPTIONS= openssl +PKG_SUPPORTED_OPTIONS= editline kerberos openssl pam +PKG_SUGGESTED_OPTIONS= editline openssl + +.include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" PKG_SUGGESTED_OPTIONS+= pam @@ -44,3 +44,8 @@ MESSAGE_SUBST+= EGDIR=${EGDIR} PLIST.pam= yes . endif .endif + +.if !empty(PKG_OPTIONS:Meditline) +.include "../../devel/editline/buildlink3.mk" +CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editline} +.endif |