Fix parsing of multipath.conf

resolves: RHEL-93649

0001-lenses-fstab.aug-Allow-comma-after-the-last-option-8.patch

@@ -1,7 +1,8 @@
 From 1cba85ead1ecf582666568e2abde06b3d7830a2f Mon Sep 17 00:00:00 2001
 From: Cosmin Tupangiu <cosmin@redhat.com>
 Date: Thu, 18 Jul 2024 13:02:20 +0200
-Subject: [PATCH] lenses/fstab.aug: Allow comma after the last option (#838)
+Subject: [PATCH 1/2] lenses/fstab.aug: Allow comma after the last option
+ (#838)
 
 This PR adds a new lens that allows a comma after the last option:
 
@@ -60,5 +61,5 @@ index 438f619a..4a912e59 100644
  (* mode: caml       *)
  (* End:             *)
 -- 
-2.43.0
+2.47.1
 

0002-lenses-multipath.aug-Support-all-possible-values-for.patch

@@ -0,0 +1,28 @@
+From 0fccb424e0ebb505fe977447144fd3b20eed138d Mon Sep 17 00:00:00 2001
+From: rwmjones <rjones@redhat.com>
+Date: Thu, 18 Jul 2024 22:51:07 +0100
+Subject: [PATCH 2/2] lenses/multipath.aug: Support all possible values for
+ find_multipaths (#835)
+
+Fixes: https://issues.redhat.com/browse/RHEL-39080
+(cherry picked from commit 6ed6a28c35d2092498f38d72efbec5ed88d9978f)
+---
+ lenses/multipath.aug | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lenses/multipath.aug b/lenses/multipath.aug
+index 9db27d02..c91f5fff 100644
+--- a/lenses/multipath.aug
++++ b/lenses/multipath.aug
+@@ -73,7 +73,7 @@ let default_setting =
+   |kv "polling_interval" Rx.integer
+   |kv "max_polling_interval" Rx.integer
+   |kv "multipath_dir" fspath
+-  |kv "find_multipaths" /yes|no/
++  |kv "find_multipaths" /on|yes|y|off|no|n|strict|greedy|smart/
+   |kv "verbosity" /[0-6]/
+   |kv "reassign_maps" /yes|no/
+   |kv "uid_attrribute" Rx.word
+-- 
+2.47.1
+

augeas.spec

@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        1.14.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library for changing configuration files
 
 License:        LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND Kazlib AND GPL-2.0-or-later AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain
@@ -14,6 +14,10 @@ Source0:        https://github.com/hercules-team/augeas/releases/download/releas
 # Upstream commit 5246ef07381033a9b20426370156dae9f8f97a2c
 Patch:          0001-lenses-fstab.aug-Allow-comma-after-the-last-option-8.patch
 
+# Fix parsing of multipath.conf
+# Upstream commit 6ed6a28c35d2092498f38d72efbec5ed88d9978f
+Patch:          0002-lenses-multipath.aug-Support-all-possible-values-for.patch
+
 Provides:       bundled(gnulib)
 
 BuildRequires:  make
@@ -161,6 +165,10 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
 %endif
 
 %changelog
+* Tue May 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-2
+- Fix parsing of multipath.conf
+  resolves: RHEL-93649
+
 * Mon Sep 02 2023 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-1
 - Rebase to Fedora Rawhide
 - Remove patches which are upstream