diff --git a/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch b/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch index ae765e9..f90f782 100644 --- a/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch +++ b/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch @@ -97,5 +97,5 @@ index 2ad1c165..329d121e 100644 = "*.* @far.far.away\n" -- -2.13.6 +2.14.3 diff --git a/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch b/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch index 6cc2093..7462242 100644 --- a/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch +++ b/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch @@ -82,5 +82,5 @@ index 33ea16f1..8e8c083b 100644 } } -- -2.13.6 +2.14.3 diff --git a/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch b/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch index 0b0e93a..731fa59 100644 --- a/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch +++ b/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch @@ -94,14 +94,14 @@ index 5f2bfb13..d5ede698 100644 };" test Jaas.lns get conf = -@@ -90,6 +90,7 @@ test Jaas.lns get conf = +@@ -89,6 +89,7 @@ test Jaas.lns get conf = + { } { } { "login" = "ShibUserPassAuth" - { } + { } + { } { "#comment" = "Example LDAP authentication" } { "#comment" = "See: https://wiki.shibboleth.net/confluence/display/SHIB2/IdPAuthUserPass" } - { "#mcomment" @@ -116,29 +117,27 @@ test Jaas.lns get conf = { "serviceCredential" = "\"ldappassword\"" } { "ssl" = "\"false\"" } @@ -139,5 +139,5 @@ index 5f2bfb13..d5ede698 100644 - { } } -- -2.13.6 +2.14.3 diff --git a/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch b/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch index 2ac217f..eb867c2 100644 --- a/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch +++ b/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch @@ -47,5 +47,5 @@ index 40cd26fb..c7309b16 100644 - -let xfm = transform lns filter -- -2.13.6 +2.14.3 diff --git a/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch b/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch index 14767f4..9fb279f 100644 --- a/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch +++ b/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch @@ -50,7 +50,7 @@ index f7ef9070..e19aab83 100644 +let entry_re = /[A-Za-z0-9._-]+/ let entry = [ key entry_re . (sep_eq . sto_to_eol)? . eol ] - (************************************************************************ +-(************************************************************************ - * STRUCTURED ENTRIES - *************************************************************************) - @@ -62,7 +62,7 @@ index f7ef9070..e19aab83 100644 - in let srv_spec = store /(#|([^#@\/ \t\n]+))/ . port? . source? - in [ key "server" . sep_eq . domains? . srv_spec? . eol ] - --(************************************************************************ + (************************************************************************ * LENS *************************************************************************) @@ -134,5 +134,5 @@ index c6a63d96..0abfa6bd 100644 - { "domain" = "qux.net" } - } -- -2.13.6 +2.14.3 diff --git a/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch b/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch index 4d10ed4..5a38e91 100644 --- a/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch +++ b/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch @@ -486,5 +486,5 @@ index b4563540..387ac7d2 100644 lens-stunnel.sh \ lens-subversion.sh \ -- -2.13.6 +2.14.3 diff --git a/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch b/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch index 0d5cbba..82c2d91 100644 --- a/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch +++ b/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch @@ -67,7 +67,7 @@ index f84a409c..21a5ce60 100644 . sep_scl . eos ] - (************************************************************************ +-(************************************************************************ - * SET STATEMENTS - *************************************************************************) -let stmt_set = [ indent @@ -81,7 +81,7 @@ index f84a409c..21a5ce60 100644 - . sep_scl - . eos ] - --(************************************************************************ + (************************************************************************ * OPTION STATEMENTS *************************************************************************) (* The general case is considering options as a list *) @@ -1746,5 +1746,5 @@ index 387ac7d2..315cac9c 100644 lens-dnsmasq.sh \ lens-dovecot.sh \ -- -2.13.6 +2.14.3 diff --git a/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch b/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch index 007bf8a..867d8e3 100644 --- a/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch +++ b/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch @@ -414,5 +414,5 @@ index 315cac9c..65d8993e 100644 lens-solaris_system.sh \ lens-soma.sh \ -- -2.13.6 +2.14.3 diff --git a/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch b/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch index 724831a..80611a5 100644 --- a/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch +++ b/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch @@ -254,5 +254,5 @@ index 65d8993e..4d2b2605 100644 lens-rsyncd.sh \ lens-rsyslog.sh \ -- -2.13.6 +2.14.3 diff --git a/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch b/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch index 7aa278e..f23a93f 100644 --- a/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch +++ b/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch @@ -25,5 +25,5 @@ index 7567772d..0437daae 100644 let parameter_flag = [ del_negate . negate_node? . key parameter_flag_kw ] -- -2.13.6 +2.14.3 diff --git a/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch b/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch index a674572..8a82ba5 100644 --- a/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch +++ b/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch @@ -158,5 +158,5 @@ index 335e7bf8..dbba29e0 100644 aug_close(aug); -- -2.13.6 +2.14.3 diff --git a/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch b/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch index c711a34..ff17889 100644 --- a/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch +++ b/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch @@ -24,5 +24,5 @@ index 4b6470f2..8775ba54 100644 char *path = NULL; const char *v; -- -2.13.6 +2.14.3 diff --git a/SOURCES/0013-Chrony-allow-signed-numbers.patch b/SOURCES/0013-Chrony-allow-signed-numbers.patch index 5280cb8..045ef5e 100644 --- a/SOURCES/0013-Chrony-allow-signed-numbers.patch +++ b/SOURCES/0013-Chrony-allow-signed-numbers.patch @@ -48,5 +48,5 @@ index c4b552eb..905ecee4 100644 { "bindcmdaddress" = "127.0.0.1" } { "bindcmdaddress" = "::1" } -- -2.13.6 +2.14.3 diff --git a/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch b/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch index 75f751f..39dafa4 100644 --- a/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch +++ b/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch @@ -48,5 +48,5 @@ index e17a659a..743bb375 100644 + { "include" = "/etc/krb5.other_conf.d/other.conf" } + { "includedir" = "/etc/krb5.conf.d/" } -- -2.13.6 +2.14.3 diff --git a/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch b/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch index 90df2d5..0ac4371 100644 --- a/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch +++ b/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch @@ -77,5 +77,5 @@ index 6cd0856d..84fd2ded 100644 + { } + -- -2.13.6 +2.14.3 diff --git a/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch b/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch index 09bb7c8..46ec4ff 100644 --- a/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch +++ b/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch @@ -51,5 +51,5 @@ index f022ef72..8a0d9f4a 100644 { "file" = "HD(1,800,64000,9895c137-d4b2-4e3b-a93b-dc9ac4)" } } { "password" = "$1$M9NLj$p2gs87vwNv48BUu.wAfVw0" -- -2.13.6 +2.14.3 diff --git a/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch b/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch new file mode 100644 index 0000000..792f600 --- /dev/null +++ b/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch @@ -0,0 +1,52 @@ +From 11a1410b32a902c4f220c5dfc20cd177e6031389 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 13 Feb 2018 07:21:55 +0100 +Subject: [PATCH] Fstab: allow leading whitespace in lines with spec (#544) + +The documentation does not explicitly mention this possibility, but +tooling that parses fstab actually supports this: hence, allow leading +whitespace in lines with filesystem specification. + +(cherry picked from commit 6ee7170cc04c934a70cbcd1caf3e5f8821806dec) +--- + lenses/fstab.aug | 1 + + lenses/tests/test_fstab.aug | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/lenses/fstab.aug b/lenses/fstab.aug +index bceaddd1..d67a3067 100644 +--- a/lenses/fstab.aug ++++ b/lenses/fstab.aug +@@ -23,6 +23,7 @@ module Fstab = + Build.opt_list lns comma + + let record = [ seq "mntent" . ++ Util.indent . + [ label "spec" . store spec ] . sep_tab . + [ label "file" . store file ] . sep_tab . + comma_sep_list "vfstype" . +diff --git a/lenses/tests/test_fstab.aug b/lenses/tests/test_fstab.aug +index fa044aea..438f619a 100644 +--- a/lenses/tests/test_fstab.aug ++++ b/lenses/tests/test_fstab.aug +@@ -11,6 +11,8 @@ module Test_fstab = + { "dump" = "1" } + { "passno" = "1" } } + ++ let leading_ws = " /dev/vg00/lv00\t /\t ext3\t defaults 1 1\n" ++ + let trailing_ws = "/dev/vg00/lv00\t /\t ext3\t defaults 1 1 \t\n" + + let gen_no_passno(passno:string) = +@@ -60,6 +62,8 @@ module Test_fstab = + + test Fstab.lns get simple = simple_tree + ++ test Fstab.lns get leading_ws = simple_tree ++ + test Fstab.lns get trailing_ws = simple_tree + + test Fstab.lns get no_passno = no_passno_tree +-- +2.14.3 + diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec index a963731..4247339 100644 --- a/SPECS/augeas.spec +++ b/SPECS/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.4.0 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: A library for changing configuration files Group: System Environment/Libraries @@ -23,6 +23,7 @@ Patch13: 0013-Chrony-allow-signed-numbers.patch Patch14: 0014-Fix-430-support-Krb5-include-dir.patch Patch15: 0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch Patch16: 0016-Grub-handle-top-level-boot-directive-494.patch +Patch17: 0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +81,7 @@ The libraries for %{name}. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 # Patches affect Makefile.am and configure.ac, so rerun autotools. autoreconf @@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Mar 28 2018 Pino Toscano - 1.4.0-5.el7_5.1 +- Fstab: allow leading whitespaces (RHBZ#1554927) + * Wed Oct 04 2017 Pino Toscano - 1.4.0-5 - Cgconfig: allow fperm & dperm in admin & task (RHBZ#1325741) - Grub: handle top-level "boot" directive (RHBZ#1484261)