Index: textproc/augeas/Makefile =================================================================== --- textproc/augeas/Makefile +++ textproc/augeas/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= augeas -PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTVERSION= 1.3.0 CATEGORIES= textproc MASTER_SITES= http://download.augeas.net/ @@ -27,8 +26,9 @@ @${REINPLACE_CMD} -e 's:$$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/tests/*.sh @${REINPLACE_CMD} -e 's:sed:gsed:' ${WRKSRC}/tests/test-augtool.sh - @${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \ + @${REINPLACE_CMD} -e 's:/usr/local:${LOCALBASE}:' \ ${WRKSRC}/lenses/puppet.aug \ + ${WRKSRC}/lenses/puppet_auth.aug \ ${WRKSRC}/lenses/puppetfileserver.aug .include Index: textproc/augeas/distinfo =================================================================== --- textproc/augeas/distinfo +++ textproc/augeas/distinfo @@ -1,2 +1,2 @@ -SHA256 (augeas-1.2.0.tar.gz) = f4aeb28ebe0b0921920fe1c9b4c016739c25261a15de04cb97db02d669f481e0 -SIZE (augeas-1.2.0.tar.gz) = 1957910 +SHA256 (augeas-1.3.0.tar.gz) = 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af +SIZE (augeas-1.3.0.tar.gz) = 1983656 Index: textproc/augeas/files/patch-configure.ac =================================================================== --- textproc/augeas/files/patch-configure.ac +++ /dev/null @@ -1,12 +0,0 @@ ---- ./configure.ac.orig 2011-12-02 14:48:40.000000000 -0500 -+++ ./configure.ac 2012-02-11 04:24:40.222339225 -0500 -@@ -2,8 +2,7 @@ - AC_CONFIG_SRCDIR([src/augeas.c]) - AC_CONFIG_AUX_DIR([build/aux]) - AM_CONFIG_HEADER([config.h]) --AM_INIT_AUTOMAKE([-Wno-portability 1.11 color-tests parallel-tests]) --AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. -+AM_INIT_AUTOMAKE() - - - dnl Check for NaturalDocs Index: textproc/augeas/files/patch-gnulib__lib__Makefile.am =================================================================== --- textproc/augeas/files/patch-gnulib__lib__Makefile.am +++ textproc/augeas/files/patch-gnulib__lib__Makefile.am @@ -1,6 +1,6 @@ ---- gnulib/lib/Makefile.am.orig 2010-04-28 14:46:00.000000000 -0700 -+++ gnulib/lib/Makefile.am 2010-04-28 14:47:00.000000000 -0700 -@@ -395,7 +395,7 @@ +--- gnulib/lib/Makefile.am.orig 2015-05-24 00:50:24 UTC ++++ gnulib/lib/Makefile.am +@@ -463,7 +463,7 @@ install-exec-localcharset: all-local case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ Index: textproc/augeas/files/patch-lenses__shellvars.aug =================================================================== --- textproc/augeas/files/patch-lenses__shellvars.aug +++ /dev/null @@ -1,29 +0,0 @@ ---- lenses/shellvars.aug.orig 2013-06-15 04:39:33.000000000 +0800 -+++ lenses/shellvars.aug 2013-07-11 22:06:44.821259529 +0800 -@@ -18,7 +18,7 @@ - let eol = del (/[ \t]+|[ \t]*[;\n]/ . empty_part_re*) "\n" - let semicol_eol = del (/[ \t]*[;\n]/ . empty_part_re*) "\n" - -- let key_re = /[A-Za-z0-9_]+(\[[0-9]+\])?/ - ("unset" | "export") -+ let key_re = /[A-Za-z0-9_.]+(\[[0-9]+\])?/ - "unset" - "export" - let matching_re = "${!" . key_re . /[\*@]\}/ - let eq = Util.del_str "=" - -@@ -200,7 +200,8 @@ - let filter_default = incl "/etc/default/*" - . excl "/etc/default/grub_installdevice*" - . excl "/etc/default/whoopsie" -- let filter_misc = incl "/etc/arno-iptables-firewall/debconf.cfg" -+ let filter_misc = incl "/boot/loader.conf" -+ . incl "/etc/arno-iptables-firewall/debconf.cfg" - . incl "/etc/cron-apt/config" - . incl "/etc/environment" - . incl "/etc/blkid.conf" -@@ -212,6 +213,7 @@ - . incl "/etc/lintianrc" - . incl "/etc/lsb-release" - . incl "/etc/os-release" -+ . incl "/etc/periodic.conf" - . incl "/etc/popularity-contest.conf" - . incl "/etc/rc.conf" - . incl "/etc/rc.conf.local" Index: textproc/augeas/files/patch-lenses__xymon_alerting.aug =================================================================== --- textproc/augeas/files/patch-lenses__xymon_alerting.aug +++ /dev/null @@ -1,213 +0,0 @@ ---- lenses/xymon_alerting.aug.orig 2014-01-27 10:36:08 UTC -+++ lenses/xymon_alerting.aug -@@ -37,16 +37,16 @@ - 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,70 +63,75 @@ - - (* 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 entry with optional filters *) -+ let kw_word_filters_opt (kw:string) = [ key kw . equal . store_word . filters_opt ] -+ -+ (* View: flag_filters_opt -+ A with optional filters *) -+ let flag_filters_opt (kw:string) = [ key kw . filters_opt ] - - (************************************************************************ - * Group: RECIPIENTS -@@ -134,40 +139,43 @@ - - (* 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 ] - - - (************************************************************************ -@@ -175,8 +183,8 @@ - *************************************************************************) - - (* 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 *) Index: textproc/augeas/files/patch-lenses_shellvars.aug =================================================================== --- /dev/null +++ textproc/augeas/files/patch-lenses_shellvars.aug @@ -0,0 +1,10 @@ +--- lenses/shellvars.aug.orig 2015-05-24 00:46:22 UTC ++++ lenses/shellvars.aug +@@ -244,6 +244,7 @@ module Shellvars = + . incl "/etc/lintianrc" + . incl "/etc/lsb-release" + . incl "/etc/os-release" ++ . incl "/etc/periodic.conf" + . incl "/etc/popularity-contest.conf" + . incl "/etc/rc.conf" + . incl "/etc/rc.conf.local" Index: textproc/augeas/files/patch-lenses_sysctl.aug =================================================================== --- /dev/null +++ textproc/augeas/files/patch-lenses_sysctl.aug @@ -0,0 +1,12 @@ +--- lenses/sysctl.aug.orig 2015-05-24 00:46:35 UTC ++++ lenses/sysctl.aug +@@ -23,7 +23,8 @@ module Sysctl = + autoload xfm + + (* Variable: filter *) +-let filter = incl "/etc/sysctl.conf" ++let filter = incl "boot/loader.conf" ++ . incl "/etc/sysctl.conf" + . incl "/etc/sysctl.d/*" + . excl "/etc/sysctl.d/README" + . excl "/etc/sysctl.d/README.sysctl" Index: textproc/augeas/files/patch-tests-cutest.c =================================================================== --- textproc/augeas/files/patch-tests-cutest.c +++ /dev/null @@ -1,10 +0,0 @@ ---- tests/cutest.c.orig 2012-02-11 05:08:50.706340443 -0500 -+++ tests/cutest.c 2012-02-11 05:09:03.816423151 -0500 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "cutest.h" - #include "memory.h" Index: textproc/augeas/pkg-plist =================================================================== --- textproc/augeas/pkg-plist +++ textproc/augeas/pkg-plist @@ -6,7 +6,7 @@ lib/libaugeas.a lib/libaugeas.so lib/libaugeas.so.0 -lib/libaugeas.so.0.18.0 +lib/libaugeas.so.0.19.0 lib/libfa.a lib/libfa.so lib/libfa.so.1 @@ -38,9 +38,11 @@ %%DATADIR%%/lenses/dist/cgconfig.aug %%DATADIR%%/lenses/dist/cgrules.aug %%DATADIR%%/lenses/dist/channels.aug +%%DATADIR%%/lenses/dist/chrony.aug %%DATADIR%%/lenses/dist/cobblermodules.aug %%DATADIR%%/lenses/dist/cobblersettings.aug %%DATADIR%%/lenses/dist/collectd.aug +%%DATADIR%%/lenses/dist/cpanel.aug %%DATADIR%%/lenses/dist/cron.aug %%DATADIR%%/lenses/dist/crypttab.aug %%DATADIR%%/lenses/dist/cups.aug @@ -65,6 +67,7 @@ %%DATADIR%%/lenses/dist/gdm.aug %%DATADIR%%/lenses/dist/group.aug %%DATADIR%%/lenses/dist/grub.aug +%%DATADIR%%/lenses/dist/gshadow.aug %%DATADIR%%/lenses/dist/gtkbookmarks.aug %%DATADIR%%/lenses/dist/host_conf.aug %%DATADIR%%/lenses/dist/hostname.aug @@ -86,6 +89,7 @@ %%DATADIR%%/lenses/dist/json.aug %%DATADIR%%/lenses/dist/kdump.aug %%DATADIR%%/lenses/dist/keepalived.aug +%%DATADIR%%/lenses/dist/known_hosts.aug %%DATADIR%%/lenses/dist/koji.aug %%DATADIR%%/lenses/dist/krb5.aug %%DATADIR%%/lenses/dist/ldif.aug @@ -123,6 +127,7 @@ %%DATADIR%%/lenses/dist/openshift_http.aug %%DATADIR%%/lenses/dist/openshift_quickstarts.aug %%DATADIR%%/lenses/dist/openvpn.aug +%%DATADIR%%/lenses/dist/pagekite.aug %%DATADIR%%/lenses/dist/pam.aug %%DATADIR%%/lenses/dist/pamconf.aug %%DATADIR%%/lenses/dist/passwd.aug @@ -148,6 +153,7 @@ %%DATADIR%%/lenses/dist/redis.aug %%DATADIR%%/lenses/dist/reprepro_uploaders.aug %%DATADIR%%/lenses/dist/resolv.aug +%%DATADIR%%/lenses/dist/rmt.aug %%DATADIR%%/lenses/dist/rsyncd.aug %%DATADIR%%/lenses/dist/rsyslog.aug %%DATADIR%%/lenses/dist/rx.aug @@ -156,6 +162,7 @@ %%DATADIR%%/lenses/dist/securetty.aug %%DATADIR%%/lenses/dist/sep.aug %%DATADIR%%/lenses/dist/services.aug +%%DATADIR%%/lenses/dist/shadow.aug %%DATADIR%%/lenses/dist/shells.aug %%DATADIR%%/lenses/dist/shellvars.aug %%DATADIR%%/lenses/dist/shellvars_list.aug @@ -204,9 +211,11 @@ %%DATADIR%%/lenses/dist/tests/test_cgconfig.aug %%DATADIR%%/lenses/dist/tests/test_cgrules.aug %%DATADIR%%/lenses/dist/tests/test_channels.aug +%%DATADIR%%/lenses/dist/tests/test_chrony.aug %%DATADIR%%/lenses/dist/tests/test_cobblermodules.aug %%DATADIR%%/lenses/dist/tests/test_cobblersettings.aug %%DATADIR%%/lenses/dist/tests/test_collectd.aug +%%DATADIR%%/lenses/dist/tests/test_cpanel.aug %%DATADIR%%/lenses/dist/tests/test_cron.aug %%DATADIR%%/lenses/dist/tests/test_crypttab.aug %%DATADIR%%/lenses/dist/tests/test_cups.aug @@ -231,6 +240,7 @@ %%DATADIR%%/lenses/dist/tests/test_gdm.aug %%DATADIR%%/lenses/dist/tests/test_group.aug %%DATADIR%%/lenses/dist/tests/test_grub.aug +%%DATADIR%%/lenses/dist/tests/test_gshadow.aug %%DATADIR%%/lenses/dist/tests/test_gtkbookmarks.aug %%DATADIR%%/lenses/dist/tests/test_host_conf.aug %%DATADIR%%/lenses/dist/tests/test_hostname.aug @@ -252,6 +262,7 @@ %%DATADIR%%/lenses/dist/tests/test_json.aug %%DATADIR%%/lenses/dist/tests/test_kdump.aug %%DATADIR%%/lenses/dist/tests/test_keepalived.aug +%%DATADIR%%/lenses/dist/tests/test_known_hosts.aug %%DATADIR%%/lenses/dist/tests/test_koji.aug %%DATADIR%%/lenses/dist/tests/test_krb5.aug %%DATADIR%%/lenses/dist/tests/test_ldap.aug @@ -290,6 +301,7 @@ %%DATADIR%%/lenses/dist/tests/test_openshift_http.aug %%DATADIR%%/lenses/dist/tests/test_openshift_quickstarts.aug %%DATADIR%%/lenses/dist/tests/test_openvpn.aug +%%DATADIR%%/lenses/dist/tests/test_pagekite.aug %%DATADIR%%/lenses/dist/tests/test_pam.aug %%DATADIR%%/lenses/dist/tests/test_pamconf.aug %%DATADIR%%/lenses/dist/tests/test_passwd.aug @@ -315,6 +327,7 @@ %%DATADIR%%/lenses/dist/tests/test_redis.aug %%DATADIR%%/lenses/dist/tests/test_reprepro_uploaders.aug %%DATADIR%%/lenses/dist/tests/test_resolv.aug +%%DATADIR%%/lenses/dist/tests/test_rmt.aug %%DATADIR%%/lenses/dist/tests/test_rsyncd.aug %%DATADIR%%/lenses/dist/tests/test_rsyslog.aug %%DATADIR%%/lenses/dist/tests/test_rx.aug @@ -322,6 +335,7 @@ %%DATADIR%%/lenses/dist/tests/test_schroot.aug %%DATADIR%%/lenses/dist/tests/test_securetty.aug %%DATADIR%%/lenses/dist/tests/test_services.aug +%%DATADIR%%/lenses/dist/tests/test_shadow.aug %%DATADIR%%/lenses/dist/tests/test_shells.aug %%DATADIR%%/lenses/dist/tests/test_shellvars.aug %%DATADIR%%/lenses/dist/tests/test_shellvars_list.aug @@ -347,7 +361,9 @@ %%DATADIR%%/lenses/dist/tests/test_syslog.aug %%DATADIR%%/lenses/dist/tests/test_systemd.aug %%DATADIR%%/lenses/dist/tests/test_thttpd.aug +%%DATADIR%%/lenses/dist/tests/test_tuned.aug %%DATADIR%%/lenses/dist/tests/test_up2date.aug +%%DATADIR%%/lenses/dist/tests/test_updatedb.aug %%DATADIR%%/lenses/dist/tests/test_util.aug %%DATADIR%%/lenses/dist/tests/test_vfstab.aug %%DATADIR%%/lenses/dist/tests/test_vmware_config.aug @@ -362,7 +378,9 @@ %%DATADIR%%/lenses/dist/tests/test_xymon_alerting.aug %%DATADIR%%/lenses/dist/tests/test_yum.aug %%DATADIR%%/lenses/dist/thttpd.aug +%%DATADIR%%/lenses/dist/tuned.aug %%DATADIR%%/lenses/dist/up2date.aug +%%DATADIR%%/lenses/dist/updatedb.aug %%DATADIR%%/lenses/dist/util.aug %%DATADIR%%/lenses/dist/vfstab.aug %%DATADIR%%/lenses/dist/vmware_config.aug