CVS commit: pkgsrc

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Thu Apr 25 14:55:04 UTC 2019

Modified Files:
        pkgsrc/doc: TODO
        pkgsrc/mk/defaults: options.description
        pkgsrc/security/openssh: Makefile options.mk

Log Message:
openssh: Add optional command line editing to "sftp"

Add new package option "editline" (enabled by default) which adds
command line editing and filename completion to the "sftp" client.

Bump the package revision because of this change.


To generate a diff of this commit:
cvs rdiff -u -r1.18952 -r1.18953 pkgsrc/doc/TODO
cvs rdiff -u -r1.576 -r1.577 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.257 -r1.258 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/openssh/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/TODO
diff -u pkgsrc/doc/TODO:1.18952 pkgsrc/doc/TODO:1.18953
--- pkgsrc/doc/TODO:1.18952     Tue Apr 23 09:52:00 2019
+++ pkgsrc/doc/TODO     Thu Apr 25 14:55:03 2019
@@ -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 
        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

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.576 pkgsrc/mk/defaults/options.description:1.577
--- pkgsrc/mk/defaults/options.description:1.576        Thu Apr 25 13:08:31 2019
+++ pkgsrc/mk/defaults/options.description      Thu Apr 25 14:55:04 2019
@@ -159,6 +159,7 @@ eb                  Enable EB dictionary library suppor
 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.

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.257 pkgsrc/security/openssh/Makefile:1.258
--- pkgsrc/security/openssh/Makefile:1.257      Fri Jan 18 20:13:36 2019
+++ pkgsrc/security/openssh/Makefile    Thu Apr 25 14:55:04 2019
@@ -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/}
 

Index: pkgsrc/security/openssh/options.mk
diff -u pkgsrc/security/openssh/options.mk:1.35 pkgsrc/security/openssh/options.mk:1.36
--- pkgsrc/security/openssh/options.mk:1.35     Mon Jul 24 16:33:22 2017
+++ pkgsrc/security/openssh/options.mk  Thu Apr 25 14:55:04 2019
@@ -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