diff --git a/27d8457-inputrc-lens-support-mapping-like.patch b/27d8457-inputrc-lens-support-mapping-like.patch deleted file mode 100644 index d3848d4..0000000 --- a/27d8457-inputrc-lens-support-mapping-like.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 27d845714d16aa0fcdc08f28623a6119ac4f0e6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Tue, 8 Mar 2016 11:04:28 +0100 -Subject: [PATCH] inputrc lens: support mapping like "," - -The mapping values aren't always words. They can also be quoted values -containing characters like [,+/*-] ---- - lenses/inputrc.aug | 2 +- - lenses/tests/test_inputrc.aug | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lenses/inputrc.aug b/lenses/inputrc.aug -index 67032ac..15bf96e 100644 ---- a/lenses/inputrc.aug -+++ b/lenses/inputrc.aug -@@ -27,7 +27,7 @@ autoload xfm - (* View: entry - An inputrc mapping entry *) - let entry = -- let mapping = [ label "mapping" . store Rx.word ] -+ let mapping = [ label "mapping" . store /[A-Za-z0-9_."\*\/+\,\\-]+/ ] - in [ label "entry" - . Util.del_str "\"" . store /[^" \t\n]+/ - . Util.del_str "\":" . Sep.space -diff --git a/lenses/tests/test_inputrc.aug b/lenses/tests/test_inputrc.aug -index e269fd5..ff475f2 100644 ---- a/lenses/tests/test_inputrc.aug -+++ b/lenses/tests/test_inputrc.aug -@@ -61,6 +61,7 @@ $if term=rxvt - \"\\e[8~\": end-of-line - \"\\eOc\": forward-word - \"\\eOd\": backward-word -+\"\\e[G\": \",\" - $endif - - # for non RH/Debian xterm, can't hurt for RH/Debian xterm -@@ -157,6 +158,9 @@ test Inputrc.lns get conf = - { "entry" = "\\eOd" - { "mapping" = "backward-word" } - } -+ { "entry" = "\\e[G" -+ { "mapping" = "\",\"" } -+ } - } - { } - { "#comment" = "for non RH/Debian xterm, can't hurt for RH/Debian xterm" } --- -2.6.2 - diff --git a/2d12670-inputrc-lens-support-else.patch b/2d12670-inputrc-lens-support-else.patch deleted file mode 100644 index 0511d25..0000000 --- a/2d12670-inputrc-lens-support-else.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2d12670d15cacb279ec4045acbd296b02ce49be9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Tue, 8 Mar 2016 11:07:21 +0100 -Subject: [PATCH] inputrc lens: support @else - -@if structures can also have an @else, let's read them into another -subtree. ---- - lenses/inputrc.aug | 2 ++ - lenses/tests/test_inputrc.aug | 7 +++++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/lenses/inputrc.aug b/lenses/inputrc.aug -index 15bf96e..3902528 100644 ---- a/lenses/inputrc.aug -+++ b/lenses/inputrc.aug -@@ -45,6 +45,8 @@ let variable = [ Util.del_str "set" . Sep.space - let rec condition = [ Util.del_str "$if" . label "@if" - . Sep.space . store Rx.space_in . Util.eol - . (Util.empty | Util.comment | condition | variable | entry)* -+ . [ Util.del_str "$else" . label "@else" . Util.eol -+ . (Util.empty | Util.comment | condition | variable | entry)* ] ? - . Util.del_str "$endif" . Util.eol ] - - (* View: lns -diff --git a/lenses/tests/test_inputrc.aug b/lenses/tests/test_inputrc.aug -index ff475f2..1535697 100644 ---- a/lenses/tests/test_inputrc.aug -+++ b/lenses/tests/test_inputrc.aug -@@ -61,6 +61,7 @@ $if term=rxvt - \"\\e[8~\": end-of-line - \"\\eOc\": forward-word - \"\\eOd\": backward-word -+$else - \"\\e[G\": \",\" - $endif - -@@ -158,8 +159,10 @@ test Inputrc.lns get conf = - { "entry" = "\\eOd" - { "mapping" = "backward-word" } - } -- { "entry" = "\\e[G" -- { "mapping" = "\",\"" } -+ { "@else" -+ { "entry" = "\\e[G" -+ { "mapping" = "\",\"" } -+ } - } - } - { } --- -2.6.2 - diff --git a/49bcfbe-Exclude-network-if-up.d-SuSEfirewall2-in-shellvars-l.patch b/49bcfbe-Exclude-network-if-up.d-SuSEfirewall2-in-shellvars-l.patch deleted file mode 100644 index ec2a3ff..0000000 --- a/49bcfbe-Exclude-network-if-up.d-SuSEfirewall2-in-shellvars-l.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49bcfbeba1f4a2992a21720e97ac6e882064eea8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Tue, 8 Mar 2016 10:31:50 +0100 -Subject: [PATCH] Exclude network/if-up.d/SuSEfirewall2 in shellvars lens - -openSUSE has /etc/sysconfig/network/if-up.d/SuSEfirewall2 that is not a -shell variable script, exclude it to avoid errors. ---- - lenses/shellvars.aug | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug -index 9bc3c9d..0f36c01 100644 ---- a/lenses/shellvars.aug -+++ b/lenses/shellvars.aug -@@ -270,6 +270,7 @@ module Shellvars = - sc_incl "network/if-down.d/*" . - sc_incl "network/ifroute-*" . - sc_incl "network/if-up.d/*" . -+ sc_excl "network/if-up.d/SuSEfirewall2" . - sc_incl "network/providers/*" . - sc_excl "network-scripts" . - sc_incl "network-scripts/ifcfg-*" . --- -2.6.2 - diff --git a/7558c12-host_conf-lens-spaces-between-list-items-support.patch b/7558c12-host_conf-lens-spaces-between-list-items-support.patch deleted file mode 100644 index 37114c6..0000000 --- a/7558c12-host_conf-lens-spaces-between-list-items-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7558c12259d0c46cace7c8635e25281296337ea9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Tue, 8 Mar 2016 11:09:28 +0100 -Subject: [PATCH] host_conf lens: spaces between list items support - -List items are separated by commas in host.conf, but we may find spaces -on top of the comma. ---- - lenses/host_conf.aug | 2 +- - lenses/tests/test_host_conf.aug | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lenses/host_conf.aug b/lenses/host_conf.aug -index 00a3492..294975b 100644 ---- a/lenses/host_conf.aug -+++ b/lenses/host_conf.aug -@@ -44,7 +44,7 @@ let bool_warn (kw:regexp) = Build.key_value_line kw Sep.space sto_bool_warn - (* View: list - A list of items *) - let list (kw:regexp) (elem:string) = -- let list_elems = Build.opt_list [seq elem . store Rx.word] (Sep.comma) in -+ let list_elems = Build.opt_list [seq elem . store Rx.word] (Sep.comma . Sep.opt_space) in - Build.key_value_line kw Sep.space list_elems - - (* View: trim *) -diff --git a/lenses/tests/test_host_conf.aug b/lenses/tests/test_host_conf.aug -index 146abde..f0df5ab 100644 ---- a/lenses/tests/test_host_conf.aug -+++ b/lenses/tests/test_host_conf.aug -@@ -3,7 +3,7 @@ module Test_Host_Conf = - let conf = " - # /etc/host.conf - # We have named running, but no NIS (yet) --order bind,hosts -+order bind, hosts - # Allow multiple addrs - multi on - # Guard against spoof attempts --- -2.6.2 - diff --git a/augeas-1.4.0.tar.gz b/augeas-1.4.0.tar.gz deleted file mode 100644 index c11f2f2..0000000 --- a/augeas-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30 -size 2029025 diff --git a/augeas-1.4.0.tar.gz.sig b/augeas-1.4.0.tar.gz.sig deleted file mode 100644 index 7a243a3..0000000 Binary files a/augeas-1.4.0.tar.gz.sig and /dev/null differ diff --git a/augeas-1.5.0.tar.gz b/augeas-1.5.0.tar.gz new file mode 100644 index 0000000..b778545 --- /dev/null +++ b/augeas-1.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f +size 2072169 diff --git a/augeas-1.5.0.tar.gz.sig b/augeas-1.5.0.tar.gz.sig new file mode 100644 index 0000000..59574b9 Binary files /dev/null and b/augeas-1.5.0.tar.gz.sig differ diff --git a/augeas.changes b/augeas.changes index b6005f9..f4d8c5d 100644 --- a/augeas.changes +++ b/augeas.changes @@ -1,3 +1,152 @@ +------------------------------------------------------------------- +Thu May 12 15:50:37 UTC 2016 - mlatimer@suse.com + +- Update to version 1.5.0: + - General changes/additions + * augtool: new --timing option that prints after each operation how long + it took + * augtool: print brief help message when incorrect options are given rather + than dumping all help text + * Path expressions: optimize performance of evaluating certain + expressions + * lots of safety improvements in libfa to avoid using uninitialized + values and the like (Daniel Trebbien) + * tolerate building against OSX' libedit (Issue #256) + - API changes + * aug_match: fix a bug where expressions like /foo/*[2] would match a + hidden node and pretend there was no match at all. We now make sure + we never match a hidden node. Thanks to Xavier Mol for reporting the + problem. + * aug_get: make sure we set *value to NULL, even if the provided path is + invalid (Issue #372) + * aug_rm: fix segfault when deleting a tree and one of its ancestors + (Issue #319) + * aug_save: fix segfault when trying to save an invalid subtree. A + routine that was generating details for the error message overflowed + a buffer it had created (Issue #349) + - Lens changes/additions + * AptConf: support hash comments + * AptSources: support options (Issue #295), + support brackets with spaces in URI (GH #296) + rename test file to test_aptsources.aug + * Chrony: allow signed numbers and indentation, fix stray EOL entry, + disallow comment on EOL, add many missing directives and + options (Miroslav Lichvar, RHBZ#1213281) + add new directives and options that were added in + chrony-2.2 and chrony-2.3 and improve parsing of + access configuration (Miroslav Lichvar, Issue #348) + add new options for chrony-2.4 (Miroslav Lichvar) + * Dhclient: avoid put ambiguity for node without value (Issue #294) + * Group: support NIS map, support an overridden and disabled password, + i.e. `+:*::` (Matt Dainty) (Issue #258) + * Host_Conf: support spaces between list items (Cedric Bosdonnat, Issue #358) + * Httpd: add paths to SLES vhosts + (Jan Doleschal) (Issue #268) + parse backslashes in directive arguments (Issue #307) + parse mismatching case of opening/closing tags + parse multiple ending section tags on one line + parse wordlists in braces in SSLRequire directives + parse directive args starting with double quote (Issue #330) + parse directive args containing quotes + support perl directives (Issue #327) + parse line breaks/continuations in section arguments + parse escaped spaces in directive/section arguments + parse backslashes at the start of directive args (Issue #324) + * Inputrc: support $else (Cedric Bosdonnat, Issue #359) + * Interfaces: add support for source-directory (Issue #306) + * Json: add comments support, refactor, + allow escaped quotes and blackslashes + * Keepalived: fix space/tag alignments and hanging spaces, + add vrrp_mcast_group4 and vrrp_mcast_group6, + add more vrrp_instance flags, + add mcast/unicast_src_ip and unicast_peer, + add missing garp options, + add vrrp_script options, + expand vrrp_sync_group block, + allow notify option + (Joe Topjian) (Issue #266) + * Known_Hosts: refactoring and description fixed + * Logrotate: support dateyesterday option (Chris Reeves) (GH #367, #368) + * MasterPasswd: new lens to parse /etc/master.passwd + (Matt Dainty) (Issue #258) + * Multipath: add various missing keywoards (Olivier Mangold) (Issue #289) + * MySQL: include /etc/my.cnf.d/*.cnf (Issue #353) + * Nginx: improve typechecking of lens, + allow masks in IP keys and IPv6 (Issue #260) + add @server simple nodes (Issue #335) + * Ntp: add support for basic interface syntax + * OpenShift_Quickstarts: Use Json.lns + * OpenVPN: add all options available in OpenVPN 2.3o + (Justin Akers) (Issue #278) + * Puppetfile: name separator is not mandatory + add support for moduledir (Christoph Maser) + * Rabbitmq: remove space in option name, + add support for cluster_partitioning_handling, + add missing simple options (Joe Topjian) (Issue #264) + * Reprepro_Uploaders: add support for distribution field + (Mathieu Alorent) (Issue #277), + add support for groups (Issue #283) + * Rhsm: new lens to parse subscription-manager's /etc/rhsm/rhsm.conf + * Rsyslog: improve property filter parsing, + treat whitespace after commas as optional. + recognize '~' as a valid syslog action (discard) + (Gregory Smith) (Issue #282), + add support for redirecting output to named pipes + (Gerlof Fokkema) (Issue #366) + * Shellvars: allow partial quoting, mixing multiple styles + (Kaarle Ritvanen) (Issue #183); + allow wrapping builtin argument to multiple lines + (Kaarle Ritvanen) (Issue #184); + support ;; on same line with multiple commands + (Kaarle Ritvanen) (Issue #185); + allow line wrapping and improve quoting support + (Kaarle Ritvanen) (Issue #187); + accept [] and [[]] builtins (Issue #188); + allow && and || constructs after condition + (Kaarle Ritvanen) (Issue #265); + add pattern nodes in case entries + (BREAKING CHANGE: case entry values are now in a + @pattern subnode) (Kaarle Ritvanen) (Issue #265) + add eval builtin support; + add alias builtin support; + allow (almost) any command; + allow && and || after commands (Issue #215); + allow wrapping command sequences + (Kaarle Ritvanen) (Issue #333); + allow command-specific environment variable + (Kaarle Ritvanen) (Issue #332); + support subshells (Issue #339) + newlines in start of functions + allow newlines after actions + support comments after function name (Issue #339) + exclude SuSEfirewall2 (Cedric Bosdonnat, Issue #357) + * Simplelines: parse OpenBSD's hostname.if(5) + files (Jasper Lievisse Adriaanse) (Issue #252) + * Smbusers: add support for ; comments + * Spacevars: support flags (Issue #279) + * Ssh: add support for HostKeyAlgorithms, KexAlgorithms + and PubkeyAcceptedKeyTypes (Oliver Mangold) (Issue #290), + add support for GlobalKnownHostsFile (Issue #316) + * Star: New lens to parse /etc/default/star + * Sudoers: support for negated command alias + (Geoff Williams) (Issue #262) + * Syslog: recognize '~' as a valid syslog action (discard) + (Gregory Smith) (Issue #282) + * Tmpfiles: new lens to parse systemd's tempfiles.d configuration + files (Julien Pivotto) (Issue #269) + * Trapperkeeper: new lens for Puppet server configuration files + * Util: add comment_c_style_or_hash lens + add empty_any lens + * Vsftpd: add isolate and isolate_network options + (Florian Chazal) (Issue #334) + * Xml: allow empty document (Issue #255) + * YAML: new lens (subset) (Dimitar Dimitrov) (Issue #338) +- Drop upstreamed patches: + 27d8457-inputrc-lens-support-mapping-like.patch + 2d12670-inputrc-lens-support-else.patch + 49bcfbe-Exclude-network-if-up.d-SuSEfirewall2-in-shellvars-l.patch + 7558c12-host_conf-lens-spaces-between-list-items-support.patch + ------------------------------------------------------------------- Tue Apr 5 13:17:30 UTC 2016 - cbosdonnat@suse.com diff --git a/augeas.spec b/augeas.spec index dfeeda0..ea903d8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,7 +1,7 @@ # # spec file for package augeas # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define libname lib%{name}0 Name: augeas -Version: 1.4.0 +Version: 1.5.0 Release: 0 Summary: An utility for changing configuration files License: GPL-3.0+ and LGPL-2.1+ @@ -29,10 +29,6 @@ Source1: http://download.augeas.net/augeas-%{version}.tar.gz.sig Source2: %{name}.keyring Source3: baselibs.conf Patch0: augeas-modprobe-lense.patch -Patch1: 27d8457-inputrc-lens-support-mapping-like.patch -Patch2: 2d12670-inputrc-lens-support-else.patch -Patch3: 49bcfbe-Exclude-network-if-up.d-SuSEfirewall2-in-shellvars-l.patch -Patch4: 7558c12-host_conf-lens-spaces-between-list-items-support.patch BuildRequires: glib2-devel BuildRequires: libxml2-devel BuildRequires: readline-devel @@ -101,10 +97,6 @@ modifying the official lenses, or when creating new ones. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build export CFLAGS="-Wno-error %{optflags}"