From 37a2979a41ed831b3e1ea67065fd4ab25847bbee Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 19 May 2026 19:08:08 -0400
Subject: [PATCH] import UBI augeas-1.14.2-0.9.20260120gitf4135e3.el10

---
 .gitignore  |  2 +-
 augeas.spec | 32 +++++++++++++++++++-------------
 sources     |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2b826f..8830381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-augeas-6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d.tar.gz
+augeas-f4135e3496fbc80597942acf60d90391444b1e5b.tar.gz
 gnulib-2f7479a16a.tar.gz
diff --git a/augeas.spec b/augeas.spec
index 60ad2cf..2a5d0c2 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -4,27 +4,26 @@ 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
 
 # Upstream Augeas is missing several important fixes which affect
-# Fedora.  For this reason I have taken the regrettable but hopefully
-# temporary step of forking upstream with some extra patches, here:
-# https://github.com/rwmjones/augeas/tree/fedora-43
-
-# Based on:
-#%%global forgeurl https://github.com/hercules-team/%%{name}
-#%%global commit cd37b0945385705afb936caa9d2fd9a7388bb441
-
-# But actually:
-%global forgeurl https://github.com/rwmjones/%{name}
-%global commit 6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d
+# Fedora.  For this reason we have soft-forked augeas, here:
+# https://github.com/rwmjones/augeas
+# See also:
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/J7SM6NLIMPU7J4LIRBDPTPWVXOKZWWEH/
+# %%global forgeurl https://github.com/hercules-team/augeas
+# %%global commit af2aa88ab37fc48167d8c5e43b1770a4ba2ff403
+%global forgeurl https://github.com/rwmjones/augeas
+%global commit f4135e3496fbc80597942acf60d90391444b1e5b
 %forgemeta
 
-Release:        0.3%{?dist}
+Release:        0.9%{?dist}
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
 # The problem with packaging from the upstream git repo is that we
 # need to provide our own gnulib submodule.  I created this by doing:
-# git archive --format=tar --prefix=.gnulib/ HEAD | gzip -9 > gnulib-2f7479a16a.tar.gz
+# (cd .gnulib && git archive --format=tar --prefix=.gnulib/ HEAD) |
+#   gzip -9 > gnulib-2f7479a16a.tar.gz
 Source1:        gnulib-2f7479a16a.tar.gz
+
 Provides:       bundled(gnulib)
 
 BuildRequires:  autoconf, automake, libtool
@@ -200,6 +199,13 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
 %endif
 
 %changelog
+* Tue Jan 20 2026 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0.9
+- Fix: fails to parse /etc/fstab when there is a double comma after character
+  resolves: RHEL-77279
+- Fix: fails to parse /etc/iproute2/README and /usr/share/iproute2/
+  resolves: RHEL-113748
+- Synchronize spec file with Fedora
+
 * Mon Feb 24 2025 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0.3
 - lenses/tmpfiles.aug: Permit '$' character in /usr/lib/tmpfiles.d/*.conf
   resolves: RHEL-76283
diff --git a/sources b/sources
index f2aaa93..5f66976 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (augeas-6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d.tar.gz) = 80b57a354c08ca8f9ffa47d7ec2e17121cfe336b1d24306d4c5a2b1c0198dc430ca7e5aec7044b623f5f77e61f690ba87fa1210457b20cb920c2e5a4a2395c18
+SHA512 (augeas-f4135e3496fbc80597942acf60d90391444b1e5b.tar.gz) = c80e43e7e06ac5ad95483d5b335420aba2d973fb53a3e61c4258c982dfd21d0656c034e937417c32d2a4d186743ff9e0916642dd3b42c086a27d54d4cc6d5a50
 SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee