Compare commits

...
Sign in to create a new pull request.

54 commits

Author SHA1 Message Date
Fedora Release Engineering
a380e1bbb3 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 04:08:32 +00:00
Fedora Release Engineering
4a848504d1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:26:21 +00:00
Richard W.M. Jones
9bd07d96d2 Rebase our branch on top of Augeas
Use patches to make it clearer what we are adding on top of upstream.
2025-04-15 10:07:10 +01:00
Alexander Bokovoy
f3e7924e2b CVE-2025-2588: crash in parsing incorrect regexps
Upstream fix: https://github.com/hercules-team/augeas/pull/854

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
2025-03-24 10:25:12 +00:00
Alexander Bokovoy
22dafcce62 Make sure the test environment has enough autotools to unpack sources
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
2025-03-24 10:22:28 +00:00
Richard W.M. Jones
0feae87a31 Move to fork of Augeas which contains a small number of PRs:
- lenses/tmpfiles.aug: Permit '$' character in /usr/lib/tmpfiles.d/*.conf
- lenses/multipath.aug: Support all possible values for find_multipaths
- lenses/systemd.aug: Allow "+"(fullprivileges) command flag
2025-02-24 17:14:42 +00:00
Fedora Release Engineering
5b331883b1 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 11:57:59 +00:00
Richard W.M. Jones
01a173e9ab Move to latest upstream
Use forge macros
Run autoreconf unconditionally
Fix bash-completion-devel test
Fix chrony.conf option leapseclist unsupported (RHBZ#2309439)
2024-09-03 17:26:37 +01:00
Fedora Release Engineering
bf2fde2d5a Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 17:49:10 +00:00
Richard W.M. Jones
2bcc944549 New upstream version 1.14.1
Use github tarballs again.
New binary augprint.
New bash-completions subpackage.
2024-07-04 10:03:25 +01:00
Fedora Release Engineering
48481a49de Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 23:50:19 +00:00
Fedora Release Engineering
896783aaa0 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 13:54:11 +00:00
Daniel P. Berrangé
dbdc2f2210 Convert license to SPDX format
Note the BSD-2-Clause and GPL-2.0-or-later references are from lenses
whose license is unclear. This is reported upstream at

  https://github.com/hercules-team/augeas/issues/816

where BSD-2-Clause was suggested and confirmed by the author. The
GPL-2.0-or-later was picked for the unspecified GPL version based
on discussion at:

  https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/WMN4OKQOQLCKMRMIHOJ5XHJAT4QEF5LY/

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2023-09-19 13:12:45 +01:00
Fedora Release Engineering
0c15ccdc13 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 14:07:21 +00:00
Fedora Release Engineering
270e8512ec Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 22:27:08 +00:00
Fedora Release Engineering
502bc87ad6 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 21:32:57 +00:00
Fedora Release Engineering
dddf81d0af - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 21:55:48 +00:00
Richard W.M. Jones
3b2b3a7c3b New upstream version 1.13.0 2022-01-12 17:46:04 +00:00
Fedora Release Engineering
23306663d3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 18:12:09 +00:00
Fedora Release Engineering
3850ab0bfe - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 13:16:05 +00:00
Richard W.M. Jones
104273aa55 Package up a git pre-release of 1.12.1 or 1.13.0. 2021-07-06 17:52:39 +01:00
Richard W.M. Jones
dfd02f7fb4 Add gating tests (for RHEL) 2021-06-23 10:55:23 +01:00
Richard W.M. Jones
1030ff3001 Add upstream patch to parse chrony configuration.
Use %autosetup.
2021-04-15 13:09:37 +01:00
Fedora Release Engineering
46672e4837 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 00:44:38 +00:00
Tom Stellard
23775ebe86 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-17 02:34:07 +00:00
Fedora Release Engineering
97082e770d - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 12:42:13 +00:00
Fedora Release Engineering
994c3ecec0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 12:26:53 +00:00
Fedora Release Engineering
967ed1df92 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 18:47:34 +00:00
Richard W.M. Jones
4ef0afb703 New upstream release 1.12.0. 2019-04-15 08:56:27 +01:00
Richard W.M. Jones
e39253519c Tests disabled because gnulib tests fail see:
https://bugzilla.redhat.com/show_bug.cgi?id=1674672
2019-03-04 17:14:03 +00:00
Igor Gnatenko
da110766eb Rebuild for readline 8.0 2019-02-17 09:30:49 +01:00
Fedora Release Engineering
90f64b73f8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 14:09:50 +00:00
Igor Gnatenko
bff2c73d25 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:23:56 +01:00
Igor Gnatenko
db181ff911
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:38:32 +01:00
Richard W.M. Jones
dde0433822 Augeas uses gnulib, add the correct 'Provides' line. 2018-11-26 11:15:19 +00:00
Richard W.M. Jones
be72301a26 New upstream version 1.11.0. 2018-08-28 10:56:21 +01:00
Fedora Release Engineering
a14bc51fff - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 20:46:40 +00:00
Jason Tibbitts
33807a7442 Remove needless use of %defattr 2018-07-10 00:14:45 -05:00
Igor Gnatenko
a2f83e00af add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:42 +02:00
Igor Gnatenko
baefb5cb92
Remove %clean section
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-14 07:52:02 +01:00
Fedora Release Engineering
729e18bb74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 03:19:02 +00:00
David Lutterkort
1f39b7b505 Upstream version 1.10.1 2018-01-29 13:34:20 +01:00
Richard W.M. Jones
2bc28062b0 New upstream version 1.10.0 (RHBZ#1538846). 2018-01-26 15:32:00 +00:00
David Lutterkort
a48d622547 New upstream version 1.9.0
New upstream version 1.9.0 (RHBZ#1482713)
Add -static subpackage (RHBZ#1405600)
2017-11-21 15:59:39 -08:00
Richard W.M. Jones
8231c3d544 New upstream version 1.8.1.
Fixes CVE-2017-7555 (RHBZ#1482340).
2017-08-24 15:02:42 +01:00
Fedora Release Engineering
7efdf07137 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 17:59:36 +00:00
Fedora Release Engineering
a3b1275467 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 03:33:29 +00:00
Dominic Cleal
62ecc80b42
Disable gnulib test-lock, which hangs during check
Related to BZ#1410052, BZ#1406031, and
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQD576JZLERFY6ROI3GF7UYXKZIRI33G/
2017-03-23 12:50:14 +00:00
Dominic Cleal
79693543fc
Update to 1.8.0 2017-03-21 08:08:49 +00:00
Fedora Release Engineering
e38ca9cbda - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 06:33:35 +00:00
Igor Gnatenko
a51d9bd0ae Rebuild for readline 7.x
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2017-01-12 17:30:24 +01:00
Richard W.M. Jones
487980e443 riscv64: Disable gnulib tests on riscv64 architecture.
locking test fails with:

../../build/ac-aux/test-driver: line 107: 26972 Aborted                 "$@" > $log_file 2>&1
FAIL: test-lock

which is probably a riscv64 kernel bug, but is irrelevant for Augeas.
2016-11-12 11:04:23 +00:00
Dominic Cleal
fdaeb4fd57
Update to 1.7.0 2016-11-09 08:44:47 +00:00
Dominic Cleal
c6c1a8cc29
Update to 1.6.0 2016-08-08 13:34:05 +01:00
9 changed files with 485 additions and 24 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/.build-*.log
/augeas-*.tar.gz
/gnulib-*.tar.gz
/clog

View file

@ -0,0 +1,51 @@
From 9e26cf6459295908afd002f70bb257eb8136269a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Feb 2025 11:10:53 +0000
Subject: [PATCH 1/2] lenses/fstab.aug: Tighten parsing of the vfstype field
This can be a list, but there's no evidence in the manual that
vfstype=value is permitted, it's just a simple list of strings.
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
lenses/fstab.aug | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/lenses/fstab.aug b/lenses/fstab.aug
index c653c489..69c1b955 100644
--- a/lenses/fstab.aug
+++ b/lenses/fstab.aug
@@ -14,10 +14,19 @@ module Fstab =
let file = /[^# \t\n]+/
- (* An option label can't contain comma, comment, equals, or space *)
- let optlabel = /[^,#= \n\t]+/
let spec = /[^,# \n\t][^ \n\t]*/
+ (* A vfstype, usually just a short string like "ext3" or "fuse.sshfs", but
+ be generous here *)
+ let vfslabel = /[^,#= \n\t]+/
+
+ let vfstype_list (l:string) =
+ let lns = [ label l . store vfslabel ] in
+ Build.opt_list lns comma
+
+ (* A mount option label can't contain comma, comment, equals, or space *)
+ let optlabel = /[^,#= \n\t]+/
+
let comma_sep_list (l:string) =
let value = [ label "value" . Util.del_str "=" . ( store Rx.neg1 )? ] in
let lns = [ label l . store optlabel . value? ] in
@@ -27,7 +36,7 @@ module Fstab =
Util.indent .
[ label "spec" . store spec ] . sep_tab .
[ label "file" . store file ] . sep_tab .
- comma_sep_list "vfstype" .
+ vfstype_list "vfstype" .
(sep_tab . comma_sep_list "opt" .
(sep_comma_tab . [ label "dump" . store /[0-9]+/ ] .
( sep_spc . [ label "passno" . store /[0-9]+/ ])? )? )?
--
2.49.0

View file

@ -0,0 +1,77 @@
From 80ae0fd68a33541483e21f871b83f9e3d78c9831 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Feb 2025 10:33:31 +0000
Subject: [PATCH 2/2] lenses/fstab.aug: Allow individual mount options to be
empty
Mount allows mount-option fields to be empty (I think it ignores
them), but augeas gave an error. Allow this to be parsed. This does
not preserve the empty option on write, but that should not change the
meaning of the entry.
Example:
/dev/mapper/vg00-vartmp /var/tmp xfs rw,,nodev,nosuid,noexec,relatime 0 0
Fixes: https://issues.redhat.com/browse/RHEL-77279
Fixes: https://github.com/hercules-team/augeas/issues/832
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
lenses/fstab.aug | 10 +++++-----
lenses/tests/test_fstab.aug | 12 ++++++++++++
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/lenses/fstab.aug b/lenses/fstab.aug
index 69c1b955..ad2ee106 100644
--- a/lenses/fstab.aug
+++ b/lenses/fstab.aug
@@ -25,19 +25,19 @@ module Fstab =
Build.opt_list lns comma
(* A mount option label can't contain comma, comment, equals, or space *)
- let optlabel = /[^,#= \n\t]+/
+ let mntoptlabel = /[^,#= \n\t]+/
- let comma_sep_list (l:string) =
+ let mntopt_list (l:string) =
let value = [ label "value" . Util.del_str "=" . ( store Rx.neg1 )? ] in
- let lns = [ label l . store optlabel . value? ] in
- Build.opt_list lns comma
+ let lns = [ label l . store mntoptlabel . value? ] in
+ Build.opt_list lns comma+
let record = [ seq "mntent" .
Util.indent .
[ label "spec" . store spec ] . sep_tab .
[ label "file" . store file ] . sep_tab .
vfstype_list "vfstype" .
- (sep_tab . comma_sep_list "opt" .
+ (sep_tab . mntopt_list "opt" .
(sep_comma_tab . [ label "dump" . store /[0-9]+/ ] .
( sep_spc . [ label "passno" . store /[0-9]+/ ])? )? )?
. Util.comment_or_eol ]
diff --git a/lenses/tests/test_fstab.aug b/lenses/tests/test_fstab.aug
index 4a912e59..b526c088 100644
--- a/lenses/tests/test_fstab.aug
+++ b/lenses/tests/test_fstab.aug
@@ -167,6 +167,18 @@ module Test_fstab =
{ "passno" = "0" }
}
+ (* RHEL-77279 - Allow empty option *)
+ test Fstab.lns get "/dev/mapper/foo-bar / xfs rw,,nodev 0 0\n" =
+ { "1"
+ { "spec" = "/dev/mapper/foo-bar" }
+ { "file" = "/" }
+ { "vfstype" = "xfs" }
+ { "opt" = "rw" }
+ { "opt" = "nodev" }
+ { "dump" = "0" }
+ { "passno" = "0" }
+ }
+
(* Local Variables: *)
(* mode: caml *)
(* End: *)
--
2.49.0

View file

@ -1,16 +1,43 @@
Name: augeas
Version: 1.5.0
Release: 1%{?dist}
Version: 1.14.2
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
Group: System Environment/Libraries
License: LGPLv2+
URL: http://augeas.net/
Source0: http://download.augeas.net/%{name}-%{version}.tar.gz
%global forgeurl https://github.com/hercules-team/%%{name}
%global commit af2aa88ab37fc48167d8c5e43b1770a4ba2ff403
%forgemeta
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Release: 0.7%{?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
Source1: gnulib-2f7479a16a.tar.gz
# 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
Patch: 0001-lenses-fstab.aug-Tighten-parsing-of-the-vfstype-fiel.patch
Patch: 0002-lenses-fstab.aug-Allow-individual-mount-options-to-b.patch
Provides: bundled(gnulib)
BuildRequires: autoconf, automake, libtool
BuildRequires: make
BuildRequires: gcc
BuildRequires: flex
BuildRequires: bison
BuildRequires: readline-devel
BuildRequires: libselinux-devel
BuildRequires: libxml2-devel
BuildRequires: bash-completion
%if 0%{?fedora} > 40 || 0%{?rhel} > 10
BuildRequires: bash-completion-devel
%endif
BuildRequires: readline-devel libselinux-devel libxml2-devel
Requires: %{name}-libs = %{version}-%{release}
%description
@ -25,7 +52,6 @@ format and the transformation into a tree.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
@ -36,7 +62,6 @@ developing applications that use %{name}.
%package libs
Summary: Libraries for %{name}
Group: System Environment/Libraries
%description libs
The libraries for %{name}.
@ -46,18 +71,72 @@ configuration files into a tree structure, which it exposes through its
public API. Changes made through the API are written back to the initially
read files.
%package static
Summary: Static libraries for %{name}
Requires: %{name}-devel = %{version}-%{release}
%description static
The %{name}-static package contains static libraries needed to produce
static builds using %{name}.
%package bash-completion
Summary: Bash tab-completion for %{name}
BuildArch: noarch
Requires: bash-completion >= 2.0
# Don't use _isa here because it's a noarch package. This dependency
# is just to ensure that the subpackage is updated along with augeas.
Requires: %{name} = %{version}-%{release}
%description bash-completion
Install this package if you want intelligent bash tab-completion
for %{name}.
%prep
%setup -q
%forgeautosetup -p1
zcat %{SOURCE1} | tar xf -
# Copied from upstream ./bootstrap:
modules='argz fnmatch getline getopt-gnu gitlog-to-changelog
canonicalize-lgpl isblank locale mkstemp regex safe-alloc selinux-h
stpcpy stpncpy strchrnul strndup sys_wait vasprintf'
.gnulib/gnulib-tool \
--lgpl=2 \
--with-tests \
--m4-base=gnulib/m4 \
--source-base=gnulib/lib \
--tests-base=gnulib/tests \
--aux-dir=build/ac-aux \
--libtool \
--quiet \
--import $modules
autoreconf -fiv
%build
%configure --disable-static
make %{?_smp_mflags}
%configure \
%ifarch riscv64
--disable-gnulib-tests \
%endif
--enable-static
# Disable _smp_mflags because parallel tests fail with the git version
# because it tries to run lex and yacc in parallel even though lex
# depends on parser.h from yacc.
# https://github.com/hercules-team/augeas/issues/572
#make %%{?_smp_mflags}
make
%check
# Disable test-preserve.sh SELinux testing. This fails when run under mock due
# to differing SELinux labelling.
export SKIP_TEST_PRESERVE_SELINUX=1
# Tests disabled because gnulib tests fail see:
# https://bugzilla.redhat.com/show_bug.cgi?id=1674672
make %{?_smp_mflags} check || {
echo '===== tests/test-suite.log ====='
cat tests/test-suite.log
@ -73,38 +152,194 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# so it shouldn't be packaged.
rm -r $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/tests
%clean
rm -rf $RPM_BUILD_ROOT
# In 1.9.0, the example /usr/bin/dump gets installed inadvertently
rm -f $RPM_BUILD_ROOT/usr/bin/dump
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%ldconfig_scriptlets libs
%files
%defattr(-,root,root,-)
%{_bindir}/augtool
%{_bindir}/augmatch
%{_bindir}/augparse
%{_bindir}/augprint
%{_bindir}/augtool
%{_bindir}/fadot
%doc %{_mandir}/man1/*
%{_datadir}/vim/vimfiles/syntax/augeas.vim
%{_datadir}/vim/vimfiles/ftdetect/augeas.vim
%files libs
%defattr(-,root,root,-)
# %{_datadir}/augeas and %{_datadir}/augeas/lenses are owned
# _datadir/augeas and _datadir/augeas/lenses are owned
# by filesystem.
%{_datadir}/augeas/lenses/dist
%{_libdir}/*.so.*
%doc AUTHORS COPYING NEWS
%files devel
%defattr(-,root,root,-)
%doc
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/augeas.pc
%files static
%{_libdir}/libaugeas.a
%{_libdir}/libfa.a
%files bash-completion
%if 0%{?fedora} > 40 || 0%{?rhel} > 10
%dir %{bash_completions_dir}
%{bash_completions_dir}/augmatch
%{bash_completions_dir}/augprint
%{bash_completions_dir}/augtool
%else
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/augmatch
%{_datadir}/bash-completion/completions/augprint
%{_datadir}/bash-completion/completions/augtool
%endif
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-0.7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-0.6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Apr 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0.5
- Rebase our branch on top of Augeas
- Use patches to make it clearer what we are adding on top of upstream.
* Mon Mar 24 2025 Alexander Bokovoy <abokovoy@redhat.com> - 1.14.2-0.4
- rhbz#235444: CVE-2025-2588
* Mon Feb 24 2025 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0.3
- Move to fork of Augeas which contains a small number of PRs:
- lenses/tmpfiles.aug: Permit '$' character in /usr/lib/tmpfiles.d/*.conf
- lenses/multipath.aug: Support all possible values for find_multipaths
- lenses/systemd.aug: Allow "+"(fullprivileges) command flag
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-0.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Sep 03 2024 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0
- Move to latest upstream
- Use forge macros
- Run autoreconf unconditionally
- Fix bash-completion-devel test
- Fix chrony.conf option leapseclist unsupported (RHBZ#2309439)
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jul 04 2024 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-1
- New upstream version 1.14.1
- Use github tarballs again.
- New binary augprint.
- New bash-completions subpackage.
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.0-1
- New upstream version 1.13.0
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-0.2.git18558bb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jul 06 2021 Richard W.M. Jones <rjones@redhat.com> - 1.12.1-0.1
- Package up a git pre-release of 1.12.1 or 1.13.0.
* Thu Apr 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.12.0-6
- Add upstream patch to parse chrony configuration.
- Use %%autosetup.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Apr 15 2019 Richard W.M. Jones <rjones@redhat.com> - 1.12.0-1
- New upstream release 1.12.0.
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.11.0-4
- Rebuild for readline 8.0
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.11.0-2
- Augeas uses gnulib, add the correct 'Provides' line.
* Tue Aug 28 2018 Richard W.M. Jones <rjones@redhat.com> - 1.11.0-1
- New upstream version 1.11.0.
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 29 2018 David Lutterkort <lutter@watzmann.net> - 1.10.1-1
- New upstream version 1.10.1
* Fri Jan 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.10.0-1
- New upstream version 1.10.0 (RHBZ#1538846).
- Remove upstream patch.
- New tool augmatch.
* Tue Nov 21 2017 David Lutterkort <lutter@watzmann.net> - 1.9.0
- New upstream version 1.9.0 (RHBZ#1482713)
- Add -static subpackage (RHBZ#1405600)
* Thu Aug 24 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-1
- New upstream version 1.8.1.
- Fixes CVE-2017-7555 (RHBZ#1482340).
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Mar 21 2017 Dominic Cleal <dominic@cleal.org> - 1.8.0-1
- Update to 1.8.0
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.7.0-3
- Rebuild for readline 7.x
* Sat Nov 12 2016 Richard W.M. Jones <rjones@redhat.com> - 1.7.0-2
- riscv64: Disable gnulib tests on riscv64 architecture.
* Wed Nov 09 2016 Dominic Cleal <dominic@cleal.org> - 1.7.0-1
- Update to 1.7.0
* Mon Aug 08 2016 Dominic Cleal <dominic@cleal.org> - 1.6.0-1
- Update to 1.6.0
* Thu May 12 2016 Dominic Cleal <dominic@cleal.org> - 1.5.0-1
- Update to 1.5.0

7
gating.yaml Normal file
View file

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
- !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}

View file

@ -1 +1,2 @@
01190e455c513124a2dae29a1182c113 augeas-1.5.0.tar.gz
SHA512 (augeas-af2aa88ab37fc48167d8c5e43b1770a4ba2ff403.tar.gz) = 7c499af33af46ac408583e992b5e7826fe433a48c4fe56858c73560ff50a935b34823a94fd7e801eb375700f57ef78df71b603e2ddb1ab3f86049e23ac26066d
SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee

35
tests/augtool_test.sh Executable file
View file

@ -0,0 +1,35 @@
#!/bin/bash
set -eux
augtool -L > augtool_test.out 2> augtool_test.err <<EOF
# do not try to parse /etc/profile.d/*, and /etc/profile files,
# as the Shellvars lens cannot handle their advanced syntax
rm /augeas/load/Shellvars/*[. =~ regexp("/etc/profile.*")]
# exclude /etc/mke2fs.conf, as it has various issues:
# https://bugzilla.redhat.com/1807010
rm /augeas/load/Mke2fs/
# exclude 21-cloudinit.conf, which seems to have issues
ins excl before /augeas/load/Rsyslog/*[label() = 'excl'][position() = 1]
set /augeas/load/Rsyslog/*[label() = 'excl'][position() = 1] /etc/rsyslog.d/21-cloudinit.conf
# load, and print the errors
load
print /augeas//error
EOF
# remove output related to the removal of the /etc/profile.* 'incl'
# transforms
sed -i '/^rm /d' augtool_test.out
echo "BEGIN output ========"
cat augtool_test.out
echo "END output ========"
echo "BEGIN error ========"
cat augtool_test.err
echo "END error ========"
test ! -s augtool_test.out
test ! -s augtool_test.err

18
tests/devel.sh Executable file
View file

@ -0,0 +1,18 @@
#!/bin/bash
set -eux
pkg-config --cflags augeas
pkg-config --libs augeas
src_dump="$(realpath source/examples/dump.c)"
tmpdir="$(mktemp -d)"
pushd "$tmpdir"
gcc -o dump $(pkg-config --cflags --libs augeas) "$src_dump"
test -x dump
./dump > /dev/null
popd
rm -rf "$tmpdir"

36
tests/tests.yml Normal file
View file

@ -0,0 +1,36 @@
---
- hosts: localhost
roles:
- role: standard-test-source
tags:
- always
required_packages:
- autoconf
- automake
- role: standard-test-basic
tags:
- atomic
- classic
- container
required_packages:
- augeas
- augeas-devel
- libxml2-devel
- gcc
- pkg-config
- chrony # test its configs
- fuse # test its configs
- iscsi-initiator-utils # test its configs
- lvm2 # test its configs
- mdadm # test its configs
- openssh-server # test its configs
- rsync # test its configs
- rsyslog # test its configs
- sudo # test its configs
tests:
- augtool_test:
dir: .
run: ./augtool_test.sh
- devel:
dir: .
run: ./devel.sh