From 9e2e331c525319c124b60aa78fedb6a56e374516 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Mon, 8 Aug 2016 13:34:05 +0100 Subject: [PATCH 1/5] 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 5845fc129ae715a8c30de8a1676fd4c9843d5218 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 9 Nov 2016 08:44:47 +0000 Subject: [PATCH 2/5] 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 244b2758417bde3729ca73d866b356bc8e8b0520 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 21 Mar 2017 08:08:49 +0000 Subject: [PATCH 3/5] 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 4/5] 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 5eadddf66b4a4caa579615c1b073dfa7bd40dbc9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 24 Aug 2017 15:02:42 +0100 Subject: [PATCH 5/5] 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