diff --git a/.augeas.metadata b/.augeas.metadata new file mode 100644 index 0000000..589ff29 --- /dev/null +++ b/.augeas.metadata @@ -0,0 +1 @@ +2c5ec65a30ab21b175d612b4dc6350d75b9d6a7c SOURCES/augeas-1.1.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/augeas-1.1.0-grub-setkey.patch b/SOURCES/augeas-1.1.0-grub-setkey.patch new file mode 100644 index 0000000..5cc956a --- /dev/null +++ b/SOURCES/augeas-1.1.0-grub-setkey.patch @@ -0,0 +1,160 @@ +From bc46ce8269a89a55b87a906226cfe8b54e9e5d11 Mon Sep 17 00:00:00 2001 +From: Matthew Booth +Date: Tue, 27 Aug 2013 15:24:48 +0100 +Subject: [PATCH 1/3] Grub: support the 'setkey' directive + +--- + lenses/grub.aug | 7 +++++++ + lenses/tests/test_grub.aug | 6 ++++++ + 2 files changed, 13 insertions(+) + +diff --git a/lenses/grub.aug b/lenses/grub.aug +index 2c19ffa..d8fd5ed 100644 +--- a/lenses/grub.aug ++++ b/lenses/grub.aug +@@ -132,6 +132,12 @@ module Grub = + |[ spc . switch_arg /timeout|lines/ ])* . + [ spc . key /console|serial|hercules/ ]* . eol ] + ++ (* View: setkey *) ++ let setkey = [ command "setkey" "" . ++ ( spc . [ label "to" . store Rx.no_spaces ] . ++ spc . [ label "from" . store Rx.no_spaces ] )? . ++ eol ] ++ + (* View: menu_setting *) + let menu_setting = kw_menu_arg "default" + | kw_menu_arg "fallback" +@@ -145,6 +151,7 @@ module Grub = + | password_arg + | color + | device ++ | setkey + + (* View: title *) + let title = del /title[ \t=]+/ "title " . value_to_eol . eol +diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug +index 3eba710..e4dc228 100644 +--- a/lenses/tests/test_grub.aug ++++ b/lenses/tests/test_grub.aug +@@ -12,6 +12,8 @@ module Test_grub = + device (hd0) HD(1,800,64000,9895c137-d4b2-4e3b-a93b-dc9ac4) + password --md5 $1$M9NLj$p2gs87vwNv48BUu.wAfVw0 + default=0 ++setkey ++setkey less backquote + background 103332 + timeout=5 + splashimage=(hd0,0)/grub/splash.xpm.gz +@@ -54,6 +56,10 @@ title othermenu + { "password" = "$1$M9NLj$p2gs87vwNv48BUu.wAfVw0" + { "md5" } } + { "default" = "0" } ++ { "setkey" } ++ { "setkey" ++ { "to" = "less" } ++ { "from" = "backquote" } } + { "background" = "103332" } + { "timeout" = "5" } + { "splashimage" = "(hd0,0)/grub/splash.xpm.gz" } +-- +1.8.3.1 + + +From f55175ed0e17a5a4f50a32d9ad5cba5f486eb577 Mon Sep 17 00:00:00 2001 +From: Matthew Booth +Date: Tue, 27 Aug 2013 15:24:49 +0100 +Subject: [PATCH 2/3] Grub: NFC fix whitespace errors introduced by 4e09d15 + +Kill tabs! +--- + lenses/grub.aug | 6 +++--- + lenses/tests/test_grub.aug | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lenses/grub.aug b/lenses/grub.aug +index d8fd5ed..a64a572 100644 +--- a/lenses/grub.aug ++++ b/lenses/grub.aug +@@ -102,8 +102,8 @@ module Grub = + * This is a shell-only directive in upstream grub; the grub versions + * in at least Fedora/RHEL use this to find devices for UEFI boot *) + let device = +- [ command "device" "" . Sep.space . store /\([A-Za-z0-9_.-]+\)/ . spc . +- [ label "file" . value_to_eol ] . Util.eol ] ++ [ command "device" "" . Sep.space . store /\([A-Za-z0-9_.-]+\)/ . spc . ++ [ label "file" . value_to_eol ] . Util.eol ] + + (* View: color *) + let color = +@@ -150,7 +150,7 @@ module Grub = + | terminal + | password_arg + | color +- | device ++ | device + | setkey + + (* View: title *) +diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug +index e4dc228..87bb243 100644 +--- a/lenses/tests/test_grub.aug ++++ b/lenses/tests/test_grub.aug +@@ -52,7 +52,7 @@ title othermenu + { "#comment" = "initrd /initrd-version.img" } + { "#comment" = "boot=/dev/sda" } + { "device" = "(hd0)" +- { "file" = "HD(1,800,64000,9895c137-d4b2-4e3b-a93b-dc9ac4)" } } ++ { "file" = "HD(1,800,64000,9895c137-d4b2-4e3b-a93b-dc9ac4)" } } + { "password" = "$1$M9NLj$p2gs87vwNv48BUu.wAfVw0" + { "md5" } } + { "default" = "0" } +-- +1.8.3.1 + + +From e3f1c15155fba5c10e74b400f2b06c8a31372420 Mon Sep 17 00:00:00 2001 +From: Matthew Booth +Date: Tue, 27 Aug 2013 15:24:50 +0100 +Subject: [PATCH 3/3] Grub: support the 'lock' directive + +--- + lenses/grub.aug | 1 + + lenses/tests/test_grub.aug | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/lenses/grub.aug b/lenses/grub.aug +index a64a572..9f8d6af 100644 +--- a/lenses/grub.aug ++++ b/lenses/grub.aug +@@ -216,6 +216,7 @@ module Grub = + | configfile + | module_line + | map_line ++ | kw_pres "lock" + + (* View: boot *) + let boot = +diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug +index 87bb243..de6397d 100644 +--- a/lenses/tests/test_grub.aug ++++ b/lenses/tests/test_grub.aug +@@ -38,6 +38,7 @@ title Fedora (2.6.24.3-34.fc8) + initrd /initrd-2.6.24.3-34.fc8.img + map (hd0) (hd1) + title othermenu ++ lock + configfile /boot/grub/othergrub.conf + " + +@@ -88,6 +89,7 @@ title othermenu + { "initrd" = "/initrd-2.6.24.3-34.fc8.img" } + { "map" { "from" = "(hd0)" } { "to" = "(hd1)" } } } + { "title" = "othermenu" ++ { "lock" } + { "configfile" = "/boot/grub/othergrub.conf" } } + + +-- +1.8.3.1 + diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec new file mode 100644 index 0000000..e60ac47 --- /dev/null +++ b/SPECS/augeas.spec @@ -0,0 +1,209 @@ +Name: augeas +Version: 1.1.0 +Release: 3%{?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 + +# RHBZ#1019485: Grub module setkey/lock support +Patch1: augeas-1.1.0-grub-setkey.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: readline-devel libselinux-devel libxml2-devel +Requires: %{name}-libs = %{version}-%{release} + +%description +A library for programmatically editing configuration files. Augeas parses +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. + +The transformation works very hard to preserve comments and formatting +details. It is controlled by ``lens'' definitions that describe the file +format and the transformation into a tree. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package libs +Summary: Libraries for %{name} +Group: System Environment/Libraries + +%description libs +The libraries for %{name}. + + +%prep +%setup -q +%patch1 -p1 + +%build +%configure --disable-static +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +# The tests/ subdirectory contains lenses used only for testing, and +# so it shouldn't be packaged. +rm -r $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/tests + +%clean +rm -rf $RPM_BUILD_ROOT + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/augtool +%{_bindir}/augparse +%{_bindir}/fadot +%doc %{_mandir}/man1/* +%{_datadir}/vim/vimfiles/syntax/augeas.vim +%{_datadir}/vim/vimfiles/ftdetect/augeas.vim + +%files libs +%defattr(-,root,root,-) +# %{_datadir}/augeas and %{_datadir}/augeas/lenses are owned +# by filesystem. +%{_datadir}/augeas/lenses/dist +%{_libdir}/*.so.* +%doc AUTHORS COPYING NEWS + +%files devel +%defattr(-,root,root,-) +%doc +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/augeas.pc + +%changelog +* Tue Oct 22 2013 Dominic Cleal - +- Add patch for Grub module, setkey/lock support (RHBZ#1019485) + +* Mon Aug 12 2013 Dominic Cleal - 1.1.0-2 +- Fix source URL to download.augeas.net (RHBZ#996033) + +* Wed Jun 19 2013 David Lutterkort - 1.1.0-1 +- Update to 1.1.0; remove all patches + +* Tue Jun 18 2013 Richard W.M. Jones - 1.0.0-4 +- Fix /etc/sysconfig/network (RHBZ#904222). + +* Wed Jun 5 2013 Richard W.M. Jones - 1.0.0-3 +- Don't package lenses in tests/ subdirectory. + +* Wed Feb 13 2013 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 4 2013 David Lutterkort - 1.0.0-1 +- New version; remove all patches + +* Wed Jul 18 2012 Fedora Release Engineering - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 10 2012 David Lutterkort - 0.10.0-3 +- Add patches for bugs 247 and 248 (JSON lens) + +* Sat Dec 3 2011 Richard W.M. Jones - 0.10.0-2 +- Add patch to resolve missing libxml2 requirement in augeas.pc. + +* Fri Dec 2 2011 David Lutterkort - 0.10.0-1 +- New version + +* Mon Jul 25 2011 David Lutterkort - 0.9.0-1 +- New version; removed patch pathx-whitespace-ea010d8 + +* Tue May 3 2011 David Lutterkort - 0.8.1-2 +- Add patch pathx-whitespace-ea010d8.patch to fix BZ 700608 + +* Fri Apr 15 2011 David Lutterkort - 0.8.1-1 +- New version + +* Wed Feb 23 2011 David Lutterkort - 0.8.0-1 +- New version + +* Mon Feb 07 2011 Fedora Release Engineering - 0.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 22 2010 Matthew Booth - 0.7.4-1 +- Update to version 0.7.4 + +* Thu Nov 18 2010 Richard W.M. Jones - 0.7.3-2 +- Upstream patch proposed to fix GCC optimization bug (RHBZ#651992). + +* Fri Aug 6 2010 David Lutterkort - 0.7.3-1 +- Remove upstream patches + +* Tue Jun 29 2010 David Lutterkort - 0.7.2-2 +- Patches based on upstream fix for BZ 600141 + +* Tue Jun 22 2010 David Lutterkort - 0.7.2-1 +- Fix ownership of /usr/share/augeas. BZ 569393 + +* Wed Apr 21 2010 David Lutterkort - 0.7.1-1 +- New version + +* Thu Jan 14 2010 David Lutterkort - 0.7.0-1 +- Remove patch vim-ftdetect-syntax.patch. It's upstream + +* Tue Dec 15 2009 David Lutterkort - 0.6.0-2 +- Fix ftdetect file for vim + +* Mon Nov 30 2009 David Lutterkort - 0.6.0-1 +- Install vim syntax files + +* Mon Sep 14 2009 David Lutterkort - 0.5.3-1 +- Remove separate xorg.aug, included in upstream source + +* Tue Aug 25 2009 Matthew Booth - 0.5.2-3 +- Include new xorg lens from upstream + +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jul 13 2009 David Lutterkort - 0.5.2-1 +- New version + +* Fri Jun 5 2009 David Lutterkort - 0.5.1-1 +- Install fadot + +* Fri Mar 27 2009 David Lutterkort - 0.5.0-2 +- fadot isn't being installed just yet + +* Tue Mar 24 2009 David Lutterkort - 0.5.0-1 +- New program /usr/bin/fadot + +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version + +* Fri Feb 6 2009 David Lutterkort - 0.4.0-1 +- New version + +* Mon Jan 26 2009 David Lutterkort - 0.3.6-1 +- New version + +* Tue Dec 23 2008 David Lutterkort - 0.3.5-1 +- New version + +* Mon Feb 25 2008 David Lutterkort - 0.0.4-1 +- Initial specfile