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

- update to augeas-1.3.0

Browse Source
This commit is contained in:
jasper 2014-11-08 14:28:02 +00:00
parent 827025e902
commit 0ec722aca3
6 changed files with 28 additions and 275 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.27 2014/11/05 11:43:59 sthen Exp $
# $OpenBSD: Makefile,v 1.28 2014/11/08 14:28:02 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.2.0
REVISION= 3
DISTNAME= augeas-1.3.0
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

4
sysutils/augeas/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (augeas-1.2.0.tar.gz) = 9K6yjr4LCSGSD+HJtMAWc5wlJhoV3gTLl9sC1mn0geA=
SIZE (augeas-1.2.0.tar.gz) = 1957910
SHA256 (augeas-1.3.0.tar.gz) = gHYwMa92UVqOpmAT3cPEZnQqFdLpB8fI4uO3QQJi4q8=
SIZE (augeas-1.3.0.tar.gz) = 1983656

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

@ -1,11 +1,11 @@
$OpenBSD: patch-lenses_shellvars_aug,v 1.8 2014/07/21 14:12:35 jasper Exp $
$OpenBSD: patch-lenses_shellvars_aug,v 1.9 2014/11/08 14:28:02 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 Mon Jan 27 11:36:08 2014
+++ lenses/shellvars.aug Tue Jul 22 02:05:36 2014
@@ -210,7 +210,6 @@ module Shellvars =
--- 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 =
. incl "/etc/environment"
. incl "/etc/firewalld/firewalld.conf"
. incl "/etc/blkid.conf"
@ -13,7 +13,7 @@ $OpenBSD: patch-lenses_shellvars_aug,v 1.8 2014/07/21 14:12:35 jasper Exp $
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
@@ -219,8 +218,6 @@ module Shellvars =
@@ -245,8 +244,6 @@ module Shellvars =
. incl "/etc/lsb-release"
. incl "/etc/os-release"
. incl "/etc/popularity-contest.conf"

43
sysutils/augeas/patches/patch-lenses_sshd_aug
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-lenses_sshd_aug,v 1.1 2014/03/09 19:47:18 jasper Exp $
From 1b299d58bbebd6551412bd721838e9e582a81a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Fri, 21 Feb 2014 08:09:06 +0100
Subject: [PATCH] Sshd: Allow all types of issues in Match groups (GH issue #75)
--- lenses/sshd.aug.orig Mon Jan 27 11:36:08 2014
+++ lenses/sshd.aug Sat Feb 22 13:30:39 2014
@@ -114,6 +114,11 @@ module Sshd =
let kexalgorithms = list /KexAlgorithms/i "KexAlgorithms"
+ let entry = accept_env | allow_groups | allow_users
+ | deny_groups | subsystem | deny_users
+ | macs | ciphers | kexalgorithms
+ | other_entry
+
let condition_entry =
let value = store /[^ \t\n]+/ in
[ sep . key /[A-Za-z0-9]+/ . sep . value ]
@@ -121,18 +126,15 @@ module Sshd =
let match_cond =
[ label "Condition" . condition_entry+ . eol ]
- let match_entry =
- ( (indent . comment_noindent) | empty | (indent . other_entry) )
+ let match_entry = indent . (entry | comment_noindent)
+ | empty
let match =
[ key /Match/i . match_cond
. [ label "Settings" . match_entry+ ]
]
- let lns = (comment | empty | accept_env | allow_groups | allow_users
- | deny_groups | subsystem | deny_users
- | macs | ciphers | kexalgorithms
- | other_entry ) * . match*
+ let lns = (entry | comment | empty)* . match*
let xfm = transform lns (incl "/etc/ssh/sshd_config")

220
sysutils/augeas/patches/patch-lenses_xymon_alerting_aug
View File

@ -1,220 +0,0 @@
$OpenBSD: patch-lenses_xymon_alerting_aug,v 1.1 2014/07/21 14:17:40 jasper Exp $
From cf3de24554112f3d47e26515954769e23d6adf45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Thu, 19 Jun 2014 11:49:18 +0200
Subject: [PATCH] Xymon_Alerting: refactor lens (GH issue #89)
--- lenses/xymon_alerting.aug.orig Mon Jan 27 11:36:08 2014
+++ lenses/xymon_alerting.aug Tue Jul 22 02:10:57 2014
@@ -37,16 +37,16 @@ module Xymon_Alerting =
let comparison = store /[<>]/
(* View: equal *)
- let equal = del /=/ "="
+ let equal = Sep.equal
(* View: ws *)
- let ws = del /[ \t]+?/ " "
+ let ws = Sep.space
(* View: eol *)
- let eol = del /\n/ "\n"
+ let eol = Util.eol
(* View: ws_or_eol *)
- let ws_or_eol = del /[ \t\n]+?/ " "
+ let ws_or_eol = del /([ \t]+|[ \t]*\n[ \t]*)/ " "
(* View: comment *)
let comment = Util.comment
@@ -63,120 +63,128 @@ module Xymon_Alerting =
(* View: macrodefinition
A string that starts with $ and that is assigned something *)
- let macrodefinition = [ key /\$[^ =\t\n#\/]+/ . equal . store /.*/ . eol ]
+ let macrodefinition = [ key /\$[^ =\t\n#\/]+/ . Sep.space_equal . store Rx.space_in . eol ]
+ (* View: flag
+ A flag value *)
+ let flag (kw:string) = Build.flag kw
+
+ (* View: kw_word
+ A key=value value *)
+ let kw_word (kw:regexp) = Build.key_value kw equal store_word
+
(************************************************************************
* Group: FILTERS
*************************************************************************)
(* View: page
- The page filter definition *)
- let page = [ ws . key "PAGE" . equal . store_word . ws ]
- (* View: expage
- The expage filter definition *)
- let expage = [ ws . key "EXPAGE" . equal . store_word . ws ]
+ The (ex)?page filter definition *)
+ let page = kw_word /(EX)?PAGE/
+
(* View: group
- The group filter definition *)
- let group = [ ws . key "GROUP" . equal . store_word . ws ]
- (* View: exgroup
- The exgroup filter definition *)
- let exgroup = [ ws . key "EXGROUP" . equal . store_word . ws ]
+ The (ex)?group filter definition *)
+ let group = kw_word /(EX)?GROUP/
+
(* View: host
- The host filter definition *)
- let host = [ ws . key "HOST" . equal . store_word . ws ]
- (* View: exhost
- The exhost filter definition *)
- let exhost = [ ws . key "EXHOST" . equal . store_word . ws ]
+ The (ex)?host filter definition *)
+ let host = kw_word /(EX)?HOST/
+
(* View: service
- The service filter definition *)
- let service = [ ws . key "SERVICE" . equal . store_word . ws ]
- (* View: exservice
- The exservice filter definition *)
- let exservice = [ ws . key "EXSERVICE" . equal . store_word . ws ]
+ The (ex)?service filter definition *)
+ let service = kw_word /(EX)?SERVICE/
+
(* View: color
The color filter definition *)
- let color = [ ws . key "COLOR" . equal . store_word . ws ]
+ let color = kw_word "COLOR"
+
(* View: time
The time filter definition *)
- let time = [ ws . key "TIME" . equal . store_word . ws ]
+ let time = kw_word "TIME"
+
(* View: duration
The duration filter definition *)
- let duration = [ ws . key "DURATION" . [ label "operator" . comparison ] . [ label "value" . store_word ] . ws ]
+ let duration = [ key "DURATION" . [ label "operator" . comparison ] . [ label "value" . store_word ] ]
(* View: recover
The recover filter definition *)
- let recover = [ ws . key "RECOVER" . ws ]
+ let recover = flag "RECOVER"
(* View: notice
The notice filter definition *)
- let notice = [ ws . key "NOTICE" . ws ]
+ let notice = flag "NOTICE"
- (* View: filters
+ (* View: rule_filter
Filters are made out of any of the above filter definitions *)
- let filters =
- page |
- expage |
- group |
- exgroup |
- host |
- exhost |
- service |
- exservice |
- color |
- time |
- duration |
- recover |
- notice
+ let rule_filter = page | group | host | service
+ | color | time | duration | recover | notice
+ (* View: filters
+ One or more filters *)
+ let filters = [ label "filters" . Build.opt_list rule_filter ws ]
+ (* View: filters_opt
+ Zero, one or more filters *)
+ let filters_opt = [ label "filters" . (ws . Build.opt_list rule_filter ws)? ]
+
+ (* View: kw_word_filters_opt
+ A <kw_word> entry with optional filters *)
+ let kw_word_filters_opt (kw:string) = [ key kw . equal . store_word . filters_opt ]
+
+ (* View: flag_filters_opt
+ A <flag> with optional filters *)
+ let flag_filters_opt (kw:string) = [ key kw . filters_opt ]
+
(************************************************************************
* Group: RECIPIENTS
*************************************************************************)
(* View: mail
The mail recipient definition *)
- let mail = [ key "MAIL" . ws . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let mail = [ key "MAIL" . ws . store_word . filters_opt ]
+
(* View: script
The script recipient definition *)
- let script = [ key "SCRIPT" . ws . [ label "script" . store_word ] . ws . [ label "recipient" . store_word ] . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let script = [ key "SCRIPT" . ws . [ label "script" . store_word ]
+ . ws . [ label "recipient" . store_word ] . filters_opt ]
+
(* View: ignore
The ignore recipient definition *)
- let ignore = [ key "IGNORE" . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let ignore = flag_filters_opt "IGNORE"
+
(* View: format
The format recipient definition *)
- let format = [ key "FORMAT" . equal . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let format = kw_word_filters_opt "FORMAT"
+
(* View: repeat
The repeat recipient definition *)
- let repeat = [ key "REPEAT" . equal . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let repeat = kw_word_filters_opt "REPEAT"
+
(* View: unmatched
The unmatched recipient definition *)
- let unmatched = [ key "UNMATCHED" . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let unmatched = flag_filters_opt "UNMATCHED"
+
(* View: stop
The stop recipient definition *)
- let stop = [ key "STOP" . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let stop = flag_filters_opt "STOP"
+
(* View: macro
The macro recipient definition *)
- let macro = [ key /\$[^ =\t\n#\/]+/ . ws . [ label "filters" . filters* ] . ws_or_eol ]
+ let macro = [ key /\$[^ =\t\n#\/]+/ . filters_opt ]
- (* View: recipients
+ (* View: recipient
Recipients are made out of any of the above recipient definitions *)
- let recipients =
- mail |
- script |
- ignore |
- format |
- repeat |
- unmatched |
- stop |
- macro
+ let recipient = mail | script | ignore | format | repeat | unmatched
+ | stop | macro
+ let recipients = [ label "recipients" . Build.opt_list recipient ws_or_eol ]
+
(************************************************************************
* Group: RULES
*************************************************************************)
(* View: rule
- Rules are made of filters and then recipients sperarated by a whitespace *)
- let rule = [ seq "rules" . [ label "filters" . filters+ ] . ws_or_eol . [ label "recipients" . ( recipients )+ ] . eol ]
+ Rules are made of rule_filter and then recipients sperarated by a whitespace *)
+ let rule = [ seq "rules" . filters . ws_or_eol . recipients . eol ]
(* View: lns
The Xymon_Alerting lens *)

21
sysutils/augeas/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2014/02/06 10:21:09 jasper Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/11/08 14:28:02 jasper Exp $
@bin bin/augparse
@bin bin/augtool
@bin bin/fadot
@ -11,7 +11,6 @@ lib/libaugeas.la
lib/libfa.a
lib/libfa.la
@lib lib/libfa.so.${LIBfa_VERSION}
lib/pkgconfig/
lib/pkgconfig/augeas.pc
@man man/man1/augparse.1
@man man/man1/augtool.1
@ -42,9 +41,11 @@ share/augeas/lenses/dist/carbon.aug
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/cobblermodules.aug
share/augeas/lenses/dist/cobblersettings.aug
share/augeas/lenses/dist/collectd.aug
share/augeas/lenses/dist/cpanel.aug
share/augeas/lenses/dist/cron.aug
share/augeas/lenses/dist/crypttab.aug
share/augeas/lenses/dist/cups.aug
@ -69,6 +70,7 @@ share/augeas/lenses/dist/fuse.aug
share/augeas/lenses/dist/gdm.aug
share/augeas/lenses/dist/group.aug
share/augeas/lenses/dist/grub.aug
share/augeas/lenses/dist/gshadow.aug
share/augeas/lenses/dist/gtkbookmarks.aug
share/augeas/lenses/dist/host_conf.aug
share/augeas/lenses/dist/hostname.aug
@ -90,6 +92,7 @@ share/augeas/lenses/dist/jmxpassword.aug
share/augeas/lenses/dist/json.aug
share/augeas/lenses/dist/kdump.aug
share/augeas/lenses/dist/keepalived.aug
share/augeas/lenses/dist/known_hosts.aug
share/augeas/lenses/dist/koji.aug
share/augeas/lenses/dist/krb5.aug
share/augeas/lenses/dist/ldif.aug
@ -127,6 +130,7 @@ share/augeas/lenses/dist/openshift_config.aug
share/augeas/lenses/dist/openshift_http.aug
share/augeas/lenses/dist/openshift_quickstarts.aug
share/augeas/lenses/dist/openvpn.aug
share/augeas/lenses/dist/pagekite.aug
share/augeas/lenses/dist/pam.aug
share/augeas/lenses/dist/pamconf.aug
share/augeas/lenses/dist/passwd.aug
@ -152,6 +156,7 @@ share/augeas/lenses/dist/rabbitmq.aug
share/augeas/lenses/dist/redis.aug
share/augeas/lenses/dist/reprepro_uploaders.aug
share/augeas/lenses/dist/resolv.aug
share/augeas/lenses/dist/rmt.aug
share/augeas/lenses/dist/rsyncd.aug
share/augeas/lenses/dist/rsyslog.aug
share/augeas/lenses/dist/rx.aug
@ -160,6 +165,7 @@ share/augeas/lenses/dist/schroot.aug
share/augeas/lenses/dist/securetty.aug
share/augeas/lenses/dist/sep.aug
share/augeas/lenses/dist/services.aug
share/augeas/lenses/dist/shadow.aug
share/augeas/lenses/dist/shells.aug
share/augeas/lenses/dist/shellvars.aug
share/augeas/lenses/dist/shellvars_list.aug
@ -209,9 +215,11 @@ share/augeas/lenses/dist/tests/test_carbon.aug
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_cobblermodules.aug
share/augeas/lenses/dist/tests/test_cobblersettings.aug
share/augeas/lenses/dist/tests/test_collectd.aug
share/augeas/lenses/dist/tests/test_cpanel.aug
share/augeas/lenses/dist/tests/test_cron.aug
share/augeas/lenses/dist/tests/test_crypttab.aug
share/augeas/lenses/dist/tests/test_cups.aug
@ -236,6 +244,7 @@ share/augeas/lenses/dist/tests/test_fuse.aug
share/augeas/lenses/dist/tests/test_gdm.aug
share/augeas/lenses/dist/tests/test_group.aug
share/augeas/lenses/dist/tests/test_grub.aug
share/augeas/lenses/dist/tests/test_gshadow.aug
share/augeas/lenses/dist/tests/test_gtkbookmarks.aug
share/augeas/lenses/dist/tests/test_host_conf.aug
share/augeas/lenses/dist/tests/test_hostname.aug
@ -257,6 +266,7 @@ share/augeas/lenses/dist/tests/test_jmxpassword.aug
share/augeas/lenses/dist/tests/test_json.aug
share/augeas/lenses/dist/tests/test_kdump.aug
share/augeas/lenses/dist/tests/test_keepalived.aug
share/augeas/lenses/dist/tests/test_known_hosts.aug
share/augeas/lenses/dist/tests/test_koji.aug
share/augeas/lenses/dist/tests/test_krb5.aug
share/augeas/lenses/dist/tests/test_ldap.aug
@ -295,6 +305,7 @@ share/augeas/lenses/dist/tests/test_openshift_config.aug
share/augeas/lenses/dist/tests/test_openshift_http.aug
share/augeas/lenses/dist/tests/test_openshift_quickstarts.aug
share/augeas/lenses/dist/tests/test_openvpn.aug
share/augeas/lenses/dist/tests/test_pagekite.aug
share/augeas/lenses/dist/tests/test_pam.aug
share/augeas/lenses/dist/tests/test_pamconf.aug
share/augeas/lenses/dist/tests/test_passwd.aug
@ -320,6 +331,7 @@ share/augeas/lenses/dist/tests/test_rabbitmq.aug
share/augeas/lenses/dist/tests/test_redis.aug
share/augeas/lenses/dist/tests/test_reprepro_uploaders.aug
share/augeas/lenses/dist/tests/test_resolv.aug
share/augeas/lenses/dist/tests/test_rmt.aug
share/augeas/lenses/dist/tests/test_rsyncd.aug
share/augeas/lenses/dist/tests/test_rsyslog.aug
share/augeas/lenses/dist/tests/test_rx.aug
@ -327,6 +339,7 @@ share/augeas/lenses/dist/tests/test_samba.aug
share/augeas/lenses/dist/tests/test_schroot.aug
share/augeas/lenses/dist/tests/test_securetty.aug
share/augeas/lenses/dist/tests/test_services.aug
share/augeas/lenses/dist/tests/test_shadow.aug
share/augeas/lenses/dist/tests/test_shells.aug
share/augeas/lenses/dist/tests/test_shellvars.aug
share/augeas/lenses/dist/tests/test_shellvars_list.aug
@ -352,7 +365,9 @@ share/augeas/lenses/dist/tests/test_sysctl.aug
share/augeas/lenses/dist/tests/test_syslog.aug
share/augeas/lenses/dist/tests/test_systemd.aug
share/augeas/lenses/dist/tests/test_thttpd.aug
share/augeas/lenses/dist/tests/test_tuned.aug
share/augeas/lenses/dist/tests/test_up2date.aug
share/augeas/lenses/dist/tests/test_updatedb.aug
share/augeas/lenses/dist/tests/test_util.aug
share/augeas/lenses/dist/tests/test_vfstab.aug
share/augeas/lenses/dist/tests/test_vmware_config.aug
@ -367,7 +382,9 @@ share/augeas/lenses/dist/tests/test_xymon.aug
share/augeas/lenses/dist/tests/test_xymon_alerting.aug
share/augeas/lenses/dist/tests/test_yum.aug
share/augeas/lenses/dist/thttpd.aug
share/augeas/lenses/dist/tuned.aug
share/augeas/lenses/dist/up2date.aug
share/augeas/lenses/dist/updatedb.aug
share/augeas/lenses/dist/util.aug
share/augeas/lenses/dist/vfstab.aug
share/augeas/lenses/dist/vmware_config.aug