diff --git a/augeas-0.5.0.tar.gz b/augeas-0.5.0.tar.gz deleted file mode 100644 index 8012c26..0000000 --- a/augeas-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87a9937bbdaf2f6170c7130ae13a4b0cf963a27bbe0dcffe18d5bea626417f6c -size 1099740 diff --git a/augeas-0.7.3.tar.gz b/augeas-0.7.3.tar.gz new file mode 100644 index 0000000..9d82cc6 --- /dev/null +++ b/augeas-0.7.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10be72446699fdcaad66e800bd83a74b4af4da40348eaca04effd8677c11514a +size 1386027 diff --git a/augeas-modprobe-lense.patch b/augeas-modprobe-lense.patch new file mode 100644 index 0000000..1b6c6cc --- /dev/null +++ b/augeas-modprobe-lense.patch @@ -0,0 +1,23 @@ +augeas: support allow_unsupported_modules command in modprobe.d conf files + +From: Patrick Mullaney + +Signed-off-by: Patrick Mullaney +--- + + lenses/modprobe.aug | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + + +diff --git a/lenses/modprobe.aug b/lenses/modprobe.aug +index bdecafb..0f5ae47 100644 +--- a/lenses/modprobe.aug ++++ b/lenses/modprobe.aug +@@ -44,6 +44,7 @@ let entry = alias + | options + | cmd_token_to_eol /install|remove/ + | [ cmd "blacklist" . token . eol ] ++ | [ cmd "allow_unsupported_modules" . token . eol ] + | [ cmd "config" . store /binary_indexes|yes|no/ ] + + let lns = (comment|empty|entry)* diff --git a/augeas.changes b/augeas.changes index b771e32..44f97ca 100644 --- a/augeas.changes +++ b/augeas.changes @@ -1,3 +1,247 @@ +------------------------------------------------------------------- +Thu Oct 7 12:40:02 UTC 2010 - pmullaney@novell.com + +- added patch for allow_unsupported_modules command in modprobe.d conf files + +------------------------------------------------------------------- +Fri Oct 1 13:23:25 CEST 2010 - jkupec@suse.cz + +- added vim files symlinks for lens syntax files +- fixed a few rpmlint warnings (fixed rpm group, no ldconfig run) + +------------------------------------------------------------------- +Thu Sep 9 10:20:08 CEST 2010 - jkupec@suse.cz + +* Update to 0.7.3 +* ug_load: only reparse files that have actually changed; greatly + speeds up reloading +* record all variables in /augeas/variables, regardless of whether + they were defined with aug_defvar or aug_defnode; make sure + /augeas/variables always exists +* redefine all variables (by reevaluating their corresponding + expressions) after a aug_load. This makes variables 'sticky' + across loads +* fix behavior of aug_defnode to not fail when the expression + evaluates to a nonempty node set +* make gnulib a git submodule so that we record the gnulib commit + off which we are based +* allow 'let rec' with non-recursive RHS +* fix memory corruption when reloading a tree into which a + variable defined by defnode points (BZ 613967) +* plug a few small memory leaks, and some segfaults +* Lens changes/additions + * Device_map: new lens for grub's device.map (Matt Booth) + * Limits: also look for files in /etc/security/limits.d + * Mysql: new lens (Tim Stoop) + * Shellvars: read /etc/sysconfig/suseconfig (Frederik Wagner) + * Sudoers: allow escaped spaces in user/group names (Raphael Pinson) + * Sysconfig: lens for the shell subdialect used in /etc/sysconfig; + lens strips quotes automatically + +------------------------------------------------------------------- +Thu Sep 9 10:20:07 CEST 2010 - jkupec@suse.cz + +* 0.7.2 - 2010-06-22 +* new API call aug_setm to set/create multiple nodes simultaneously +* record expression used in a defvar underneath /augeas/variables +* Lens changes/additions + * Group: add test for disabled account (Raphael Pinson) + * Grub: handle comments within a boot stanza + * Iptables: also look for /etc/iptables-save (Nicolas Valcarcel) + * Modules_conf: new lens for /etc/modules.conf (Matt Booth) + * Securetty: added handling of emtpy lines/comments (Frederik Wagner) + * Shellvars: added SuSE sysconfig puppet files (Frederik Wagner), + process /etc/environment (seph) + * Shellvars_list: Shellvars-like lens that treats strings of + space-separated words as lists (Frederik Wagner) + +------------------------------------------------------------------- +Thu Sep 9 10:20:06 CEST 2010 - jkupec@suse.cz + +* 0.7.1 - 2010-04-21 +* fix crash when recursive lens was used in a nonrecursive lens (bug #100) +* context free parser/recursive lenses: handle 'l?' properly (bug #119); + distinguish between successful parse and parse with an error at end of + input; do caller filtering to avoid spurious ambiguous parses with + grammars containing epsilon productions +* aug_get: return -1 when multiple nodes match (bug #121) +* much better error message when iteration stops prematurely during + put/create than the dreaded 'Short iteration' +* src/lens.c (lns_check_rec): fix refcounting mistake on error path (bug #120) +* Lens changes/additions + * Approx: lens and test for the approx proxy server (Tim Stoop) + * Cgconfig: lens and tests for libcgroup config (Ivana Hutarova Varekova) + * Cgrules: new lens and test (Ivana Hutarova Varekova) + * Cobblermodules: lens + tests for cobbler's modules.conf (Shannon Hughes) + * Debctrl: new lens and test (Dominique Dumont) + * Dput: add 'allow_dcut' parameter (bug #105) (Raphael Pinson) + * Dhclient: add rfc code parsing (bug #107) (Raphael Pinson) + * Group: handle disabled passwords + * Grub: support empty kernel parameters, Suse incl.s (Frederik Wagner) + * Inittab: allow ':' in the process field (bug #109) + * Logrotate: tolerate whitespace at the end of a line (bug #101); files + can be separated by newlines (bug #104) (Raphael Pinson) + * Modprobe: Suse includes (Frederik Wagner) + * Nagisocfg: lens and test for /etc/nagios3/nagios.cfg (Tim Stoop) + * Ntp: add 'tinker' directive (bug #103) + * Passwd: parse NIS entries on Solaris + * Securetty: new lens and test for /etc/securetty (Simon Josi) + * Shellvars: handle a bare 'export VAR'; Suse includes (Frederik + Wagner); allow spaces after/before opening/closing parens for array + * Sudoers: allow del_negate even if no negate_node is found (bug #106) + (Raphael Pinson); accept 'secure_path' (BZ 566134) (Stuart + Sears) + +------------------------------------------------------------------- +Thu Sep 9 10:20:05 CEST 2010 - jkupec@suse.cz + +* 0.7.0 - 2010-01-14 +* Support for context-free lenses via the 'let rec' keyword. The syntax + is experimental, though the feature is here to stay. See + lenses/json.aug for an example of what's possible with that. +* Support for case-insensitive regular expressions. Simply append 'i' to + a regexp literal to make it case-insensitive, e.g. /hello/i will match + all variations of hello, regardless of case. +* Major revamp of augtool. In particular, path expressions don't need to + be quoted anymore. The online help has been greatly improved. +* Check during load/save that each file is only matched by one transform + under /augeas/load. If there are multiple transforms for a file, the + file is skipped. +* New error codes AUG_ENOLENS and AUG_EMXFM +* Do not choke on non-existing lens during save +* Change the metadata for files under /augeas/files slightly: the node + /augeas/files/$PATH/lens now has the name of the lens used to load the + file; the source location of that lens has moved to + /augeas/files/$PATH/lens/info +* New public functions fa_nocase, fa_is_nocase, and fa_expand_nocase in + libfa +* Various smaller bug fixes, performance improvements and improved error + messages +* Lens changes/additions + * Cobblersettings: new lens and test (Bryan Kearney) + * Iptables: allow quoted strings as arguments; handle both negation + syntaxes + * Json: lens and tests for generic Json files + * Lokkit: allow '-' in arguments + * Samba: accept entry keys with ':' (Partha Aji) + * Shellvars: allow arrays that span multiple lines + * Xinetd (name): fix bad '-' in character class + +------------------------------------------------------------------- +Thu Sep 9 10:20:04 CEST 2010 - jkupec@suse.cz + +* 0.6.0 - 2009-11-30 +* Add error reporting API (aug_error and related calls); use to report + error details in a variety of places +* Path expressions: add regexp matching; add operator '|' to form union + of nodesets (ticket #89) +* Tolerate non-C locales from the environment (ticket #35); it is no + longer necessary to set the locale to C from the outside +* use stpcpy/stpncpy from gnulib (needed for building on Solaris) +* Properly check regexp literals for syntax errors (ticket #93) +* Distribute and install vim syntax files (ticket #97) +* many more bugfixes +* Lens changes/additions + * Apt_preferences: support version pin; filter out empty lines (Matt + Palmer) + * Cron: variables can contain '_' etc. (ticket #94) + * Ethers: new lens for /etc/ethers (Satoru SATOH) + * Fstab: allow '#' in spec (ticket #95) + * Group: allow empty password field (ticket #95) + * Inittab: parse end-of-line comments into a #comment + * Krb5: support kdc section; add v4_name_convert subsection to + libdefaults (ticket #95) + * Lokkit: add mising eol to forward_port; make argument for --trust + more permissive + * Pam: allow '-' before type + * Postfix_access: new lens for /etc/postfix/access (Partha Aji) + * Rx: allow '!' in device_name + * Sudoers: allow certain backslash-quoted characters in a command (Matt + Palmer) + * Wine: new lens to read Windows registry files + +------------------------------------------------------------------- +Thu Sep 9 10:20:03 CEST 2010 - jkupec@suse.cz + +* 0.5.3 - 2009-09-14 +* Match trees on label + value, not just label; see + tests/modules/pass_strip_quotes.aug for how that enables stripping + quotes +* Do not trip over symlinks to files on a different device during save; + fixes problems with writing to /etc/grub.conf on Fedora/RHEL +* API (defnode): always add the newly created node into the resulting + nodeset +* Add preceding-sibling and following-sibling axes to path expressions +* augtool, augparse: add --version option (bug #88) +* Change file info recorded under /augeas/files/FILE/*: remove lens/id + and move lens/info to lens +* Properly record new files under /augeas/files (bug #78) +* aug_load: clean up variables to avoid dangling references (bug #79) +* Make Augeas work on AIX +* Ignore anything but regular files when globbing +* Add 'clear' function to language for use in unit tests +* typechecker: print example trees in tree format +* libfa: properly support regexps with embedded NUL's +* Lens changes/additions + * Xorg: revamped, fixes various parse failures (Matt Booth) + * Inetd: new lens and test (Matt Palmer) + * Multipath: new lens and test + * Slapd: also read /etc/openldap.slapd.conf (bug #85) + +------------------------------------------------------------------- +Thu Sep 9 10:20:02 CEST 2010 - jkupec@suse.cz + +* 0.5.2 - 2009-07-13 +* Make Augeas work on Mac OS/X (bug #66) (Anders Bjoerklund) +* reduce symbols exported from libfa with linker script +* add --echo option to augtool +* require Automake 1.11 (Jim Meyering) +* avoid spurious save attempts for freshly read files +* Lens changes/additions + * Inittab: schema change: use 'id' field as name of subtree for a line, + instead of a generated number. Map comments as '#comment' (Matt Palmer) + * Logrotate: make owner/group in create statement optional, allow + filenames to be indented + * Ntp: allow additional options for server etc. (bug #72) + * Shellvars: allow backticks as quote characters (bug #74) + * Yum: also read files in /etc/yum/pluginconf.d (Marc Fournier) + +------------------------------------------------------------------- +Thu Sep 9 10:20:01 CEST 2010 - jkupec@suse.cz + +* 0.5.1 - 2009-06-09 +* augeas.h: flag AUG_NO_MODL_AUTOLOAD suppresses initial loading + of modules; exposed as --noautoload in augtool +* augtool: don't prompt when input is not from tty (Raphael Pinson) +* augparse: add --notypecheck option +* path expressions: allow things like '/foo and /bar[3]' in predicates +* Lens changes/additions + * Aliases: map comments as #comment (Raphael Pinson) + * Build, Rx, Sep: new utility modules (Raphael Pinson) + * Cron: new lens (Raphael Pinson) + * Dnsmasq: process files in /etc/dnsmasq.d/* (ticket #65) + * Grub: parse kernel and module args into separate nodes; parse + arguments for 'serial', 'terminal', and 'chainloader'; allow + optional argument for 'savedefault' + * Interfaces: make compliant with actual Debian spec (Matt Palmer) + * Iptables: relax regexp for chain names; allow comment lines mixed + in with chains and rules (ticket #51) + * Logrotate: allow '=' as separator (ticket #61); make newline at end + of scriptlet optional + * Modprobe: handle comments at end of line + * Ntp: parse fudge record (Raphael Pinson); parse all directives in + default Fedora ntp.conf; process 'broadcastdelay', 'leapfile', + and enable/disable flags (ticket #62) + * Pbuilder: new lens for Debian's personal builder (Raphael Pinson) + * Php: add default path on Fedora/RHEL (Marc Fournier) + * Squid: handle indented entries (Raphael Pinson) + * Shellvars: map 'export' and 'unset'; map comments as #comment + (Raphael Pinson) + * Sudoers: allow backslashes inside values (ticket #60) (Raphael Pinson) + * Vsftpd: map comments as #comment; handle empty lines; find + vsftpd.conf on Fedora/RHEL + * Xinetd: map comments as #comment (Raphael Pinson) + ------------------------------------------------------------------- Tue Dec 15 19:40:27 CET 2009 - jengelh@medozas.de @@ -16,10 +260,6 @@ Tue Mar 31 15:51:48 CEST 2009 - jkupec@suse.cz startup; add --noload option to augtool * New API calls aug_defvar and aug_defnode to define variables for path expressions; exposed as 'defvar' and 'defnode' in augtool -* Lenses distributed with Augeas are now installed in - /usr/share/augeas/lenses/dist, which is searched after - /usr/share/augeas/lenses, so that lenses installed by other packages - take precedence * New program examples/fadot to draw various finite automata (Francis Giraldeau) * Report line number and character offset in the tree when parsing a diff --git a/augeas.spec b/augeas.spec index 33e9613..8259957 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,7 +1,7 @@ # -# spec file for package augeas (Version 0.5.0) +# spec file for package augeas (Version 0.7.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ Name: augeas -Version: 0.5.0 -Release: 2 +Version: 0.7.3 +Release: 1 Summary: A library for changing configuration files Group: System/Libraries License: GPLv3+ ; LGPLv2.1+ -Url: http://www.augeas.net +Url: http://augeas.net/ Source0: http://augeas.net/download/augeas-%{version}.tar.gz +Patch0: augeas-modprobe-lense.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel readline-devel @@ -50,7 +51,7 @@ Authors: %package devel License: GPLv3+ ; LGPLv2.1+ Summary: A library for changing configuration files -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: %{__shrlibname} = %{version} %description devel @@ -69,13 +70,14 @@ Authors: -------- David Lutterkort -%package -n libaugeas0 +%package -n %{__shrlibname} + License: GPLv3+ ; LGPLv2.1+ Summary: A library for changing configuration files -Group: System/Libraries +Group: Development/Libraries/C and C++ Recommends: %{name}-lenses = %{version} -%description -n libaugeas0 +%description -n %{__shrlibname} 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 @@ -93,7 +95,7 @@ Authors: %package lenses License: GPLv3+ ; LGPLv2.1+ -Summary: Official set of lenses for use by libaugeas0 +Summary: Official set of lenses for use by %{__shrlibname} Group: Development/Libraries/Other Requires: %{__shrlibname} = %{version} @@ -129,31 +131,42 @@ Authors: %prep %setup -q +%patch0 -p1 %build export CFLAGS="-Wno-error $RPM_OPT_FLAGS" %configure --disable-static --datadir=%{_datadir}/%{__shrlibname} -%{__make} %{?jobs:-j%jobs}; +%{__make} %_smp_mflags %install make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# create symlinks of augeas.vim files to vim/site +mkdir -p $RPM_BUILD_ROOT/usr/share/vim/site/ftdetect; \ +mkdir $RPM_BUILD_ROOT/usr/share/vim/site/syntax; \ +ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim \ + ${RPM_BUILD_ROOT}/usr/share/vim/site/ftdetect/augeas.vim +ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim \ + ${RPM_BUILD_ROOT}/usr/share/vim/site/syntax/augeas.vim %clean rm -rf $RPM_BUILD_ROOT -%post -n %{__shrlibname} -p /sbin/ldconfig +%post -n %{__shrlibname} +/sbin/ldconfig -%postun -n %{__shrlibname} -p /sbin/ldconfig +%postun -n %{__shrlibname} +/sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/augtool %{_bindir}/augparse +%{_bindir}/fadot %{_mandir}/man1/* %doc AUTHORS COPYING NEWS -%files -n libaugeas0 +%files -n %{__shrlibname} %defattr(-,root,root,-) %{_libdir}/*.so.* @@ -170,6 +183,18 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/%{__shrlibname}/%{name}/lenses %dir %{_datadir}/%{__shrlibname}/%{name}/lenses/dist %{_datadir}/%{__shrlibname}/%{name}/lenses/dist/*.aug +%dir %{_datadir}/vim +%dir %{_datadir}/vim/site +%dir %{_datadir}/vim/site/ftdetect +%{_datadir}/vim/site/ftdetect/augeas.vim +%dir %{_datadir}/vim/site/syntax +%{_datadir}/vim/site/syntax/augeas.vim +%dir %{_datadir}/%{__shrlibname}/vim +%dir %{_datadir}/%{__shrlibname}/vim/vimfiles +%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect +%{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim +%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax +%{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim %files lense-tests %defattr(-,root,root,-)