From c6c1a8cc298fda561883d8a2fd357f731b2fc7fd Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Mon, 8 Aug 2016 13:34:05 +0100 Subject: [PATCH 01/59] Update to 1.6.0 --- augeas.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 6ff0c4d..fe3ec82 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.5.0 +Version: 1.6.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %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.* @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Aug 08 2016 Dominic Cleal - 1.6.0-1 +- Update to 1.6.0 + * Thu May 12 2016 Dominic Cleal - 1.5.0-1 - Update to 1.5.0 diff --git a/sources b/sources index fbf9bcc..ae4dea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01190e455c513124a2dae29a1182c113 augeas-1.5.0.tar.gz +8906de3c36e9158cf6cc25e8e3e986b2 augeas-1.6.0.tar.gz From 9e2e331c525319c124b60aa78fedb6a56e374516 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Mon, 8 Aug 2016 13:34:05 +0100 Subject: [PATCH 02/59] Update to 1.6.0 --- augeas.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 6ff0c4d..fe3ec82 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.5.0 +Version: 1.6.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %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.* @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Aug 08 2016 Dominic Cleal - 1.6.0-1 +- Update to 1.6.0 + * Thu May 12 2016 Dominic Cleal - 1.5.0-1 - Update to 1.5.0 diff --git a/sources b/sources index fbf9bcc..ae4dea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01190e455c513124a2dae29a1182c113 augeas-1.5.0.tar.gz +8906de3c36e9158cf6cc25e8e3e986b2 augeas-1.6.0.tar.gz From fdaeb4fd572a93fb0a153e1c9987e3832da7de68 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 9 Nov 2016 08:44:47 +0000 Subject: [PATCH 03/59] Update to 1.7.0 --- augeas.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index fe3ec82..cb50fb3 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.6.0 +Version: 1.7.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Nov 09 2016 Dominic Cleal - 1.7.0-1 +- Update to 1.7.0 + * Mon Aug 08 2016 Dominic Cleal - 1.6.0-1 - Update to 1.6.0 diff --git a/sources b/sources index ae4dea3..97b4df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8906de3c36e9158cf6cc25e8e3e986b2 augeas-1.6.0.tar.gz +18bdf9249c6f61af9d1d09127e15d8e3 augeas-1.7.0.tar.gz From 5845fc129ae715a8c30de8a1676fd4c9843d5218 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 9 Nov 2016 08:44:47 +0000 Subject: [PATCH 04/59] Update to 1.7.0 --- augeas.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index fe3ec82..cb50fb3 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.6.0 +Version: 1.7.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Nov 09 2016 Dominic Cleal - 1.7.0-1 +- Update to 1.7.0 + * Mon Aug 08 2016 Dominic Cleal - 1.6.0-1 - Update to 1.6.0 diff --git a/sources b/sources index ae4dea3..97b4df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8906de3c36e9158cf6cc25e8e3e986b2 augeas-1.6.0.tar.gz +18bdf9249c6f61af9d1d09127e15d8e3 augeas-1.7.0.tar.gz From 487980e443f856f9ed98501e7b303d46a5389694 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 12 Nov 2016 11:04:20 +0000 Subject: [PATCH 05/59] 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. --- augeas.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index cb50fb3..f2f5ba8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -50,7 +50,11 @@ read files. %setup -q %build -%configure --disable-static +%configure \ +%ifarch riscv64 + --disable-gnulib-tests \ +%endif + --disable-static make %{?_smp_mflags} %check @@ -105,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Sat Nov 12 2016 Richard W.M. Jones - 1.7.0-2 +- riscv64: Disable gnulib tests on riscv64 architecture. + * Wed Nov 09 2016 Dominic Cleal - 1.7.0-1 - Update to 1.7.0 From a51d9bd0aef349114c5b48a3108a800e27f620a2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:24 +0100 Subject: [PATCH 06/59] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index f2f5ba8..06ad664 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Thu Jan 12 2017 Igor Gnatenko - 1.7.0-3 +- Rebuild for readline 7.x + * Sat Nov 12 2016 Richard W.M. Jones - 1.7.0-2 - riscv64: Disable gnulib tests on riscv64 architecture. From e38ca9cbdad25f19444b001c40bc999d7280354d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:33:35 +0000 Subject: [PATCH 07/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 06ad664..8b667e8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 12 2017 Igor Gnatenko - 1.7.0-3 - Rebuild for readline 7.x From 79693543fcf6beec288ffbe5c50f16626c75b6f1 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 21 Mar 2017 08:08:49 +0000 Subject: [PATCH 08/59] Update to 1.8.0 --- augeas.spec | 9 +++++---- sources | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/augeas.spec b/augeas.spec index 8b667e8..cde4937 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas -Version: 1.7.0 -Release: 4%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -8,8 +8,6 @@ License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -109,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Mar 21 2017 Dominic Cleal - 1.8.0-1 +- Update to 1.8.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 97b4df5..c506b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18bdf9249c6f61af9d1d09127e15d8e3 augeas-1.7.0.tar.gz +SHA512 (augeas-1.8.0.tar.gz) = bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c From 62ecc80b426abc61d3658f2ccb6daa2c9c0f56a3 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 21 Mar 2017 14:04:11 +0000 Subject: [PATCH 09/59] 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/ --- augeas.spec | 3 +++ gnulib-disable-test-lock.patch | 40 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gnulib-disable-test-lock.patch diff --git a/augeas.spec b/augeas.spec index cde4937..b5ea76d 100644 --- a/augeas.spec +++ b/augeas.spec @@ -7,6 +7,8 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz +# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031) +Patch0: gnulib-disable-test-lock.patch BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -46,6 +48,7 @@ read files. %prep %setup -q +%patch0 -p1 %build %configure \ diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch new file mode 100644 index 0000000..43d1b15 --- /dev/null +++ b/gnulib-disable-test-lock.patch @@ -0,0 +1,40 @@ +diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am +--- augeas-1.8.0.old/gnulib/tests/Makefile.am 2016-09-29 20:15:19.000000000 +0100 ++++ augeas-1.8.0/gnulib/tests/Makefile.am 2017-03-21 15:14:45.209782946 +0000 +@@ -515,15 +515,6 @@ + + ## end gnulib module localename-tests + +-## begin gnulib module lock-tests +- +-TESTS += test-lock +-check_PROGRAMS += test-lock +-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ +-EXTRA_DIST += test-lock.c +- +-## end gnulib module lock-tests +- + ## begin gnulib module lstat-tests + + TESTS += test-lstat +diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in +--- augeas-1.8.0.old/gnulib/tests/Makefile.in 2017-03-20 22:17:04.000000000 +0000 ++++ augeas-1.8.0/gnulib/tests/Makefile.in 2017-03-21 15:15:05.211646356 +0000 +@@ -126,7 +126,7 @@ + test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ + test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ +- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ ++ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ + test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ + test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \ + test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \ +@@ -170,7 +170,7 @@ + test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ + test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ +- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ ++ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ + test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ + test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ + test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \ From 244b2758417bde3729ca73d866b356bc8e8b0520 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 21 Mar 2017 08:08:49 +0000 Subject: [PATCH 10/59] Update to 1.8.0 --- augeas.spec | 7 ++++--- sources | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/augeas.spec b/augeas.spec index cb50fb3..a445fdf 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.7.0 +Version: 1.8.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -8,8 +8,6 @@ License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -105,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Mar 21 2017 Dominic Cleal - 1.8.0-1 +- Update to 1.8.0 + * Wed Nov 09 2016 Dominic Cleal - 1.7.0-1 - Update to 1.7.0 diff --git a/sources b/sources index 97b4df5..c506b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18bdf9249c6f61af9d1d09127e15d8e3 augeas-1.7.0.tar.gz +SHA512 (augeas-1.8.0.tar.gz) = bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c From cff667e6f840eda5e3ce48decee6b35f73ead28e Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 21 Mar 2017 14:04:11 +0000 Subject: [PATCH 11/59] 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/ --- augeas.spec | 3 +++ gnulib-disable-test-lock.patch | 40 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gnulib-disable-test-lock.patch diff --git a/augeas.spec b/augeas.spec index a445fdf..911a8f8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -7,6 +7,8 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz +# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031) +Patch0: gnulib-disable-test-lock.patch BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -46,6 +48,7 @@ read files. %prep %setup -q +%patch0 -p1 %build %configure --disable-static diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch new file mode 100644 index 0000000..43d1b15 --- /dev/null +++ b/gnulib-disable-test-lock.patch @@ -0,0 +1,40 @@ +diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am +--- augeas-1.8.0.old/gnulib/tests/Makefile.am 2016-09-29 20:15:19.000000000 +0100 ++++ augeas-1.8.0/gnulib/tests/Makefile.am 2017-03-21 15:14:45.209782946 +0000 +@@ -515,15 +515,6 @@ + + ## end gnulib module localename-tests + +-## begin gnulib module lock-tests +- +-TESTS += test-lock +-check_PROGRAMS += test-lock +-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ +-EXTRA_DIST += test-lock.c +- +-## end gnulib module lock-tests +- + ## begin gnulib module lstat-tests + + TESTS += test-lstat +diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in +--- augeas-1.8.0.old/gnulib/tests/Makefile.in 2017-03-20 22:17:04.000000000 +0000 ++++ augeas-1.8.0/gnulib/tests/Makefile.in 2017-03-21 15:15:05.211646356 +0000 +@@ -126,7 +126,7 @@ + test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ + test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ +- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ ++ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ + test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ + test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \ + test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \ +@@ -170,7 +170,7 @@ + test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ + test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ +- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ ++ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ + test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ + test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ + test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \ From a3b12754670642e61c6a21d4bac8edd6a58c61a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:33:29 +0000 Subject: [PATCH 12/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index b5ea76d..c06c203 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Mar 21 2017 Dominic Cleal - 1.8.0-1 - Update to 1.8.0 From 7efdf07137e6a8533c19d4696f8912a60f5d3637 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:59:36 +0000 Subject: [PATCH 13/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index c06c203..52d8ea1 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8231c3d54498c21f4a17f8195b38e1c78a42b38f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 24 Aug 2017 15:02:42 +0100 Subject: [PATCH 14/59] New upstream version 1.8.1. Fixes CVE-2017-7555 (RHBZ#1482340). --- augeas.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 52d8ea1..811f8aa 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas -Version: 1.8.0 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Thu Aug 24 2017 Richard W.M. Jones - 1.8.1-1 +- New upstream version 1.8.1. +- Fixes CVE-2017-7555 (RHBZ#1482340). + * Wed Aug 02 2017 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index c506b42..7932203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.8.0.tar.gz) = bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c +SHA512 (augeas-1.8.1.tar.gz) = 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b From 5eadddf66b4a4caa579615c1b073dfa7bd40dbc9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 24 Aug 2017 15:02:42 +0100 Subject: [PATCH 15/59] New upstream version 1.8.1. Fixes CVE-2017-7555 (RHBZ#1482340). (cherry picked from commit 8231c3d54498c21f4a17f8195b38e1c78a42b38f) --- augeas.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index 911a8f8..ec29893 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -106,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Thu Aug 24 2017 Richard W.M. Jones - 1.8.1-1 +- New upstream version 1.8.1. +- Fixes CVE-2017-7555 (RHBZ#1482340). + * Tue Mar 21 2017 Dominic Cleal - 1.8.0-1 - Update to 1.8.0 diff --git a/sources b/sources index c506b42..7932203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.8.0.tar.gz) = bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c +SHA512 (augeas-1.8.1.tar.gz) = 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b From a48d62254729e29b11a76fa79395ac78cb75c248 Mon Sep 17 00:00:00 2001 From: David Lutterkort Date: Tue, 21 Nov 2017 15:59:39 -0800 Subject: [PATCH 16/59] New upstream version 1.9.0 New upstream version 1.9.0 (RHBZ#1482713) Add -static subpackage (RHBZ#1405600) --- augeas.spec | 27 +++++++++++++++++++++++++-- sources | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 811f8aa..f5e17ab 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.8.1 +Version: 1.9.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -46,6 +46,17 @@ 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} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The %{name}-static package contains static libraries needed to produce +static builds using %{name}. + + + %prep %setup -q %patch0 -p1 @@ -55,7 +66,7 @@ read files. %ifarch riscv64 --disable-gnulib-tests \ %endif - --disable-static + --enable-static make %{?_smp_mflags} %check @@ -78,6 +89,9 @@ 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 +# In 1.9.0, the example /usr/bin/dump gets installed inadvertently +rm -f $RPM_BUILD_ROOT/usr/bin/dump + %clean rm -rf $RPM_BUILD_ROOT @@ -109,7 +123,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/pkgconfig/augeas.pc +%files static +%defattr(-,root,root,-) +%{_libdir}/libaugeas.a +%{_libdir}/libfa.a + %changelog +* Tue Nov 21 2017 David Lutterkort - 1.9.0 +- New upstream version 1.9.0 (RHBZ#1482713) +- Add -static subpackage (RHBZ#1405600) + * Thu Aug 24 2017 Richard W.M. Jones - 1.8.1-1 - New upstream version 1.8.1. - Fixes CVE-2017-7555 (RHBZ#1482340). diff --git a/sources b/sources index 7932203..943eb3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.8.1.tar.gz) = 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b +SHA512 (augeas-1.9.0.tar.gz) = 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 From 2bc28062b089c0fd6a07d5d82da67c3d23badd12 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 26 Jan 2018 15:26:29 +0000 Subject: [PATCH 17/59] New upstream version 1.10.0 (RHBZ#1538846). --- augeas.spec | 13 ++++++----- gnulib-disable-test-lock.patch | 40 ---------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 gnulib-disable-test-lock.patch diff --git a/augeas.spec b/augeas.spec index f5e17ab..4448490 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Summary: A library for changing configuration files @@ -7,8 +7,6 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz -# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031) -Patch0: gnulib-disable-test-lock.patch BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -59,7 +57,6 @@ static builds using %{name}. %prep %setup -q -%patch0 -p1 %build %configure \ @@ -101,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/augtool +%{_bindir}/augmatch %{_bindir}/augparse +%{_bindir}/augtool %{_bindir}/fadot %doc %{_mandir}/man1/* %{_datadir}/vim/vimfiles/syntax/augeas.vim @@ -129,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libfa.a %changelog +* Fri Jan 26 2018 Richard W.M. Jones - 1.10.0-1 +- New upstream version 1.10.0 (RHBZ#1538846). +- Remove upstream patch. +- New tool ‘augmatch’. + * Tue Nov 21 2017 David Lutterkort - 1.9.0 - New upstream version 1.9.0 (RHBZ#1482713) - Add -static subpackage (RHBZ#1405600) diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch deleted file mode 100644 index 43d1b15..0000000 --- a/gnulib-disable-test-lock.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am ---- augeas-1.8.0.old/gnulib/tests/Makefile.am 2016-09-29 20:15:19.000000000 +0100 -+++ augeas-1.8.0/gnulib/tests/Makefile.am 2017-03-21 15:14:45.209782946 +0000 -@@ -515,15 +515,6 @@ - - ## end gnulib module localename-tests - --## begin gnulib module lock-tests -- --TESTS += test-lock --check_PROGRAMS += test-lock --test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ --EXTRA_DIST += test-lock.c -- --## end gnulib module lock-tests -- - ## begin gnulib module lstat-tests - - TESTS += test-lstat -diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in ---- augeas-1.8.0.old/gnulib/tests/Makefile.in 2017-03-20 22:17:04.000000000 +0000 -+++ augeas-1.8.0/gnulib/tests/Makefile.in 2017-03-21 15:15:05.211646356 +0000 -@@ -126,7 +126,7 @@ - test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ - test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ - test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ -- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ -+ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ - test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ - test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \ - test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \ -@@ -170,7 +170,7 @@ - test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ - test-limits-h$(EXEEXT) test-locale$(EXEEXT) \ - test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ -- test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ -+ test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ - test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ - test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ - test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \ diff --git a/sources b/sources index 943eb3e..da6eeda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.9.0.tar.gz) = 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 +SHA512 (augeas-1.10.0.tar.gz) = e0b320f1d64af054d1ea6b97b34d3a0fccdefc92dde452b6ca6fee2d72006fce89ea85ffb8c3a039af265b8b377a8883faa82a2b07090d856439b93a373bb1ff From 1f39b7b5053129517ac64e259d90db7840ea3b9e Mon Sep 17 00:00:00 2001 From: David Lutterkort Date: Mon, 29 Jan 2018 13:32:45 +0100 Subject: [PATCH 18/59] Upstream version 1.10.1 --- augeas.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/augeas.spec b/augeas.spec index 4448490..90fee16 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,5 +1,5 @@ Name: augeas -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libfa.a %changelog +* Mon Jan 29 2018 David Lutterkort - 1.10.1-1 +- New upstream version 1.10.1 + * Fri Jan 26 2018 Richard W.M. Jones - 1.10.0-1 - New upstream version 1.10.0 (RHBZ#1538846). - Remove upstream patch. diff --git a/sources b/sources index da6eeda..8305ffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.10.0.tar.gz) = e0b320f1d64af054d1ea6b97b34d3a0fccdefc92dde452b6ca6fee2d72006fce89ea85ffb8c3a039af265b8b377a8883faa82a2b07090d856439b93a373bb1ff +SHA512 (augeas-1.10.1.tar.gz) = 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2 From 729e18bb74e50932f8626d0c2d67f1c1d7fd4132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 03:19:02 +0000 Subject: [PATCH 19/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 90fee16..039876c 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libfa.a %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 29 2018 David Lutterkort - 1.10.1-1 - New upstream version 1.10.1 From baefb5cb92f362bd9e7279b6da09b1499119a7b2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:52:02 +0100 Subject: [PATCH 20/59] 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 --- augeas.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 039876c..aa84545 100644 --- a/augeas.spec +++ b/augeas.spec @@ -89,9 +89,6 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/tests # In 1.9.0, the example /usr/bin/dump gets installed inadvertently rm -f $RPM_BUILD_ROOT/usr/bin/dump -%clean -rm -rf $RPM_BUILD_ROOT - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig From a2f83e00af8fb276a17875d38470f282ff22aafe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 21/59] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- augeas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/augeas.spec b/augeas.spec index aa84545..2be7f7e 100644 --- a/augeas.spec +++ b/augeas.spec @@ -8,6 +8,7 @@ License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} From 33807a744285df2d3f1d5b89c7d4a04b0819a95f Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:14:45 -0500 Subject: [PATCH 22/59] Remove needless use of %defattr --- augeas.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/augeas.spec b/augeas.spec index 2be7f7e..b10cc85 100644 --- a/augeas.spec +++ b/augeas.spec @@ -95,7 +95,6 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %postun libs -p /sbin/ldconfig %files -%defattr(-,root,root,-) %{_bindir}/augmatch %{_bindir}/augparse %{_bindir}/augtool @@ -105,7 +104,6 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_datadir}/vim/vimfiles/ftdetect/augeas.vim %files libs -%defattr(-,root,root,-) # _datadir/augeas and _datadir/augeas/lenses are owned # by filesystem. %{_datadir}/augeas/lenses/dist @@ -113,14 +111,12 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %doc AUTHORS COPYING NEWS %files devel -%defattr(-,root,root,-) %doc %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/augeas.pc %files static -%defattr(-,root,root,-) %{_libdir}/libaugeas.a %{_libdir}/libfa.a From a14bc51fffe18addbd55a5dead0aa9ff89e62189 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:46:40 +0000 Subject: [PATCH 23/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index b10cc85..1edaa50 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -121,6 +121,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From be72301a267c02497811322c5e13763a78d00882 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Aug 2018 10:56:21 +0100 Subject: [PATCH 24/59] New upstream version 1.11.0. --- augeas.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 1edaa50..9749fe0 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas -Version: 1.10.1 -Release: 3%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -121,6 +121,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Tue Aug 28 2018 Richard W.M. Jones - 1.11.0-1 +- New upstream version 1.11.0. + * Thu Jul 12 2018 Fedora Release Engineering - 1.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 8305ffe..406ca9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.10.1.tar.gz) = 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2 +SHA512 (augeas-1.11.0.tar.gz) = 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1 From dde0433822722938f0310b8a8566b74561026f26 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 26 Nov 2018 11:13:59 +0000 Subject: [PATCH 25/59] Augeas uses gnulib, add the correct 'Provides' line. --- augeas.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 9749fe0..646b970 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -8,6 +8,8 @@ License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz +Provides: bundled(gnulib) + BuildRequires: gcc BuildRequires: readline-devel libselinux-devel libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -121,6 +123,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Mon Nov 26 2018 Richard W.M. Jones - 1.11.0-2 +- Augeas uses gnulib, add the correct 'Provides' line. + * Tue Aug 28 2018 Richard W.M. Jones - 1.11.0-1 - New upstream version 1.11.0. From db181ff9114c018a3ef8001e73a55fd97415de68 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:32 +0100 Subject: [PATCH 26/59] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- augeas.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 646b970..e69aa76 100644 --- a/augeas.spec +++ b/augeas.spec @@ -92,9 +92,7 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/tests # 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 %{_bindir}/augmatch From bff2c73d2565d6883eae6a6db7a60ba361120acf Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:39 +0100 Subject: [PATCH 27/59] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- augeas.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/augeas.spec b/augeas.spec index e69aa76..7294f7c 100644 --- a/augeas.spec +++ b/augeas.spec @@ -3,7 +3,6 @@ Version: 1.11.0 Release: 2%{?dist} Summary: A library for changing configuration files -Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz @@ -26,7 +25,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 @@ -37,7 +35,6 @@ developing applications that use %{name}. %package libs Summary: Libraries for %{name} -Group: System Environment/Libraries %description libs The libraries for %{name}. @@ -49,7 +46,6 @@ read files. %package static Summary: Static libraries for %{name} -Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static From 90f64b73f81b8aad981c2fbb05845e385360615a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:09:50 +0000 Subject: [PATCH 28/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 7294f7c..6c69a5f 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -117,6 +117,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 26 2018 Richard W.M. Jones - 1.11.0-2 - Augeas uses gnulib, add the correct 'Provides' line. From da110766ebf0513f2ebceff8d875f131e49ea7c4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 29/59] Rebuild for readline 8.0 --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 6c69a5f..72dcd21 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -117,6 +117,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Sun Feb 17 2019 Igor Gnatenko - 1.11.0-4 +- Rebuild for readline 8.0 + * Thu Jan 31 2019 Fedora Release Engineering - 1.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e39253519c3cade8236fca7af3df99fecdf2a01d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2019 17:14:03 +0000 Subject: [PATCH 30/59] Tests disabled because gnulib tests fail see: https://bugzilla.redhat.com/show_bug.cgi?id=1674672 --- augeas.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/augeas.spec b/augeas.spec index 72dcd21..2527e2f 100644 --- a/augeas.spec +++ b/augeas.spec @@ -70,11 +70,13 @@ make %{?_smp_mflags} # to differing SELinux labelling. export SKIP_TEST_PRESERVE_SELINUX=1 -make %{?_smp_mflags} check || { - echo '===== tests/test-suite.log =====' - cat tests/test-suite.log - exit 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 +# exit 1 +#} %install rm -rf $RPM_BUILD_ROOT From 4ef0afb7035b2bc5811304432bbf3513929bdeb6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Apr 2019 08:56:27 +0100 Subject: [PATCH 31/59] New upstream release 1.12.0. --- augeas.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 2527e2f..e92a3a8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas -Version: 1.11.0 -Release: 4%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -119,6 +119,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Mon Apr 15 2019 Richard W.M. Jones - 1.12.0-1 +- New upstream release 1.12.0. + * Sun Feb 17 2019 Igor Gnatenko - 1.11.0-4 - Rebuild for readline 8.0 diff --git a/sources b/sources index 406ca9b..960a902 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.11.0.tar.gz) = 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1 +SHA512 (augeas-1.12.0.tar.gz) = 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40 From 967ed1df928faef0e7b3dc3e6ff4284ae8aa53e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:47:34 +0000 Subject: [PATCH 32/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index e92a3a8..7a3cf06 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -119,6 +119,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Apr 15 2019 Richard W.M. Jones - 1.12.0-1 - New upstream release 1.12.0. From 994c3ecec07882db72b905821a7f0eaf061a3712 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:26:53 +0000 Subject: [PATCH 33/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 7a3cf06..a6f5d8d 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -119,6 +119,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.12.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 97082e770d284c90c4be536fee6385846c8f64f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:42:13 +0000 Subject: [PATCH 34/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index a6f5d8d..f7dd470 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -119,6 +119,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.12.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.12.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 23775ebe861d4c55abb536b681867158f5f052bc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 02:34:07 +0000 Subject: [PATCH 35/59] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- augeas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/augeas.spec b/augeas.spec index f7dd470..083cd1b 100644 --- a/augeas.spec +++ b/augeas.spec @@ -11,6 +11,7 @@ Provides: bundled(gnulib) BuildRequires: gcc BuildRequires: readline-devel libselinux-devel libxml2-devel +BuildRequires: make Requires: %{name}-libs = %{version}-%{release} %description From 46672e4837d4798f6166671ec958cc171bf45523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:44:38 +0000 Subject: [PATCH 36/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 083cd1b..515695a 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -120,6 +120,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.12.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1030ff3001e89434227d4595594efba3148a9d3c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 15 Apr 2021 13:09:37 +0100 Subject: [PATCH 37/59] Add upstream patch to parse chrony configuration. Use %autosetup. --- ...00c2a6b7aade2ad520cb3a2378381e373a62.patch | 251 ++++++++++++++++++ augeas.spec | 15 +- 2 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 739100c2a6b7aade2ad520cb3a2378381e373a62.patch diff --git a/739100c2a6b7aade2ad520cb3a2378381e373a62.patch b/739100c2a6b7aade2ad520cb3a2378381e373a62.patch new file mode 100644 index 0000000..48821ea --- /dev/null +++ b/739100c2a6b7aade2ad520cb3a2378381e373a62.patch @@ -0,0 +1,251 @@ +From 739100c2a6b7aade2ad520cb3a2378381e373a62 Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Thu, 15 Oct 2020 16:16:29 +0200 +Subject: [PATCH] Chrony: add new options + +Add new directives and options supported in chrony since 3.3 up to 4.0, +with the exception of the ntsport options, which conflicts with the nts +option. +--- + lenses/chrony.aug | 32 +++++++++++++++----- + lenses/tests/test_chrony.aug | 58 +++++++++++++++++++++++++++++++++++- + 2 files changed, 81 insertions(+), 9 deletions(-) + +diff --git a/lenses/chrony.aug b/lenses/chrony.aug +index 9ce177bb..91c8ed51 100644 +--- a/lenses/chrony.aug ++++ b/lenses/chrony.aug +@@ -79,6 +79,7 @@ module Chrony = + Server/Peer/Pool options with values + *) + let cmd_options = "asymmetry" ++ | "filter" + | "key" + | /maxdelay((dev)?ratio)?/ + | /(min|max)poll/ +@@ -95,7 +96,7 @@ module Chrony = + Server/Peer/Pool options without values + *) + let cmd_flags = "auto_offline"|"iburst"|"noselect"|"offline"|"prefer" +- |"require"|"trust"|"xleave"|"burst" ++ |"require"|"trust"|"xleave"|"burst"|"nts" + + (* Variable: ntp_source + Server/Peer/Pool key names +@@ -111,7 +112,7 @@ module Chrony = + HW timestamping options with values + *) + let hwtimestamp_options = "minpoll"|"precision"|"rxcomp"|"txcomp" +- |"rxfilter" ++ |"minsamples"|"maxsamples"|"rxfilter" + + (* Variable: hwtimestamp_flags + HW timestamping options without values +@@ -153,6 +154,7 @@ module Chrony = + | "lock_all" + | "manual" + | "noclientlog" ++ | "nosystemcert" + | "rtconutc" + | "rtcsync" + +@@ -165,16 +167,22 @@ module Chrony = + (* Variable: simple_keys + Options with single values + *) +- let simple_keys = "acquisitionport" | "bindacqaddress" +- | "bindaddress" | "bindcmdaddress" | "clientloglimit" +- | "combinelimit" | "commandkey" ++ let simple_keys = "acquisitionport" | "authselectmode" | "bindacqaddress" ++ | "bindaddress" | "bindcmdaddress" | "bindacqdevice" ++ | "bindcmddevice" | "binddevice" | "clientloglimit" ++ | "clockprecision" | "combinelimit" | "commandkey" + | "cmdport" | "corrtimeratio" | "driftfile" ++ | "dscp" + | "dumpdir" | "hwclockfile" | "include" | "keyfile" + | "leapsecmode" | "leapsectz" | "linux_freq_scale" + | "linux_hz" | "logbanner" | "logchange" | "logdir" + | "maxclockerror" | "maxdistance" | "maxdrift" + | "maxjitter" | "maxsamples" | "maxslewrate" ++ | "maxntsconnections" + | "maxupdateskew" | "minsamples" | "minsources" ++ | "nocerttimecheck" | "ntsdumpdir" | "ntsntpserver" ++ | "ntsport" | "ntsprocesses" | "ntsrefresh" | "ntsrotate" ++ | "ntsservercert" | "ntsserverkey" | "ntstrustedcerts" + | "ntpsigndsocket" | "pidfile" + | "port" | "reselectdist" | "rtcautotrim" | "rtcdevice" + | "rtcfile" | "sched_priority" | "stratumweight" | "user" +@@ -218,10 +226,11 @@ module Chrony = + - mailonchange + - makestep + - maxchange +- - ratelimit|cmdratelimit ++ - ratelimit|cmdratelimit|ntsratelimit + - refclock + - smoothtime + - tempcomp ( | ) ++ - confdir|sourcedir + *) + + (* View: host_list +@@ -254,6 +263,13 @@ module Chrony = + . ( space . [ label "port" . store integer ] )? + . eol ] + ++ (* View: bcast ++ confdir and sourcedir have specific syntax ++ *) ++ let dir_list = [ Util.indent . key /(conf|source)dir/ ++ . [ label "directory" . space . store no_space ]+ ++ . eol ] ++ + (* View: fdrift + fallbackdrift has specific syntax + *) +@@ -323,7 +339,7 @@ module Chrony = + (* View: ratelimit + ratelimit/cmdratelimit has specific syntax + *) +- let ratelimit = [ Util.indent . key /(cmd)?ratelimit/ ++ let ratelimit = [ Util.indent . key /(cmd|nts)?ratelimit/ + . [ space . key ratelimit_options + . space . store no_space ]* + . eol ] +@@ -375,7 +391,7 @@ module Chrony = + *) + let settings = host_list | allowdeny | log_list | bcast | fdrift | istepslew + | local | email | makestep | maxchange | refclock | smoothtime +- | hwtimestamp | ratelimit | tempcomp | kv | all_flags ++ | dir_list | hwtimestamp | ratelimit | tempcomp | kv | all_flags + + (* + * View: lns +diff --git a/lenses/tests/test_chrony.aug b/lenses/tests/test_chrony.aug +index 9011cafa..0c86cde7 100644 +--- a/lenses/tests/test_chrony.aug ++++ b/lenses/tests/test_chrony.aug +@@ -22,7 +22,7 @@ server ntp5.example.com maxdelay 2 offline + server ntp6.example.com maxdelay 2 iburst presend 2 xleave offset 1e-4 + server ntp7.example.com iburst presend 2 offline prefer trust require + server ntp8.example.com minsamples 8 maxsamples 16 version 3 +-server ntp9.example.com burst mindelay 0.1 asymmetry 0.5 ++server ntp9.example.com burst mindelay 0.1 asymmetry 0.5 nts filter 3 + peer ntpc1.example.com + pool pool1.example.com iburst maxsources 3 + allow +@@ -35,6 +35,10 @@ stratumweight 0 + makestep 10 -1 + bindcmdaddress 127.0.0.1 + bindcmdaddress ::1 ++bindacqdevice eth0 ++bindcmddevice eth0 ++binddevice eth0 ++clockprecision 10e-9 + local + local stratum 10 + local distance 1.0 orphan +@@ -55,10 +59,12 @@ maxchange 1000 1 2 + maxdistance 1.0 + maxdrift 100 + hwtimestamp eth0 minpoll -2 txcomp 300e-9 rxcomp 645e-9 nocrossts rxfilter all ++hwtimestamp eth1 minsamples 10 maxsamples 20 + initstepslew 30 foo.bar.com + initstepslew 30 foo.bar.com baz.quz.com + ratelimit interval 4 burst 16 leak 2 + cmdratelimit ++ntsratelimit + refclock SHM 0 refid SHM0 delay 0.1 offset 0.2 noselect tai stratum 3 + refclock SOCK /var/run/chrony-GPS.sock pps width 0.1 + refclock PPS /dev/pps0 dpoll 2 poll 3 lock SHM0 rate 5 minsamples 8 +@@ -66,6 +72,22 @@ smoothtime 400 0.001 leaponly + tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 26000 0.0 0.000183 0.0 + tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 /etc/chrony.tempcomp + ntpsigndsocket /var/lib/samba/ntp_signd ++confdir /etc/chrony.d /usr/lib/chrony.d ++sourcedir /etc/chrony.d /var/run/chrony.d ++authselectmode require ++dscp 46 ++maxntsconnections 10 ++nocerttimecheck 1 ++nosystemcert ++ntsservercert /etc/chrony/server.crt ++ntsserverkey /etc/chrony/server.key ++ntstrustedcerts /etc/chrony/trusted.crt ++ntsdumpdir /var/lib/chrony ++ntsntpserver foo.example.com ++ntsport 123 ++ntsprocesses 2 ++ntsrefresh 86400 ++ntsrotate 86400 + " + + test Chrony.lns get exampleconf = +@@ -117,6 +139,8 @@ ntpsigndsocket /var/lib/samba/ntp_signd + { "burst" } + { "mindelay" = "0.1" } + { "asymmetry" = "0.5" } ++ { "nts" } ++ { "filter" = "3" } + } + { "peer" = "ntpc1.example.com" } + { "pool" = "pool1.example.com" +@@ -140,6 +164,10 @@ ntpsigndsocket /var/lib/samba/ntp_signd + } + { "bindcmdaddress" = "127.0.0.1" } + { "bindcmdaddress" = "::1" } ++ { "bindacqdevice" = "eth0" } ++ { "bindcmddevice" = "eth0" } ++ { "binddevice" = "eth0" } ++ { "clockprecision" = "10e-9" } + { "local" } + { "local" + { "stratum" = "10" } +@@ -197,6 +225,11 @@ ntpsigndsocket /var/lib/samba/ntp_signd + { "nocrossts" } + { "rxfilter" = "all" } + } ++ { "hwtimestamp" ++ { "interface" = "eth1" } ++ { "minsamples" = "10" } ++ { "maxsamples" = "20" } ++ } + { "initstepslew" + { "threshold" = "30" } + { "address" = "foo.bar.com" } +@@ -212,6 +245,7 @@ ntpsigndsocket /var/lib/samba/ntp_signd + { "leak" = "2" } + } + { "cmdratelimit" } ++ { "ntsratelimit" } + { "refclock" + { "driver" = "SHM" } + { "parameter" = "0" } +@@ -256,6 +290,28 @@ ntpsigndsocket /var/lib/samba/ntp_signd + { "pointfile" = "/etc/chrony.tempcomp" } + } + { "ntpsigndsocket" = "/var/lib/samba/ntp_signd" } ++ { "confdir" ++ { "directory" = "/etc/chrony.d" } ++ { "directory" = "/usr/lib/chrony.d" } ++ } ++ { "sourcedir" ++ { "directory" = "/etc/chrony.d" } ++ { "directory" = "/var/run/chrony.d" } ++ } ++ { "authselectmode" = "require" } ++ { "dscp" = "46" } ++ { "maxntsconnections" = "10" } ++ { "nocerttimecheck" = "1" } ++ { "nosystemcert" } ++ { "ntsservercert" = "/etc/chrony/server.crt" } ++ { "ntsserverkey" = "/etc/chrony/server.key" } ++ { "ntstrustedcerts" = "/etc/chrony/trusted.crt" } ++ { "ntsdumpdir" = "/var/lib/chrony" } ++ { "ntsntpserver" = "foo.example.com" } ++ { "ntsport" = "123" } ++ { "ntsprocesses" = "2" } ++ { "ntsrefresh" = "86400" } ++ { "ntsrotate" = "86400" } + + + (* Local Variables: *) diff --git a/augeas.spec b/augeas.spec index 515695a..5f0b3c3 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,17 +1,22 @@ Name: augeas Version: 1.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library for changing configuration files License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz +# Upstream patch to parse chrony configuration. +# https://bugzilla.redhat.com/show_bug.cgi?id=1949838 +Patch1: 739100c2a6b7aade2ad520cb3a2378381e373a62.patch + Provides: bundled(gnulib) +BuildRequires: make BuildRequires: gcc BuildRequires: readline-devel libselinux-devel libxml2-devel -BuildRequires: make + Requires: %{name}-libs = %{version}-%{release} %description @@ -56,7 +61,7 @@ static builds using %{name}. %prep -%setup -q +%autosetup -p1 %build %configure \ @@ -120,6 +125,10 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Thu Apr 15 2021 Richard W.M. Jones - 1.12.0-6 +- Add upstream patch to parse chrony configuration. +- Use %%autosetup. + * Tue Jan 26 2021 Fedora Release Engineering - 1.12.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dfd02f7fb4e3156a5db6f9ab9070a5c58dff8489 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 23 Jun 2021 10:55:23 +0100 Subject: [PATCH 38/59] Add gating tests (for RHEL) --- gating.yaml | 7 +++++++ tests/augtool_test.sh | 35 +++++++++++++++++++++++++++++++++++ tests/devel.sh | 18 ++++++++++++++++++ tests/tests.yml | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 gating.yaml create mode 100755 tests/augtool_test.sh create mode 100755 tests/devel.sh create mode 100644 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..617c71e --- /dev/null +++ b/gating.yaml @@ -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} diff --git a/tests/augtool_test.sh b/tests/augtool_test.sh new file mode 100755 index 0000000..31afd88 --- /dev/null +++ b/tests/augtool_test.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +set -eux + +augtool -L > augtool_test.out 2> augtool_test.err < /dev/null + +popd +rm -rf "$tmpdir" diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..461ccb9 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,33 @@ +--- +- hosts: localhost + roles: + - role: standard-test-source + tags: + - always + - 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 From 104273aa5541ee0805106ec02ed39a23eb2ba816 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Jul 2021 17:11:37 +0100 Subject: [PATCH 39/59] Package up a git pre-release of 1.12.1 or 1.13.0. --- ...00c2a6b7aade2ad520cb3a2378381e373a62.patch | 251 ------------------ augeas.spec | 32 ++- sources | 2 +- 3 files changed, 24 insertions(+), 261 deletions(-) delete mode 100644 739100c2a6b7aade2ad520cb3a2378381e373a62.patch diff --git a/739100c2a6b7aade2ad520cb3a2378381e373a62.patch b/739100c2a6b7aade2ad520cb3a2378381e373a62.patch deleted file mode 100644 index 48821ea..0000000 --- a/739100c2a6b7aade2ad520cb3a2378381e373a62.patch +++ /dev/null @@ -1,251 +0,0 @@ -From 739100c2a6b7aade2ad520cb3a2378381e373a62 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Thu, 15 Oct 2020 16:16:29 +0200 -Subject: [PATCH] Chrony: add new options - -Add new directives and options supported in chrony since 3.3 up to 4.0, -with the exception of the ntsport options, which conflicts with the nts -option. ---- - lenses/chrony.aug | 32 +++++++++++++++----- - lenses/tests/test_chrony.aug | 58 +++++++++++++++++++++++++++++++++++- - 2 files changed, 81 insertions(+), 9 deletions(-) - -diff --git a/lenses/chrony.aug b/lenses/chrony.aug -index 9ce177bb..91c8ed51 100644 ---- a/lenses/chrony.aug -+++ b/lenses/chrony.aug -@@ -79,6 +79,7 @@ module Chrony = - Server/Peer/Pool options with values - *) - let cmd_options = "asymmetry" -+ | "filter" - | "key" - | /maxdelay((dev)?ratio)?/ - | /(min|max)poll/ -@@ -95,7 +96,7 @@ module Chrony = - Server/Peer/Pool options without values - *) - let cmd_flags = "auto_offline"|"iburst"|"noselect"|"offline"|"prefer" -- |"require"|"trust"|"xleave"|"burst" -+ |"require"|"trust"|"xleave"|"burst"|"nts" - - (* Variable: ntp_source - Server/Peer/Pool key names -@@ -111,7 +112,7 @@ module Chrony = - HW timestamping options with values - *) - let hwtimestamp_options = "minpoll"|"precision"|"rxcomp"|"txcomp" -- |"rxfilter" -+ |"minsamples"|"maxsamples"|"rxfilter" - - (* Variable: hwtimestamp_flags - HW timestamping options without values -@@ -153,6 +154,7 @@ module Chrony = - | "lock_all" - | "manual" - | "noclientlog" -+ | "nosystemcert" - | "rtconutc" - | "rtcsync" - -@@ -165,16 +167,22 @@ module Chrony = - (* Variable: simple_keys - Options with single values - *) -- let simple_keys = "acquisitionport" | "bindacqaddress" -- | "bindaddress" | "bindcmdaddress" | "clientloglimit" -- | "combinelimit" | "commandkey" -+ let simple_keys = "acquisitionport" | "authselectmode" | "bindacqaddress" -+ | "bindaddress" | "bindcmdaddress" | "bindacqdevice" -+ | "bindcmddevice" | "binddevice" | "clientloglimit" -+ | "clockprecision" | "combinelimit" | "commandkey" - | "cmdport" | "corrtimeratio" | "driftfile" -+ | "dscp" - | "dumpdir" | "hwclockfile" | "include" | "keyfile" - | "leapsecmode" | "leapsectz" | "linux_freq_scale" - | "linux_hz" | "logbanner" | "logchange" | "logdir" - | "maxclockerror" | "maxdistance" | "maxdrift" - | "maxjitter" | "maxsamples" | "maxslewrate" -+ | "maxntsconnections" - | "maxupdateskew" | "minsamples" | "minsources" -+ | "nocerttimecheck" | "ntsdumpdir" | "ntsntpserver" -+ | "ntsport" | "ntsprocesses" | "ntsrefresh" | "ntsrotate" -+ | "ntsservercert" | "ntsserverkey" | "ntstrustedcerts" - | "ntpsigndsocket" | "pidfile" - | "port" | "reselectdist" | "rtcautotrim" | "rtcdevice" - | "rtcfile" | "sched_priority" | "stratumweight" | "user" -@@ -218,10 +226,11 @@ module Chrony = - - mailonchange - - makestep - - maxchange -- - ratelimit|cmdratelimit -+ - ratelimit|cmdratelimit|ntsratelimit - - refclock - - smoothtime - - tempcomp ( | ) -+ - confdir|sourcedir - *) - - (* View: host_list -@@ -254,6 +263,13 @@ module Chrony = - . ( space . [ label "port" . store integer ] )? - . eol ] - -+ (* View: bcast -+ confdir and sourcedir have specific syntax -+ *) -+ let dir_list = [ Util.indent . key /(conf|source)dir/ -+ . [ label "directory" . space . store no_space ]+ -+ . eol ] -+ - (* View: fdrift - fallbackdrift has specific syntax - *) -@@ -323,7 +339,7 @@ module Chrony = - (* View: ratelimit - ratelimit/cmdratelimit has specific syntax - *) -- let ratelimit = [ Util.indent . key /(cmd)?ratelimit/ -+ let ratelimit = [ Util.indent . key /(cmd|nts)?ratelimit/ - . [ space . key ratelimit_options - . space . store no_space ]* - . eol ] -@@ -375,7 +391,7 @@ module Chrony = - *) - let settings = host_list | allowdeny | log_list | bcast | fdrift | istepslew - | local | email | makestep | maxchange | refclock | smoothtime -- | hwtimestamp | ratelimit | tempcomp | kv | all_flags -+ | dir_list | hwtimestamp | ratelimit | tempcomp | kv | all_flags - - (* - * View: lns -diff --git a/lenses/tests/test_chrony.aug b/lenses/tests/test_chrony.aug -index 9011cafa..0c86cde7 100644 ---- a/lenses/tests/test_chrony.aug -+++ b/lenses/tests/test_chrony.aug -@@ -22,7 +22,7 @@ server ntp5.example.com maxdelay 2 offline - server ntp6.example.com maxdelay 2 iburst presend 2 xleave offset 1e-4 - server ntp7.example.com iburst presend 2 offline prefer trust require - server ntp8.example.com minsamples 8 maxsamples 16 version 3 --server ntp9.example.com burst mindelay 0.1 asymmetry 0.5 -+server ntp9.example.com burst mindelay 0.1 asymmetry 0.5 nts filter 3 - peer ntpc1.example.com - pool pool1.example.com iburst maxsources 3 - allow -@@ -35,6 +35,10 @@ stratumweight 0 - makestep 10 -1 - bindcmdaddress 127.0.0.1 - bindcmdaddress ::1 -+bindacqdevice eth0 -+bindcmddevice eth0 -+binddevice eth0 -+clockprecision 10e-9 - local - local stratum 10 - local distance 1.0 orphan -@@ -55,10 +59,12 @@ maxchange 1000 1 2 - maxdistance 1.0 - maxdrift 100 - hwtimestamp eth0 minpoll -2 txcomp 300e-9 rxcomp 645e-9 nocrossts rxfilter all -+hwtimestamp eth1 minsamples 10 maxsamples 20 - initstepslew 30 foo.bar.com - initstepslew 30 foo.bar.com baz.quz.com - ratelimit interval 4 burst 16 leak 2 - cmdratelimit -+ntsratelimit - refclock SHM 0 refid SHM0 delay 0.1 offset 0.2 noselect tai stratum 3 - refclock SOCK /var/run/chrony-GPS.sock pps width 0.1 - refclock PPS /dev/pps0 dpoll 2 poll 3 lock SHM0 rate 5 minsamples 8 -@@ -66,6 +72,22 @@ smoothtime 400 0.001 leaponly - tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 26000 0.0 0.000183 0.0 - tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 /etc/chrony.tempcomp - ntpsigndsocket /var/lib/samba/ntp_signd -+confdir /etc/chrony.d /usr/lib/chrony.d -+sourcedir /etc/chrony.d /var/run/chrony.d -+authselectmode require -+dscp 46 -+maxntsconnections 10 -+nocerttimecheck 1 -+nosystemcert -+ntsservercert /etc/chrony/server.crt -+ntsserverkey /etc/chrony/server.key -+ntstrustedcerts /etc/chrony/trusted.crt -+ntsdumpdir /var/lib/chrony -+ntsntpserver foo.example.com -+ntsport 123 -+ntsprocesses 2 -+ntsrefresh 86400 -+ntsrotate 86400 - " - - test Chrony.lns get exampleconf = -@@ -117,6 +139,8 @@ ntpsigndsocket /var/lib/samba/ntp_signd - { "burst" } - { "mindelay" = "0.1" } - { "asymmetry" = "0.5" } -+ { "nts" } -+ { "filter" = "3" } - } - { "peer" = "ntpc1.example.com" } - { "pool" = "pool1.example.com" -@@ -140,6 +164,10 @@ ntpsigndsocket /var/lib/samba/ntp_signd - } - { "bindcmdaddress" = "127.0.0.1" } - { "bindcmdaddress" = "::1" } -+ { "bindacqdevice" = "eth0" } -+ { "bindcmddevice" = "eth0" } -+ { "binddevice" = "eth0" } -+ { "clockprecision" = "10e-9" } - { "local" } - { "local" - { "stratum" = "10" } -@@ -197,6 +225,11 @@ ntpsigndsocket /var/lib/samba/ntp_signd - { "nocrossts" } - { "rxfilter" = "all" } - } -+ { "hwtimestamp" -+ { "interface" = "eth1" } -+ { "minsamples" = "10" } -+ { "maxsamples" = "20" } -+ } - { "initstepslew" - { "threshold" = "30" } - { "address" = "foo.bar.com" } -@@ -212,6 +245,7 @@ ntpsigndsocket /var/lib/samba/ntp_signd - { "leak" = "2" } - } - { "cmdratelimit" } -+ { "ntsratelimit" } - { "refclock" - { "driver" = "SHM" } - { "parameter" = "0" } -@@ -256,6 +290,28 @@ ntpsigndsocket /var/lib/samba/ntp_signd - { "pointfile" = "/etc/chrony.tempcomp" } - } - { "ntpsigndsocket" = "/var/lib/samba/ntp_signd" } -+ { "confdir" -+ { "directory" = "/etc/chrony.d" } -+ { "directory" = "/usr/lib/chrony.d" } -+ } -+ { "sourcedir" -+ { "directory" = "/etc/chrony.d" } -+ { "directory" = "/var/run/chrony.d" } -+ } -+ { "authselectmode" = "require" } -+ { "dscp" = "46" } -+ { "maxntsconnections" = "10" } -+ { "nocerttimecheck" = "1" } -+ { "nosystemcert" } -+ { "ntsservercert" = "/etc/chrony/server.crt" } -+ { "ntsserverkey" = "/etc/chrony/server.key" } -+ { "ntstrustedcerts" = "/etc/chrony/trusted.crt" } -+ { "ntsdumpdir" = "/var/lib/chrony" } -+ { "ntsntpserver" = "foo.example.com" } -+ { "ntsport" = "123" } -+ { "ntsprocesses" = "2" } -+ { "ntsrefresh" = "86400" } -+ { "ntsrotate" = "86400" } - - - (* Local Variables: *) diff --git a/augeas.spec b/augeas.spec index 5f0b3c3..eb02f38 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,21 +1,32 @@ +# Upstream releases have been very infrequent but there is still +# development going on, so for now (July 2021) package up the latest +# git version. +%global commit 18558bbeaeee7f6bed5dba64592aa8b23fa521ee +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: augeas -Version: 1.12.0 -Release: 6%{?dist} +Version: 1.12.1 +Release: 0.1.git%{shortcommit}%{?dist} Summary: A library for changing configuration files License: LGPLv2+ URL: http://augeas.net/ -Source0: http://download.augeas.net/%{name}-%{version}.tar.gz - -# Upstream patch to parse chrony configuration. -# https://bugzilla.redhat.com/show_bug.cgi?id=1949838 -Patch1: 739100c2a6b7aade2ad520cb3a2378381e373a62.patch +# Upstream tarballs. +#Source0: http://download.augeas.net/%%{name}-%%{version}.tar.gz +# Upstream git repo. +#Source0: https://github.com/hercules-team/augeas/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz +# However because of gnulib stupidity we can't use either with +# pre-releases. Instead I had to build a tarball from the prerelease +# commit: +Source0: augeas-18558bb.tar.gz Provides: bundled(gnulib) BuildRequires: make BuildRequires: gcc -BuildRequires: readline-devel libselinux-devel libxml2-devel +BuildRequires: readline-devel +BuildRequires: libselinux-devel +BuildRequires: libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -61,7 +72,7 @@ static builds using %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-1.12.0 %build %configure \ @@ -125,6 +136,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Tue Jul 06 2021 Richard W.M. Jones - 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 - 1.12.0-6 - Add upstream patch to parse chrony configuration. - Use %%autosetup. diff --git a/sources b/sources index 960a902..dad857e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.12.0.tar.gz) = 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40 +SHA512 (augeas-18558bb.tar.gz) = bd3a51a2f350664565a32deaeec43f037c5a512ba16189571da9a0c8762156cc2481e59bd3fac824444b831473e78a667216094963be3ce2d3aa4c707ccfb437 From 3850ab0bfeed4cf1b703763993f9e5539adc51ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:16:05 +0000 Subject: [PATCH 40/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 23306663d3e05a1734d7eb72dc92ffd2bac5c3a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:12:09 +0000 Subject: [PATCH 41/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index eb02f38..7b9a5ba 100644 --- a/augeas.spec +++ b/augeas.spec @@ -6,7 +6,7 @@ Name: augeas Version: 1.12.1 -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -136,6 +136,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.12.1-0.2.git18558bb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jul 06 2021 Richard W.M. Jones - 1.12.1-0.1 - Package up a git pre-release of 1.12.1 or 1.13.0. From 3b2b3a7c3bf17f90cf7b33af5e5b54a0e3757313 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 12 Jan 2022 17:36:32 +0000 Subject: [PATCH 42/59] New upstream version 1.13.0 --- augeas.spec | 31 ++++++++++++++----------------- sources | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/augeas.spec b/augeas.spec index 7b9a5ba..03787a8 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,24 +1,18 @@ -# Upstream releases have been very infrequent but there is still -# development going on, so for now (July 2021) package up the latest -# git version. -%global commit 18558bbeaeee7f6bed5dba64592aa8b23fa521ee -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: augeas -Version: 1.12.1 -Release: 0.2.git%{shortcommit}%{?dist} +Version: 1.13.0 +Release: 1%{?dist} Summary: A library for changing configuration files License: LGPLv2+ URL: http://augeas.net/ -# Upstream tarballs. -#Source0: http://download.augeas.net/%%{name}-%%{version}.tar.gz -# Upstream git repo. -#Source0: https://github.com/hercules-team/augeas/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz -# However because of gnulib stupidity we can't use either with -# pre-releases. Instead I had to build a tarball from the prerelease -# commit: -Source0: augeas-18558bb.tar.gz + +# The upstream release tarballs on github don't work, see: +# https://github.com/hercules-team/augeas/pull/744 +# The website release tarballs were not created for 1.13: +# http://download.augeas.net/ +#Source0: https://github.com/hercules-team/augeas/archive/refs/tags/release-%{version}.tar.gz +# So I had to create a tarball myself using make dist. +Source0: %{name}-%{version}.tar.gz Provides: bundled(gnulib) @@ -72,7 +66,7 @@ static builds using %{name}. %prep -%autosetup -p1 -n %{name}-1.12.0 +%autosetup -p1 %build %configure \ @@ -136,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jan 12 2022 Richard W.M. Jones - 1.13.0-1 +- New upstream version 1.13.0 + * Wed Jul 21 2021 Fedora Release Engineering - 1.12.1-0.2.git18558bb - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index dad857e..a27eb29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-18558bb.tar.gz) = bd3a51a2f350664565a32deaeec43f037c5a512ba16189571da9a0c8762156cc2481e59bd3fac824444b831473e78a667216094963be3ce2d3aa4c707ccfb437 +SHA512 (augeas-1.13.0.tar.gz) = e66327cfbe335fa83a8442ec1bd72f258e8e4d4a42d234ee5077ac60741e2c26bc67db39a6cc920a19e71c27247395bd145ed5288545170cd463d4cf22b2c184 From dddf81d0af2f8df4ce21722fe547f16913b9e5ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:55:48 +0000 Subject: [PATCH 43/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 03787a8..e72f5e9 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 12 2022 Richard W.M. Jones - 1.13.0-1 - New upstream version 1.13.0 From 502bc87ad61f42af1da55ef0e2d5be8e8fd330b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:32:57 +0000 Subject: [PATCH 44/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index e72f5e9..20ed050 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 270e8512ec6e6f11e4eb020b62f47bc282c19292 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:27:08 +0000 Subject: [PATCH 45/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 20ed050..aceb1c9 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.13.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0c15ccdc130be0b84e04478485003f6f2d20f06e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:07:21 +0000 Subject: [PATCH 46/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index aceb1c9..b5d9a20 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library for changing configuration files License: LGPLv2+ @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.13.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From dbdc2f221035775f129df1164fadba956f958335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 19 Sep 2023 13:08:36 +0100 Subject: [PATCH 47/59] Convert license to SPDX format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é --- augeas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index b5d9a20..56be576 100644 --- a/augeas.spec +++ b/augeas.spec @@ -3,7 +3,7 @@ Version: 1.13.0 Release: 5%{?dist} Summary: A library for changing configuration files -License: LGPLv2+ +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 URL: http://augeas.net/ # The upstream release tarballs on github don't work, see: From 896783aaa0cf53ea3d4e3dd93778b436e5e70fab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:54:11 +0000 Subject: [PATCH 48/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 56be576..9a0c51b 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 5%{?dist} +Release: 6%{?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 @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 48481a49de4641a5040c62c33a7e0ff396e42d18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:50:19 +0000 Subject: [PATCH 49/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 9a0c51b..519ac43 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 6%{?dist} +Release: 7%{?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 @@ -130,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.13.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.13.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2bcc944549a4e908c614b8bf4bc123c5bf9daee4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Jul 2024 09:56:02 +0100 Subject: [PATCH 50/59] New upstream version 1.14.1 Use github tarballs again. New binary augprint. New bash-completions subpackage. --- augeas.spec | 47 ++++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/augeas.spec b/augeas.spec index 519ac43..e1a83cd 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,18 +1,14 @@ Name: augeas -Version: 1.13.0 -Release: 7%{?dist} +Version: 1.14.1 +Release: 1%{?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 URL: http://augeas.net/ -# The upstream release tarballs on github don't work, see: -# https://github.com/hercules-team/augeas/pull/744 # The website release tarballs were not created for 1.13: # http://download.augeas.net/ -#Source0: https://github.com/hercules-team/augeas/archive/refs/tags/release-%{version}.tar.gz -# So I had to create a tarball myself using make dist. -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz Provides: bundled(gnulib) @@ -21,6 +17,10 @@ BuildRequires: gcc BuildRequires: readline-devel BuildRequires: libselinux-devel BuildRequires: libxml2-devel +BuildRequires: bash-completion +%if !0%{?rhel} +BuildRequires: bash-completion-devel +%endif Requires: %{name}-libs = %{version}-%{release} @@ -64,6 +64,19 @@ 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 %autosetup -p1 @@ -106,6 +119,7 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %files %{_bindir}/augmatch %{_bindir}/augparse +%{_bindir}/augprint %{_bindir}/augtool %{_bindir}/fadot %doc %{_mandir}/man1/* @@ -129,7 +143,26 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libaugeas.a %{_libdir}/libfa.a +%files bash-completion +%if !0%{?rhel} +%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 +* Thu Jul 04 2024 Richard W.M. Jones - 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 - 1.13.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a27eb29..0e75126 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.13.0.tar.gz) = e66327cfbe335fa83a8442ec1bd72f258e8e4d4a42d234ee5077ac60741e2c26bc67db39a6cc920a19e71c27247395bd145ed5288545170cd463d4cf22b2c184 +SHA512 (augeas-1.14.1.tar.gz) = fddb2e243f979e71fc09f9d45d569d6307b35485b2d885bf7bcbc032ba5617fe7ab2071a041422c3efe2dd62eda74aba41016d248c0636e947d4f1c9144375aa From bf2fde2d5a01938cd75183adbdced19c87ed6e19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:49:10 +0000 Subject: [PATCH 51/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index e1a83cd..9bbd3f4 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.14.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -157,6 +157,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 04 2024 Richard W.M. Jones - 1.14.1-1 - New upstream version 1.14.1 - Use github tarballs again. From 01a173e9abb04a4d227020c6618e206d10b865ae Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Sep 2024 16:26:31 +0100 Subject: [PATCH 52/59] Move to latest upstream Use forge macros Run autoreconf unconditionally Fix bash-completion-devel test Fix chrony.conf option leapseclist unsupported (RHBZ#2309439) --- .gitignore | 1 + augeas.spec | 72 +++++++++++++++++++++++++++++++++++++++++------------ sources | 3 ++- 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 2396b2a..0417d72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.build-*.log /augeas-*.tar.gz +/gnulib-*.tar.gz /clog diff --git a/augeas.spec b/augeas.spec index 9bbd3f4..49d8441 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,24 +1,32 @@ Name: augeas -Version: 1.14.1 -Release: 2%{?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 -URL: http://augeas.net/ -# The website release tarballs were not created for 1.13: -# http://download.augeas.net/ -Source0: https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz +%global forgeurl https://github.com/hercules-team/%{name} +%global commit 2de06e0519bb8daf047191e46a9672e1d16b1955 +%forgemeta +Release: 0.1%{?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 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%{?rhel} +%if 0%{?fedora} > 40 || 0%{?rhel} > 10 BuildRequires: bash-completion-devel %endif @@ -79,7 +87,26 @@ for %{name}. %prep -%autosetup -p1 +%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 \ @@ -87,7 +114,13 @@ for %{name}. --disable-gnulib-tests \ %endif --enable-static -make %{?_smp_mflags} +# 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 @@ -96,11 +129,11 @@ 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 -# exit 1 -#} +make %{?_smp_mflags} check || { + echo '===== tests/test-suite.log =====' + cat tests/test-suite.log + exit 1 +} %install rm -rf $RPM_BUILD_ROOT @@ -144,7 +177,7 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %files bash-completion -%if !0%{?rhel} +%if 0%{?fedora} > 40 || 0%{?rhel} > 10 %dir %{bash_completions_dir} %{bash_completions_dir}/augmatch %{bash_completions_dir}/augprint @@ -157,6 +190,13 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Tue Sep 03 2024 Richard W.M. Jones - 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 - 1.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 0e75126..f747d56 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (augeas-1.14.1.tar.gz) = fddb2e243f979e71fc09f9d45d569d6307b35485b2d885bf7bcbc032ba5617fe7ab2071a041422c3efe2dd62eda74aba41016d248c0636e947d4f1c9144375aa +SHA512 (augeas-2de06e0519bb8daf047191e46a9672e1d16b1955.tar.gz) = 9ebd2b6d55b71561567d170fcc4532ea259ec33c0dd8e1386a0687861c5e4d50b512d1760f4586ac2e5a2ee968b157db6eae91cd6322cd1f7d71b8a5efef12d7 +SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee From 5b331883b19ddcff9b9a29d28bfcb9ef09e9a63c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:57:59 +0000 Subject: [PATCH 53/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 49d8441..abf6508 100644 --- a/augeas.spec +++ b/augeas.spec @@ -7,7 +7,7 @@ License: LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (G %global commit 2de06e0519bb8daf047191e46a9672e1d16b1955 %forgemeta -Release: 0.1%{?dist} +Release: 0.2%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -190,6 +190,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.14.2-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Sep 03 2024 Richard W.M. Jones - 1.14.2-0 - Move to latest upstream - Use forge macros From 0feae87a318f4dcea9e1b8cf31a618d6171bda96 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 24 Feb 2025 17:11:41 +0000 Subject: [PATCH 54/59] 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 --- augeas.spec | 22 +++++++++++++++++++--- sources | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/augeas.spec b/augeas.spec index abf6508..4626309 100644 --- a/augeas.spec +++ b/augeas.spec @@ -3,11 +3,21 @@ 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 -%global forgeurl https://github.com/hercules-team/%{name} -%global commit 2de06e0519bb8daf047191e46a9672e1d16b1955 +# 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 %forgemeta -Release: 0.2%{?dist} +Release: 0.3%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -190,6 +200,12 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Mon Feb 24 2025 Richard W.M. Jones - 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 - 1.14.2-0.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index f747d56..f2aaa93 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (augeas-2de06e0519bb8daf047191e46a9672e1d16b1955.tar.gz) = 9ebd2b6d55b71561567d170fcc4532ea259ec33c0dd8e1386a0687861c5e4d50b512d1760f4586ac2e5a2ee968b157db6eae91cd6322cd1f7d71b8a5efef12d7 +SHA512 (augeas-6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d.tar.gz) = 80b57a354c08ca8f9ffa47d7ec2e17121cfe336b1d24306d4c5a2b1c0198dc430ca7e5aec7044b623f5f77e61f690ba87fa1210457b20cb920c2e5a4a2395c18 SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee From 22dafcce623c3e2124f31601704d2da7244bd617 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 24 Mar 2025 10:08:41 +0000 Subject: [PATCH 55/59] Make sure the test environment has enough autotools to unpack sources Signed-off-by: Alexander Bokovoy --- tests/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 461ccb9..da5fd70 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -4,6 +4,9 @@ - role: standard-test-source tags: - always + required_packages: + - autoconf + - automake - role: standard-test-basic tags: - atomic From f3e7924e2bc359364d17872a7fe4aa0081edd9be Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 24 Mar 2025 09:01:33 +0000 Subject: [PATCH 56/59] CVE-2025-2588: crash in parsing incorrect regexps Upstream fix: https://github.com/hercules-team/augeas/pull/854 Signed-off-by: Alexander Bokovoy Signed-off-by: Richard W.M. Jones --- augeas.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/augeas.spec b/augeas.spec index 4626309..0b20471 100644 --- a/augeas.spec +++ b/augeas.spec @@ -14,10 +14,10 @@ License: LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (G # But actually: %global forgeurl https://github.com/rwmjones/%{name} -%global commit 6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d +%global commit 4dffa3d6f9ff6aa41aee2ebd3aa6d80b01af1637 %forgemeta -Release: 0.3%{?dist} +Release: 0.4%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -25,6 +25,7 @@ Source0: %{forgesource} # 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 + Provides: bundled(gnulib) BuildRequires: autoconf, automake, libtool @@ -200,6 +201,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Mon Mar 24 2025 Alexander Bokovoy - 1.14.2-0.4 +- rhbz#235444: CVE-2025-2588 + * Mon Feb 24 2025 Richard W.M. Jones - 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 diff --git a/sources b/sources index f2aaa93..c9bc3cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (augeas-6ee1282259f46e5e44e5bb69d9fa0cf2a255b07d.tar.gz) = 80b57a354c08ca8f9ffa47d7ec2e17121cfe336b1d24306d4c5a2b1c0198dc430ca7e5aec7044b623f5f77e61f690ba87fa1210457b20cb920c2e5a4a2395c18 SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee +SHA512 (augeas-4dffa3d6f9ff6aa41aee2ebd3aa6d80b01af1637.tar.gz) = ff73ce88c3f89ce11a5372f192350a2492133aff9cab741f272a959f8e465e02f354e8bc5e4077b42913e9a9ff3363f0556a496973c119667cf088e1d5db745a From 9bd07d96d2846f6665184a8c85cb48ea64016612 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Apr 2025 10:07:06 +0100 Subject: [PATCH 57/59] Rebase our branch on top of Augeas Use patches to make it clearer what we are adding on top of upstream. --- ...-Tighten-parsing-of-the-vfstype-fiel.patch | 51 ++++++++++++ ...-Allow-individual-mount-options-to-b.patch | 77 +++++++++++++++++++ augeas.spec | 27 +++---- sources | 2 +- 4 files changed, 143 insertions(+), 14 deletions(-) create mode 100644 0001-lenses-fstab.aug-Tighten-parsing-of-the-vfstype-fiel.patch create mode 100644 0002-lenses-fstab.aug-Allow-individual-mount-options-to-b.patch diff --git a/0001-lenses-fstab.aug-Tighten-parsing-of-the-vfstype-fiel.patch b/0001-lenses-fstab.aug-Tighten-parsing-of-the-vfstype-fiel.patch new file mode 100644 index 0000000..34c4eb4 --- /dev/null +++ b/0001-lenses-fstab.aug-Tighten-parsing-of-the-vfstype-fiel.patch @@ -0,0 +1,51 @@ +From 9e26cf6459295908afd002f70bb257eb8136269a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +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 +--- + 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 + diff --git a/0002-lenses-fstab.aug-Allow-individual-mount-options-to-b.patch b/0002-lenses-fstab.aug-Allow-individual-mount-options-to-b.patch new file mode 100644 index 0000000..70b4eb2 --- /dev/null +++ b/0002-lenses-fstab.aug-Allow-individual-mount-options-to-b.patch @@ -0,0 +1,77 @@ +From 80ae0fd68a33541483e21f871b83f9e3d78c9831 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +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 +--- + 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 + diff --git a/augeas.spec b/augeas.spec index 0b20471..a80a06e 100644 --- a/augeas.spec +++ b/augeas.spec @@ -3,21 +3,11 @@ 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 -# 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 4dffa3d6f9ff6aa41aee2ebd3aa6d80b01af1637 +%global forgeurl https://github.com/hercules-team/%%{name} +%global commit af2aa88ab37fc48167d8c5e43b1770a4ba2ff403 %forgemeta -Release: 0.4%{?dist} +Release: 0.5%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -26,6 +16,13 @@ Source0: %{forgesource} # 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 @@ -201,6 +198,10 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Tue Apr 15 2025 Richard W.M. Jones - 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 - 1.14.2-0.4 - rhbz#235444: CVE-2025-2588 diff --git a/sources b/sources index c9bc3cb..c484334 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (augeas-af2aa88ab37fc48167d8c5e43b1770a4ba2ff403.tar.gz) = 7c499af33af46ac408583e992b5e7826fe433a48c4fe56858c73560ff50a935b34823a94fd7e801eb375700f57ef78df71b603e2ddb1ab3f86049e23ac26066d SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee -SHA512 (augeas-4dffa3d6f9ff6aa41aee2ebd3aa6d80b01af1637.tar.gz) = ff73ce88c3f89ce11a5372f192350a2492133aff9cab741f272a959f8e465e02f354e8bc5e4077b42913e9a9ff3363f0556a496973c119667cf088e1d5db745a From 4a848504d16993a9eb86da169eff6f89773ad682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:26:21 +0000 Subject: [PATCH 58/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index a80a06e..187ccaf 100644 --- a/augeas.spec +++ b/augeas.spec @@ -7,7 +7,7 @@ License: LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (G %global commit af2aa88ab37fc48167d8c5e43b1770a4ba2ff403 %forgemeta -Release: 0.5%{?dist} +Release: 0.6%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -198,6 +198,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.14.2-0.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 15 2025 Richard W.M. Jones - 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. From a380e1bbb33f2fc2235c3030a868ee52d3927d37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:08:32 +0000 Subject: [PATCH 59/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- augeas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/augeas.spec b/augeas.spec index 187ccaf..3cd8b08 100644 --- a/augeas.spec +++ b/augeas.spec @@ -7,7 +7,7 @@ License: LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (G %global commit af2aa88ab37fc48167d8c5e43b1770a4ba2ff403 %forgemeta -Release: 0.6%{?dist} +Release: 0.7%{?dist} URL: %{forgeurl} Source0: %{forgesource} @@ -198,6 +198,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %endif %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.14.2-0.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.14.2-0.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild