diff --git a/augeas-0.10.0.tar.gz b/augeas-0.10.0.tar.gz new file mode 100644 index 0000000..638d16a --- /dev/null +++ b/augeas-0.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca +size 1676906 diff --git a/augeas-0.9.0.tar.gz b/augeas-0.9.0.tar.gz deleted file mode 100644 index 9c1a896..0000000 --- a/augeas-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55d2f482d02ac4cb38a80d95c53d2f73de435df7df1022827e7cba20bb4bb9b8 -size 1630073 diff --git a/augeas-modprobe-lense.patch b/augeas-modprobe-lense.patch index 1b6c6cc..dcfe4b9 100644 --- a/augeas-modprobe-lense.patch +++ b/augeas-modprobe-lense.patch @@ -1,23 +1,24 @@ -augeas: support allow_unsupported_modules command in modprobe.d conf files - -From: Patrick Mullaney - -Signed-off-by: Patrick Mullaney ---- - - lenses/modprobe.aug | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - - diff --git a/lenses/modprobe.aug b/lenses/modprobe.aug -index bdecafb..0f5ae47 100644 +index f4bb27b..6b02b9c 100644 --- a/lenses/modprobe.aug +++ b/lenses/modprobe.aug -@@ -44,6 +44,7 @@ let entry = alias - | options - | cmd_token_to_eol /install|remove/ - | [ cmd "blacklist" . token . eol ] -+ | [ cmd "allow_unsupported_modules" . token . eol ] - | [ cmd "config" . store /binary_indexes|yes|no/ ] +@@ -70,6 +70,11 @@ let blacklist = Build.key_value_line_comment "blacklist" sep_space + sto_no_spaces + comment - let lns = (comment|empty|entry)* ++(* View: allow_unsupported_modules *) ++let allow_unsupported_modules = Build.key_value_line_comment "allow_unsupported_modules" sep_space ++ sto_no_spaces ++ comment ++ + (* View: config *) + let config = Build.key_value_line_comment "config" sep_space + (store /binary_indexes|yes|no/) +@@ -80,6 +85,7 @@ let entry = alias + | options + | kv_line_command /install|remove/ + | blacklist ++ | allow_unsupported_modules + | config + + (************************************************************************ diff --git a/augeas.changes b/augeas.changes index 398acbc..0f59ae0 100644 --- a/augeas.changes +++ b/augeas.changes @@ -1,3 +1,92 @@ +------------------------------------------------------------------- +Wed Feb 29 10:19:56 UTC 2012 - dmacvicar@suse.de + +- update to 0.10.0 + - support relative paths by taking them relative to the value of + /augeas/context in all API functions where paths are used + - add aug_to_xml to API: transform tree(s) into XML, exposed as dump-xml in + aug_srun and augtool. Introduces dependency on libxml2 + - fix regular expression escaping. Previously, /[/]/ match either a backslash + or a slash. Now it only matches a slash + - path expressions: add function 'int' to convert a node value (string) to an + integer + - path expressions: make sure the regexp produced by empty nodesets from + regexp() and glob() matches nothing, rather than the empty word + - fix --autosave when running single command from command line, BZ 743023 + - aug_srun: support 'insert' and 'move' as aliases for 'ins' and 'mv' + - aug_srun: allow escaping of spaces, quotes and brackets with \ + - aug_init: accept AUG_NO_ERR_CLOSE flag; return augeas handle even when + initialization fails so that caller gets some details about why + initialization failed + - aug_srun: tolerate trailing white space in commands + - much improved, expanded documentation of many lenses + - always interpret lens filter paths as absolute, bug #238 + - fix bug in libfa that would incorrectly calculate the difference of a case + sensistive and case insensitive regexp (/[a-zA-Z]+/ - /word/i would match + 'worD') + - new builtin 'regexp_match' for .aug files to make testing regexp matching + easier during development + - fix 'span' command, bug #220 + - Lens changes/additions + * Access: parse user@host and (group) in users field; field separator need + not be surrounded by spaces + * Aliases: allow spaces before colons + * Aptconf: new lens for /etc/apt/apt.conf + * Aptpreferences: support origin entries + * Backuppchosts: new lens for /etc/backuppc/hosts, bug 233 (Adam Helms) + * Bbhosts: various fixes + * Cgconfig: id allowed too many characters + * Cron: variables aren't set like shellvars, semicolons are allowed in + email addresses; fix parsing of numeric fields, previously upper case + chars were allowed; support ranges in time specs + * Desktop: new lens for .desktop files + * Dhcpd: slashes must be double-quoted; add Red Hat's dhcpd.conf locations + * Exports: allow empty options + * Fai_diskconfig: new lens for FAI disk_config files + * Fstab: allow ',' in file names, BZ 751342 + * Host_access: new lens for /etc/hosts.{allow,deny} + * Host_conf: new lens for /etc/host.conf + * Hostname: new lens for /etc/hostname + * Hosts: also load /etc/mailname by default + * Iptables: allow digits in ipt_match keys, bug #224 + * Json: fix whitespace handling, removing some cf ambiguities + * Kdump: new lens for /etc/kdump.conf (Roman Rakus) + * Keepalived: support many more flags, fields and blocks + * Krb5: support [pam] section, bug #225 + * Logrotate: be more tolerant of whitespace in odd places + * Mdadm_conf: new lens for /etc/mdadm.conf + * Modprobe: Parse commands in install/remove stanzas (this introduces a + backwards incompatibility); Drop support for include as it is not documented + in manpages and no unit tests are shipped. + * Modules: new lens for /etc/modules + * Multipath: add support for seveal options in defaults section, bug #207 + * Mysql: includedir statements are not part of sections; support !include; + allow indentation of entries and flags + * Networks: new lens for /etc/networks + * Nrpe: allow '=' in commands, bug #218 (Marc Fournier) + * Php: allow indented entries + * Phpvars: allow double quotes in variable names; accept case insensitive + PHP tags; accept 'include_once'; allow empty lines at EOF; support define() + and bash-style and end-of-line comments + * ostfix_master: allow a lot more chars in words/commands, including commas + * PuppetFileserver: support same-line comments and trailing whitespace, + bug #214 + * Reprepo_uploaders: new lens for reprepro's uploaders files + * Resolv: permit end-of-line comments + * Schroot: new lens for /etc/schroot/schroot.conf + * Shellvars: greatly expand shell syntax understood; support + various syntactic constructs like if/then/elif/else, for, while, + until, case, and select; load /etc/blkid.conf by default + * Spacevars: add toplevel lens 'lns' for consistency + * Ssh: new lens for ssh_config (Jiri Suchomel) + * Stunnel: new lens for /etc/stunnel/stunnel.conf (Oliver Beattie) + * Sudoers: support more parameter flags/options, bug #143 + * Xendconfsxp: lens for Xen configuration (Tom Limoncelli) + * Xinetd: allow spaces after '{' +- update modprobe lens patch to apply on 0.10.0 +- update shellvars lens patch to add some missing files on SUSE + distros mentioned in bnc#729491 + ------------------------------------------------------------------- Sat Feb 11 03:09:32 UTC 2012 - jengelh@medozas.de diff --git a/augeas.spec b/augeas.spec index bb33316..7455624 100644 --- a/augeas.spec +++ b/augeas.spec @@ -17,7 +17,7 @@ Name: augeas -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: A library for changing configuration files License: GPL-3.0+ ; LGPL-2.1+ @@ -30,6 +30,7 @@ Patch0: augeas-modprobe-lense.patch Patch1: bnc-729491-recognize-suse-sysconfig-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel +BuildRequires: libxml2-devel BuildRequires: readline-devel %description diff --git a/bnc-729491-recognize-suse-sysconfig-files.patch b/bnc-729491-recognize-suse-sysconfig-files.patch index bce846d..3b95ba5 100644 --- a/bnc-729491-recognize-suse-sysconfig-files.patch +++ b/bnc-729491-recognize-suse-sysconfig-files.patch @@ -1,12 +1,27 @@ diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug -index 3a64b38..dc216da 100644 +index faa0e72..722ab4b 100644 --- a/lenses/shellvars.aug +++ b/lenses/shellvars.aug -@@ -112,6 +112,141 @@ module Shellvars = +@@ -189,6 +189,156 @@ module Shellvars = sc_incl "xend" . sc_incl "xendomains" + let filter_sysconfig_suse = ++ sc_incl "apcupsd" . ++ sc_incl "arpd" . ++ sc_incl "atftpd" . ++ sc_incl "automatic_online_update" . ++ sc_incl "debugfs" . ++ sc_incl "libvirt-guests" . ++ sc_incl "mcelog" . ++ sc_incl "oracle" . ++ sc_incl "pciback" . ++ sc_incl "puppetmasterd" . ++ sc_incl "racoon" . ++ sc_incl "snapper" . ++ sc_incl "tomcat6" . ++ sc_incl "xencommons" . ++ sc_incl "xsp2" . + sc_incl "abuild" . + sc_incl "add-on-creator" . + sc_incl "amavis" . @@ -144,8 +159,8 @@ index 3a64b38..dc216da 100644 let filter_ifcfg = incl "/etc/sysconfig/network-scripts/ifcfg-*" . incl "/etc/sysconfig/network/ifcfg-*" let filter_default = incl "/etc/default/*" -@@ -121,6 +256,8 @@ module Shellvars = - . incl "/etc/rc.conf" +@@ -198,6 +348,8 @@ module Shellvars = + . incl "/etc/blkid.conf" let filter = filter_sysconfig + . filter_sysconfig_suse