diff --git a/SOURCES/0021-krb5.aug-Support-realms-that-start-with-numbers-437.patch b/SOURCES/0021-krb5.aug-Support-realms-that-start-with-numbers-437.patch index c3ecb7d..a814e78 100644 --- a/SOURCES/0021-krb5.aug-Support-realms-that-start-with-numbers-437.patch +++ b/SOURCES/0021-krb5.aug-Support-realms-that-start-with-numbers-437.patch @@ -1,4 +1,4 @@ -From c4cd5e62e02b0e02b4135b69cda285e7e6095c9b Mon Sep 17 00:00:00 2001 +From b358a58ecfade3541694edcdffaf4068d96cf91e Mon Sep 17 00:00:00 2001 From: Dustin Wheeler Date: Mon, 6 Feb 2017 08:57:49 -0500 Subject: [PATCH] [krb5.aug] Support realms that start with numbers (#437) diff --git a/SOURCES/0022-Added-more-pkinit_-options.patch b/SOURCES/0022-Added-more-pkinit_-options.patch index e8fc449..a366323 100644 --- a/SOURCES/0022-Added-more-pkinit_-options.patch +++ b/SOURCES/0022-Added-more-pkinit_-options.patch @@ -1,4 +1,4 @@ -From a7666aa3abcb872d4e5f169d4c6d9d60c3fc103e Mon Sep 17 00:00:00 2001 +From 5ceebeb1d8a7c048ad6744d07320f5538aae69a0 Mon Sep 17 00:00:00 2001 From: "Jason A. Smith" Date: Tue, 8 Jan 2019 11:26:38 -0500 Subject: [PATCH] Added more pkinit_* options. diff --git a/SOURCES/0023-Krb5-improve-dbmodules-and-includes-630.patch b/SOURCES/0023-Krb5-improve-dbmodules-and-includes-630.patch index af86d6c..4019ddb 100644 --- a/SOURCES/0023-Krb5-improve-dbmodules-and-includes-630.patch +++ b/SOURCES/0023-Krb5-improve-dbmodules-and-includes-630.patch @@ -1,4 +1,4 @@ -From 465bc2e4920cf9237867ef18104845a071d8a74f Mon Sep 17 00:00:00 2001 +From 88cde0890c817bb66a64e32f970a7e6aa0cf53cf Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 4 Feb 2020 17:54:22 +0100 Subject: [PATCH] Krb5: improve [dbmodules] and includes (#630) diff --git a/SOURCES/0024-Grub-support-in-kernel-command-line-option-names-647.patch b/SOURCES/0024-Grub-support-in-kernel-command-line-option-names-647.patch new file mode 100644 index 0000000..cf6dc83 --- /dev/null +++ b/SOURCES/0024-Grub-support-in-kernel-command-line-option-names-647.patch @@ -0,0 +1,56 @@ +From c7f1cdda4e2d5e6728656ed5142c7e1399eea1da Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Wed, 23 Oct 2019 11:35:57 +0200 +Subject: [PATCH] Grub: support '+' in kernel command line option names (#647) + +This way it is possible to parse files that pass options with '+' in the +name to the kernel. +--- + lenses/grub.aug | 2 +- + lenses/tests/test_grub.aug | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/lenses/grub.aug b/lenses/grub.aug +index f99a3a92..804e9051 100644 +--- a/lenses/grub.aug ++++ b/lenses/grub.aug +@@ -196,7 +196,7 @@ module Grub = + (* View: kernel_args + Parse the file name and args on a kernel or module line. *) + let kernel_args = +- let arg = /[A-Za-z0-9_.$-]+/ - /type|no-mem-option/ in ++ let arg = /[A-Za-z0-9_.$\+-]+/ - /type|no-mem-option/ in + store /(\([a-z0-9,]+\))?\/[^ \t\n]*/ . + (spc . multiboot_arg)? . + (spc . [ key arg . (eq. store /([^ \t\n])*/)?])* . eol +diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug +index 75657203..e50bdc4f 100644 +--- a/lenses/tests/test_grub.aug ++++ b/lenses/tests/test_grub.aug +@@ -258,6 +258,23 @@ password --encrypted ^9^32kwzzX./3WISQ0C /boot/grub/custom.lst + { "md5" } + } } + ++ (* Test kernel options with different special characters. *) ++ test Grub.lns get "title Fedora (2.6.24.4-64.fc8) ++ root (hd0,0) ++ kernel /vmlinuz-2.6.24.4-64.fc8 ro root=/dev/vg00/lv00 with.dot=1 with-dash=1 with_underscore=1 with+plus=1 ++ initrd /initrd-2.6.24.4-64.fc8.img\n" = ++ { "title" = "Fedora (2.6.24.4-64.fc8)" ++ { "root" = "(hd0,0)" } ++ { "kernel" = "/vmlinuz-2.6.24.4-64.fc8" ++ { "ro" } ++ { "root" = "/dev/vg00/lv00" } ++ { "with.dot" = "1" } ++ { "with-dash" = "1" } ++ { "with_underscore" = "1" } ++ { "with+plus" = "1" } ++ } ++ { "initrd" = "/initrd-2.6.24.4-64.fc8.img" } } ++ + (* Test parsing of invalid entries via menu_error *) + test Grub.lns get "default=0\ncrud=no\n" = + { "default" = "0" } +-- +2.24.1 + diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec index f1fb7aa..384e9fb 100644 --- a/SPECS/augeas.spec +++ b/SPECS/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.4.0 -Release: 9%{?dist}.1 +Release: 10%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -30,6 +30,7 @@ Patch20: 0020-New-lens-Anaconda-597.patch Patch21: 0021-krb5.aug-Support-realms-that-start-with-numbers-437.patch Patch22: 0022-Added-more-pkinit_-options.patch Patch23: 0023-Krb5-improve-dbmodules-and-includes-630.patch +Patch24: 0024-Grub-support-in-kernel-command-line-option-names-647.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,6 +97,7 @@ The libraries for %{name}. %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 # Patches affect Makefile.am and configure.ac, so rerun autotools. autoreconf @@ -157,10 +159,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog -* Tue Mar 17 2020 Pino Toscano - 1.4.0-9.el7_8.1 +* Wed Feb 05 2020 Pino Toscano - 1.4.0-10 - Krb5: support realms that start with numbers; add more pkinit_* options; improve handling of [dbmodules]; allow include/includedir directives - everywhere (RHBZ#1799022) + everywhere (RHBZ#1670420) +- Grub: handle '+' in kernel command line options (RHBZ#1758357) * Wed Dec 19 2018 Pino Toscano - 1.4.0-9 - Add "Provides: bundled(gnulib)" to augeas-libs, as it embeds gnulib