merge patch from upstream that rewrites the new known_hosts lens to properly

handle markers and hostnames w/ aliases

sysutils/augeas/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2014/11/08 14:28:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2014/11/25 10:26:28 jasper Exp $
 
 COMMENT=		configuration editing tool and API
 
 DISTNAME=		augeas-1.3.0
+REVISION=		0
 CATEGORIES=		sysutils devel
 
 SHARED_LIBS +=  augeas                    0.0 # 16.0

sysutils/augeas/patches/patch-lenses_known_hosts_aug

@@ -0,0 +1,80 @@
+$OpenBSD: patch-lenses_known_hosts_aug,v 1.1 2014/11/25 10:26:28 jasper Exp $
+
+From 77f89afc5a8cb22bcdeb0a37309e16229a5bcd1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
+Date: Tue, 25 Nov 2014 09:53:50 +0100
+Subject: [PATCH] Rework Known_Hosts, fix #173
+
+--- lenses/known_hosts.aug.orig	Fri Jun 20 00:27:11 2014
++++ lenses/known_hosts.aug	Tue Nov 25 11:20:58 2014
+@@ -5,8 +5,7 @@ Module: Known_Hosts
+ Author: Raphaël Pinson <raphink@gmail.com>
+ 
+ About: Reference
+-  This lens ensures that conf files included in ActiveMQ /FuseMQ are properly
+-  handled by Augeas.
++  This lens manages OpenSSH's known_hosts files. See `man 8 sshd` for reference.
+ 
+ About: License
+   This file is licenced under the LGPL v2+, like the rest of Augeas.
+@@ -30,14 +29,53 @@ module Known_Hosts =
+ 
+ autoload xfm
+ 
++(* View: marker
++  The marker is optional, but if it is present then it must be one of
++  “@cert-authority”, to indicate that the line contains a certification
++  authority (CA) key, or “@revoked”, to indicate that the key contained
++  on the line is revoked and must not ever be accepted.
++  Only one marker should be used on a key line.
++*)
++let marker = [ key /@(revoked|cert-authority)/ . Sep.space ]
++
++(* View: hostnames
++  Hostnames is a comma-separated list of patterns
++  (‘*’ and ‘?’ act as wildcards); each pattern in turn is matched
++  against the canonical host name (when authenticating a client)
++  or against the user-supplied name (when authenticating a server).
++  A pattern may also be preceded by ‘!’ to indicate negation:
++  if the host name matches a negated pattern, it is not accepted
++  (by that line) even if it matched another pattern on the line.
++  A hostname or address may optionally be enclosed within ‘[’ and ‘]’
++  brackets then followed by ‘:’ and a non-standard port number.
++
++  Alternately, hostnames may be stored in a hashed form which hides
++  host names and addresses should the file's contents be disclosed.
++  Hashed hostnames start with a ‘|’ character. Only one hashed hostname
++  may appear on a single line and none of the above negation or wildcard
++  operators may be applied.
++*)
++let hostnames =
++     let pattern = [ label "pattern" . store Rx.neg1 ]
++  in Build.opt_list pattern Sep.comma
++
++(* View: type
++  Bits, exponent, and modulus are taken directly from the RSA host key;
++  they can be obtained, for example, from /etc/ssh/ssh_host_key.pub.
++  The optional comment field continues to the end of the line, and is not used.
++*)
++let type = [ label "type" . store Rx.neg1 ]
++
+ (* View: entry
+-     A known_hosts entry *)
+-let entry = [ Util.indent . seq "entry" . store Rx.neg1
+-            . Sep.space
+-            . [ label "type" . store Rx.no_spaces ]
+-            . Sep.space
+-            . [ label "key" . store Rx.no_spaces ]
+-            . Util.eol ]
++  Each line in these files contains the following fields:
++  markers (optional), hostnames, bits, exponent, modulus, comment.
++  The fields are separated by spaces.
++ *)
++let entry =
++     let key = [ label "key" . store Rx.neg1 ]
++  in [ Util.indent . seq "entry" . marker?
++     . hostnames . Sep.space . type . Sep.space . key
++     . Util.comment_or_eol ]
+ 
+ (* View: lns
+      The known_hosts lens *)