cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to augeas-1.4.0

Browse Source 
ok sebastia@
This commit is contained in:
jasper 2015-06-03 06:10:42 +00:00
parent 3be62c269d
commit f29546482e
8 changed files with 41 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/augeas/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.30 2015/04/21 18:19:27 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2015/06/03 06:10:42 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.3.0
REVISION= 1
DISTNAME= augeas-1.4.0
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

4
sysutils/augeas/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (augeas-1.3.0.tar.gz) = gHYwMa92UVqOpmAT3cPEZnQqFdLpB8fI4uO3QQJi4q8=
SIZE (augeas-1.3.0.tar.gz) = 1983656
SHA256 (augeas-1.4.0.tar.gz) = ZZ+uesIpAp5gqGmjuIxhbP1Rzy+6KGzf4686BSyzWzA=
SIZE (augeas-1.4.0.tar.gz) = 2029025

80
sysutils/augeas/patches/patch-lenses_known_hosts_aug
View File

@ -1,80 +0,0 @@
$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 *)

12
sysutils/augeas/patches/patch-lenses_shellvars_aug
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-lenses_shellvars_aug,v 1.9 2014/11/08 14:28:02 jasper Exp $
$OpenBSD: patch-lenses_shellvars_aug,v 1.10 2015/06/03 06:10:42 jasper Exp $
- adduser.conf is not a shell script, so don't try to parse it as such.
- rc.conf* are not shell scripts anymore.
--- lenses/shellvars.aug.orig Fri Oct 17 17:52:20 2014
+++ lenses/shellvars.aug Sat Nov 8 13:59:03 2014
@@ -236,7 +236,6 @@ module Shellvars =
--- lenses/shellvars.aug.orig Tue Jun 2 00:03:07 2015
+++ lenses/shellvars.aug Tue Jun 2 10:11:04 2015
@@ -239,7 +239,6 @@ module Shellvars =
. incl "/etc/environment"
. incl "/etc/firewalld/firewalld.conf"
. incl "/etc/blkid.conf"
@ -13,9 +13,9 @@ $OpenBSD: patch-lenses_shellvars_aug,v 1.9 2014/11/08 14:28:02 jasper Exp $
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
@@ -245,8 +244,6 @@ module Shellvars =
. incl "/etc/lsb-release"
@@ -249,8 +248,6 @@ module Shellvars =
. incl "/etc/os-release"
. incl "/etc/periodic.conf"
. incl "/etc/popularity-contest.conf"
- . incl "/etc/rc.conf"
- . incl "/etc/rc.conf.local"

3
sysutils/augeas/patches/patch-lenses_simplelines_aug
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-lenses_simplelines_aug,v 1.2 2014/07/21 14:12:35 jasper Exp $
$OpenBSD: patch-lenses_simplelines_aug,v 1.3 2015/06/03 06:10:42 jasper Exp $
- Parse hostname.if(5) files
https://github.com/hercules-team/augeas/pull/252
- rc.conf* are not shell scripts anymore.
--- lenses/simplelines.aug.orig Fri Nov 2 16:20:11 2012

8
sysutils/augeas/patches/patch-lenses_sysctl_aug
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-lenses_sysctl_aug,v 1.2 2013/06/17 07:39:49 jasper Exp $
$OpenBSD: patch-lenses_sysctl_aug,v 1.3 2015/06/03 06:10:42 jasper Exp $
Simplevars.entry allows a space between the key and the value,
sysctl(8) doesn't take that as a valid entry.
--- lenses/sysctl.aug.orig Fri Jan 4 01:04:02 2013
+++ lenses/sysctl.aug Sat Jun 15 14:47:07 2013
@@ -32,8 +32,12 @@ let filter = incl "/etc/sysctl.conf"
--- lenses/sysctl.aug.orig Tue Jun 2 00:03:07 2015
+++ lenses/sysctl.aug Tue Jun 2 10:11:04 2015
@@ -33,8 +33,12 @@ let filter = incl "/boot/loader.conf"
(* View: comment *)
let comment = Util.comment_generic /[ \t]*[#;][ \t]*/ "# "

8
sysutils/augeas/patches/patch-man_augparse_1
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-man_augparse_1,v 1.2 2013/06/17 07:39:49 jasper Exp $
--- man/augparse.1.orig Wed Feb 6 21:08:51 2013
+++ man/augparse.1 Sat Jun 15 14:47:38 2013
@@ -144,7 +144,7 @@ Execute an Augeas module, most commonly to evaluate th
$OpenBSD: patch-man_augparse_1,v 1.3 2015/06/03 06:10:42 jasper Exp $
--- man/augparse.1.orig Fri May 22 20:46:34 2015
+++ man/augparse.1 Tue Jun 2 10:11:04 2015
@@ -153,7 +153,7 @@ Execute an Augeas module, most commonly to evaluate th
Add \s-1DIR\s0 to the module loadpath. Can be given multiple times. The
directories set here are searched before any directories specified in the
\&\s-1AUGEAS_LENS_LIB\s0 environment variable, and before the default directory

22
sysutils/augeas/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2014/11/08 14:28:02 jasper Exp $
@comment $OpenBSD: PLIST,v 1.7 2015/06/03 06:10:42 jasper Exp $
@bin bin/augparse
@bin bin/augtool
@bin bin/fadot
@ -20,6 +20,7 @@ share/augeas/lenses/dist/
share/augeas/lenses/dist/access.aug
share/augeas/lenses/dist/activemq_conf.aug
share/augeas/lenses/dist/activemq_xml.aug
share/augeas/lenses/dist/afs_cellalias.aug
share/augeas/lenses/dist/aliases.aug
share/augeas/lenses/dist/anacron.aug
share/augeas/lenses/dist/approx.aug
@ -42,6 +43,7 @@ share/augeas/lenses/dist/cgconfig.aug
share/augeas/lenses/dist/cgrules.aug
share/augeas/lenses/dist/channels.aug
share/augeas/lenses/dist/chrony.aug
share/augeas/lenses/dist/clamav.aug
share/augeas/lenses/dist/cobblermodules.aug
share/augeas/lenses/dist/cobblersettings.aug
share/augeas/lenses/dist/collectd.aug
@ -56,6 +58,7 @@ share/augeas/lenses/dist/desktop.aug
share/augeas/lenses/dist/device_map.aug
share/augeas/lenses/dist/dhclient.aug
share/augeas/lenses/dist/dhcpd.aug
share/augeas/lenses/dist/dns_zone.aug
share/augeas/lenses/dist/dnsmasq.aug
share/augeas/lenses/dist/dovecot.aug
share/augeas/lenses/dist/dpkg.aug
@ -85,6 +88,7 @@ share/augeas/lenses/dist/inputrc.aug
share/augeas/lenses/dist/interfaces.aug
share/augeas/lenses/dist/iproute2.aug
share/augeas/lenses/dist/iptables.aug
share/augeas/lenses/dist/iscsid.aug
share/augeas/lenses/dist/jaas.aug
share/augeas/lenses/dist/jettyrealm.aug
share/augeas/lenses/dist/jmxaccess.aug
@ -104,6 +108,8 @@ share/augeas/lenses/dist/logrotate.aug
share/augeas/lenses/dist/logwatch.aug
share/augeas/lenses/dist/lokkit.aug
share/augeas/lenses/dist/lvm.aug
share/augeas/lenses/dist/mailscanner.aug
share/augeas/lenses/dist/mailscanner_rules.aug
share/augeas/lenses/dist/mcollective.aug
share/augeas/lenses/dist/mdadm_conf.aug
share/augeas/lenses/dist/memcached.aug
@ -136,11 +142,13 @@ share/augeas/lenses/dist/pamconf.aug
share/augeas/lenses/dist/passwd.aug
share/augeas/lenses/dist/pbuilder.aug
share/augeas/lenses/dist/pg_hba.aug
share/augeas/lenses/dist/pgbouncer.aug
share/augeas/lenses/dist/php.aug
share/augeas/lenses/dist/phpvars.aug
share/augeas/lenses/dist/postfix_access.aug
share/augeas/lenses/dist/postfix_main.aug
share/augeas/lenses/dist/postfix_master.aug
share/augeas/lenses/dist/postfix_sasl_smtpd.aug
share/augeas/lenses/dist/postfix_transport.aug
share/augeas/lenses/dist/postfix_virtual.aug
share/augeas/lenses/dist/postgresql.aug
@ -148,7 +156,9 @@ share/augeas/lenses/dist/properties.aug
share/augeas/lenses/dist/protocols.aug
share/augeas/lenses/dist/puppet.aug
share/augeas/lenses/dist/puppet_auth.aug
share/augeas/lenses/dist/puppetfile.aug
share/augeas/lenses/dist/puppetfileserver.aug
share/augeas/lenses/dist/pylonspaste.aug
share/augeas/lenses/dist/pythonpaste.aug
share/augeas/lenses/dist/qpid.aug
share/augeas/lenses/dist/quote.aug
@ -194,6 +204,7 @@ share/augeas/lenses/dist/tests/
share/augeas/lenses/dist/tests/test_access.aug
share/augeas/lenses/dist/tests/test_activemq_conf.aug
share/augeas/lenses/dist/tests/test_activemq_xml.aug
share/augeas/lenses/dist/tests/test_afs_cellalias.aug
share/augeas/lenses/dist/tests/test_aliases.aug
share/augeas/lenses/dist/tests/test_anacron.aug
share/augeas/lenses/dist/tests/test_approx.aug
@ -216,6 +227,7 @@ share/augeas/lenses/dist/tests/test_cgconfig.aug
share/augeas/lenses/dist/tests/test_cgrules.aug
share/augeas/lenses/dist/tests/test_channels.aug
share/augeas/lenses/dist/tests/test_chrony.aug
share/augeas/lenses/dist/tests/test_clamav.aug
share/augeas/lenses/dist/tests/test_cobblermodules.aug
share/augeas/lenses/dist/tests/test_cobblersettings.aug
share/augeas/lenses/dist/tests/test_collectd.aug
@ -230,6 +242,7 @@ share/augeas/lenses/dist/tests/test_desktop.aug
share/augeas/lenses/dist/tests/test_device_map.aug
share/augeas/lenses/dist/tests/test_dhclient.aug
share/augeas/lenses/dist/tests/test_dhcpd.aug
share/augeas/lenses/dist/tests/test_dns_zone.aug
share/augeas/lenses/dist/tests/test_dnsmasq.aug
share/augeas/lenses/dist/tests/test_dovecot.aug
share/augeas/lenses/dist/tests/test_dpkg.aug
@ -259,6 +272,7 @@ share/augeas/lenses/dist/tests/test_inputrc.aug
share/augeas/lenses/dist/tests/test_interfaces.aug
share/augeas/lenses/dist/tests/test_iproute2.aug
share/augeas/lenses/dist/tests/test_iptables.aug
share/augeas/lenses/dist/tests/test_iscsid.aug
share/augeas/lenses/dist/tests/test_jaas.aug
share/augeas/lenses/dist/tests/test_jettyrealm.aug
share/augeas/lenses/dist/tests/test_jmxaccess.aug
@ -279,6 +293,8 @@ share/augeas/lenses/dist/tests/test_logrotate.aug
share/augeas/lenses/dist/tests/test_logwatch.aug
share/augeas/lenses/dist/tests/test_lokkit.aug
share/augeas/lenses/dist/tests/test_lvm.aug
share/augeas/lenses/dist/tests/test_mailscanner.aug
share/augeas/lenses/dist/tests/test_mailscanner_rules.aug
share/augeas/lenses/dist/tests/test_mcollective.aug
share/augeas/lenses/dist/tests/test_mdadm_conf.aug
share/augeas/lenses/dist/tests/test_memcached.aug
@ -311,11 +327,13 @@ share/augeas/lenses/dist/tests/test_pamconf.aug
share/augeas/lenses/dist/tests/test_passwd.aug
share/augeas/lenses/dist/tests/test_pbuilder.aug
share/augeas/lenses/dist/tests/test_pg_hba.aug
share/augeas/lenses/dist/tests/test_pgbouncer.aug
share/augeas/lenses/dist/tests/test_php.aug
share/augeas/lenses/dist/tests/test_phpvars.aug
share/augeas/lenses/dist/tests/test_postfix_access.aug
share/augeas/lenses/dist/tests/test_postfix_main.aug
share/augeas/lenses/dist/tests/test_postfix_master.aug
share/augeas/lenses/dist/tests/test_postfix_sasl_smtpd.aug
share/augeas/lenses/dist/tests/test_postfix_transport.aug
share/augeas/lenses/dist/tests/test_postfix_virtual.aug
share/augeas/lenses/dist/tests/test_postgresql.aug
@ -323,7 +341,9 @@ share/augeas/lenses/dist/tests/test_properties.aug
share/augeas/lenses/dist/tests/test_protocols.aug
share/augeas/lenses/dist/tests/test_puppet.aug
share/augeas/lenses/dist/tests/test_puppet_auth.aug
share/augeas/lenses/dist/tests/test_puppetfile.aug
share/augeas/lenses/dist/tests/test_puppetfileserver.aug
share/augeas/lenses/dist/tests/test_pylonspaste.aug
share/augeas/lenses/dist/tests/test_pythonpaste.aug
share/augeas/lenses/dist/tests/test_qpid.aug
share/augeas/lenses/dist/tests/test_quote.aug