From f3517ba2ad1882dc878a7f44395309c227e86683 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 06 2021 20:09:05 +0000 Subject: import augeas-1.12.0-6.el8 --- diff --git a/SOURCES/0001-Grub-support-in-kernel-command-line-option-names-647.patch b/SOURCES/0001-Grub-support-in-kernel-command-line-option-names-647.patch index 9fa5246..7b60bff 100644 --- a/SOURCES/0001-Grub-support-in-kernel-command-line-option-names-647.patch +++ b/SOURCES/0001-Grub-support-in-kernel-command-line-option-names-647.patch @@ -54,5 +54,5 @@ index 75657203..e50bdc4f 100644 test Grub.lns get "default=0\ncrud=no\n" = { "default" = "0" } -- -2.24.1 +2.29.2 diff --git a/SOURCES/0002-Rsyslog-support-multiple-actions-in-filters-and-sele.patch b/SOURCES/0002-Rsyslog-support-multiple-actions-in-filters-and-sele.patch index 26045d1..1746c94 100644 --- a/SOURCES/0002-Rsyslog-support-multiple-actions-in-filters-and-sele.patch +++ b/SOURCES/0002-Rsyslog-support-multiple-actions-in-filters-and-sele.patch @@ -90,5 +90,5 @@ index 9011a2b3..e83613a2 100644 + { } + -- -2.24.1 +2.29.2 diff --git a/SOURCES/0003-src-augrun.c-nexttoken-add-more-escape-characters.patch b/SOURCES/0003-src-augrun.c-nexttoken-add-more-escape-characters.patch index 3f34bda..892159e 100644 --- a/SOURCES/0003-src-augrun.c-nexttoken-add-more-escape-characters.patch +++ b/SOURCES/0003-src-augrun.c-nexttoken-add-more-escape-characters.patch @@ -33,5 +33,5 @@ index 07f865a9..fd710c5f 100644 break; case 't': /* insert tab */ -- -2.24.1 +2.29.2 diff --git a/SOURCES/0004-src-augtool.c-hopefully-fix-readline-quoting-issues.patch b/SOURCES/0004-src-augtool.c-hopefully-fix-readline-quoting-issues.patch index c76fdb4..a6c425b 100644 --- a/SOURCES/0004-src-augtool.c-hopefully-fix-readline-quoting-issues.patch +++ b/SOURCES/0004-src-augtool.c-hopefully-fix-readline-quoting-issues.patch @@ -38,5 +38,5 @@ index b42ef630..31a991eb 100644 /* Set up persistent history */ char *home_dir = get_home_dir(getuid()); -- -2.24.1 +2.29.2 diff --git a/SOURCES/0005-Krb5-improve-dbmodules-and-includes-630.patch b/SOURCES/0005-Krb5-improve-dbmodules-and-includes-630.patch index 283490d..b310c8b 100644 --- a/SOURCES/0005-Krb5-improve-dbmodules-and-includes-630.patch +++ b/SOURCES/0005-Krb5-improve-dbmodules-and-includes-630.patch @@ -129,5 +129,5 @@ index f746543b..10b87605 100644 + { "db_module_dir" = "/some/path" } + } -- -2.24.1 +2.29.2 diff --git a/SOURCES/0006-Systemd-fix-parsing-of-envvars-with-spaces-659.patch b/SOURCES/0006-Systemd-fix-parsing-of-envvars-with-spaces-659.patch index 65be7da..cfb0439 100644 --- a/SOURCES/0006-Systemd-fix-parsing-of-envvars-with-spaces-659.patch +++ b/SOURCES/0006-Systemd-fix-parsing-of-envvars-with-spaces-659.patch @@ -55,5 +55,5 @@ index 3397456e..19c57075 100644 (* Variable: unit *) -- -2.24.1 +2.29.2 diff --git a/SOURCES/0007-Ssh-add-Match-keyword-support-695.patch b/SOURCES/0007-Ssh-add-Match-keyword-support-695.patch new file mode 100644 index 0000000..cd6178f --- /dev/null +++ b/SOURCES/0007-Ssh-add-Match-keyword-support-695.patch @@ -0,0 +1,85 @@ +From 0880cf38e5c9a6a9ddb3ce4cae372dec5ad34cbe Mon Sep 17 00:00:00 2001 +From: granquet +Date: Tue, 6 Oct 2020 23:03:18 +0200 +Subject: [PATCH] Ssh: add Match keyword support (#695) + +Signed-off-by: Guillaume Ranquet +--- + lenses/ssh.aug | 19 +++++++++++++++++-- + lenses/tests/test_ssh.aug | 12 ++++++++++++ + 2 files changed, 29 insertions(+), 2 deletions(-) + +diff --git a/lenses/ssh.aug b/lenses/ssh.aug +index 4e731581..c140c9a9 100644 +--- a/lenses/ssh.aug ++++ b/lenses/ssh.aug +@@ -92,7 +92,7 @@ module Ssh = + | rekey_limit + + let key_re = /[A-Za-z0-9]+/ +- - /SendEnv|Host|ProxyCommand|RemoteForward|LocalForward|MACs|Ciphers|(HostKey|Kex)Algorithms|PubkeyAcceptedKeyTypes|GlobalKnownHostsFile|RekeyLimit/i ++ - /SendEnv|Host|Match|ProxyCommand|RemoteForward|LocalForward|MACs|Ciphers|(HostKey|Kex)Algorithms|PubkeyAcceptedKeyTypes|GlobalKnownHostsFile|RekeyLimit/i + + + let other_entry = [ indent . key key_re +@@ -105,11 +105,26 @@ module Ssh = + let host = [ key /Host/i . spc . value_to_eol . eol . entry* ] + + ++ let condition_entry = ++ let value = store /[^ \t\r\n=]+/ in ++ [ spc . key /[A-Za-z0-9]+/ . spc . value ] ++ ++ let match_cond = ++ [ label "Condition" . condition_entry+ . eol ] ++ ++ let match_entry = entry ++ ++ let match = ++ [ key /Match/i . match_cond ++ . [ label "Settings" . match_entry+ ] ++ ] ++ ++ + (************************************************************************ + * Group: LENS + *************************************************************************) + +- let lns = entry* . host* ++ let lns = entry* . (host | match)* + + let xfm = transform lns (incl "/etc/ssh/ssh_config" . + incl (Sys.getenv("HOME") . "/.ssh/config") . +diff --git a/lenses/tests/test_ssh.aug b/lenses/tests/test_ssh.aug +index f5fca252..456624e4 100644 +--- a/lenses/tests/test_ssh.aug ++++ b/lenses/tests/test_ssh.aug +@@ -5,6 +5,9 @@ module Test_ssh = + "# start + IdentityFile /etc/ssh/identity.asc + ++Match final all ++ GSSAPIAuthentication yes ++ + Host suse.cz + ForwardAgent yes + SendEnv LC_LANG +@@ -30,6 +33,15 @@ PubkeyAcceptedKeyTypes ssh-ed25519-cert-v01@openssh.com,ssh-ed25519,ssh-rsa-cert + { "#comment" = "start" } + { "IdentityFile" = "/etc/ssh/identity.asc" } + { } ++ { "Match" ++ { "Condition" ++ { "final" = "all" } ++ } ++ { "Settings" ++ { "GSSAPIAuthentication" = "yes" } ++ { } ++ } ++ } + { "Host" = "suse.cz" + { "ForwardAgent" = "yes" } + { "SendEnv" +-- +2.29.2 + diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec index a4bf7fb..b8456a0 100644 --- a/SPECS/augeas.spec +++ b/SPECS/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch3: 0003-src-augrun.c-nexttoken-add-more-escape-characters.patch Patch4: 0004-src-augtool.c-hopefully-fix-readline-quoting-issues.patch Patch5: 0005-Krb5-improve-dbmodules-and-includes-630.patch Patch6: 0006-Systemd-fix-parsing-of-envvars-with-spaces-659.patch +Patch7: 0007-Ssh-add-Match-keyword-support-695.patch BuildRequires: readline-devel libselinux-devel libxml2-devel BuildRequires: autoconf, automake @@ -119,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Jan 05 2021 Pino Toscano - 1.12.0-6 +- Ssh: parse Match options (RHBZ#1716359) + * Mon Feb 10 2020 Pino Toscano - 1.12.0-5 - Fix completion with special characters in augtool. (RHBZ#1232224) - Krb5: improve handling of [dbmodules]; allow include/includedir directives