From 0c04e1d35810bc9b496ada23c42eed0d31240efc338a41f1fe6e5e8084304e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 6 May 2014 11:12:03 +0000 Subject: [PATCH] =?UTF-8?q?-=20Add=20check=20phase,=20comment=20out=20as?= =?UTF-8?q?=202=20test=20fails=20now.=20-=20Clean=20up=20with=20spec-clean?= =?UTF-8?q?er=20-=20Version=20bump=20to=201.2.0:=20=20=20-=20API=20changes?= =?UTF-8?q?=20=20=20=20=20*=20Add=20aug=5Fcp=20and=20the=20cp=20and=20copy?= =?UTF-8?q?=20commands=20=20=20=20=20*=20aug=5Fto=5Fxml=20now=20includes?= =?UTF-8?q?=20span=20information=20in=20the=20XML=20dump=20=20=20-=20Gener?= =?UTF-8?q?al=20changes/additions=20=20=20=20=20*=20Fix=20documentation=20?= =?UTF-8?q?link=20in=20c=5Fapi=20NaturalDocs=20menu=20=20=20=20=20*=20Fix?= =?UTF-8?q?=20NaturalDocs=20documentation=20for=20various=20lenses=20=20?= =?UTF-8?q?=20=20=20*=20src/transform.c=20(filter=5Fmatches):=20wrap=20fnm?= =?UTF-8?q?atch=20to=20ensure=20that=20an=20incl=20=20=20=20=20=20=20patte?= =?UTF-8?q?rn=20containing=20"//"=20matches=20file=20paths,=20RHBZ#1031084?= =?UTF-8?q?=20=20=20=20=20*=20Correct=20locations=20table=20for=20transfor?= =?UTF-8?q?m=5Fsave()=20(Tomas=20Hoger)=20=20=20=20=20*=20Corrections=20fo?= =?UTF-8?q?r=20CVE-2012-0786=20tests=20(Tomas=20Hoger)=20=20=20=20=20*=20F?= =?UTF-8?q?ix=20umask=20handling=20when=20creating=20new=20files,=20RHBZ#1?= =?UTF-8?q?034261=20=20=20-=20Lens=20changes/additions=20=20=20=20=20*=20A?= =?UTF-8?q?ccess:=20support=20DOMAIN\user=20syntax=20for=20users=20and=20g?= =?UTF-8?q?roups,=20bug=20#353=20=20=20=20=20*=20Authorized=5FKeys:=20Allo?= =?UTF-8?q?w=20'ssh-ed25519'=20as=20a=20valid=20authorized=5Fkey=20=20=20?= =?UTF-8?q?=20=20=20=20type=20(Jasper=20Lievisse=20Adriaanse)=20=20=20=20?= =?UTF-8?q?=20*=20Automounter:=20Handle=20hostnames=20with=20dashes=20in?= =?UTF-8?q?=20them,=20GH=20issue=20#27=20=20=20=20=20*=20Build:=20Add=20co?= =?UTF-8?q?mbinatorics=20group=20=20=20=20=20*=20Cyrus=5FImapd:=20Create?= =?UTF-8?q?=20new=20entries=20without=20space=20before=20separator,=20=20?= =?UTF-8?q?=20=20=20=20=20RHBZ#1014974=20(Dietmar=20Kling)=20=20=20=20=20*?= =?UTF-8?q?=20Desktop:=20Support=20square=20brackets=20in=20keys=20=20=20?= =?UTF-8?q?=20=20*=20Dhclient:=20Add=20dhclient.conf=20path=20for=20Debian?= =?UTF-8?q?/Ubuntu=20(Esteve=20Fernandez)=20=20=20=20=20*=20Dhcpd:=20Suppo?= =?UTF-8?q?rt=20conditionals,=20GH=20issue=20#34=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20Support=20a=20wider=20variety=20of=20allow/de?= =?UTF-8?q?ny=20statement,=20including=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20booting=20and=20bootp=20(Yanis=20Guenane)=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20Support=20a=20wider=20variety=20of?= =?UTF-8?q?=20DHCP=20allow/deny/ignore=20statements=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20(Yanis=20Guenane)=20=20=20=20=20*=20Doveco?= =?UTF-8?q?t:=20Various=20enhancements=20and=20bug=20fixes=20(Michael=20Ha?= =?UTF-8?q?slgr=C3=BCbler):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/augeas?expand=0&rev=46 --- augeas-1.1.0.tar.gz | 3 -- augeas-1.1.0.tar.gz.sig | Bin 280 -> 0 bytes augeas-1.2.0.tar.gz | 3 ++ augeas-1.2.0.tar.gz.sig | Bin 0 -> 280 bytes augeas.changes | 88 ++++++++++++++++++++++++++++++++++++++++ augeas.spec | 42 +++++++++++-------- 6 files changed, 115 insertions(+), 21 deletions(-) delete mode 100644 augeas-1.1.0.tar.gz delete mode 100644 augeas-1.1.0.tar.gz.sig create mode 100644 augeas-1.2.0.tar.gz create mode 100644 augeas-1.2.0.tar.gz.sig diff --git a/augeas-1.1.0.tar.gz b/augeas-1.1.0.tar.gz deleted file mode 100644 index 747037c..0000000 --- a/augeas-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b -size 1940928 diff --git a/augeas-1.1.0.tar.gz.sig b/augeas-1.1.0.tar.gz.sig deleted file mode 100644 index ff7e47bad642eb287403445406f4797ed15ec9be0b008894146451b8016146da..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dS0TlxU08zV=Nuo7&M*MDyA^`&ImIwV8D?kug*E;X(sC6#blG?UU*~U*P z;Fvw>wkuu*0xPXQB#h4_nxG+uugu0b1A}ye`=Y4?aF)qd`Kgd#8h>YfuqjFqHqt*A zP}(jH)EX=LOa0tOt-R~AKtLt5hKL{&6U1zSe%}0x2yNOlrS~vi4cGFW;BpSd5tZ9W zAROQ)XPTJCsJ|L>jia5C~>P|~BilXX%sI85zj`F6xMv;Nd*?%tE>klbI23zYj e+;h_*d0;CoojkuBn~B)HT14;m)#9eMHi@Sn^M`8y diff --git a/augeas-1.2.0.tar.gz b/augeas-1.2.0.tar.gz new file mode 100644 index 0000000..2da08f3 --- /dev/null +++ b/augeas-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4aeb28ebe0b0921920fe1c9b4c016739c25261a15de04cb97db02d669f481e0 +size 1957910 diff --git a/augeas-1.2.0.tar.gz.sig b/augeas-1.2.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..2cc7be55b43612cf0e39d56a5c0d064c6ce85d029a3bc1306fcaa26cb14e87f7 GIT binary patch literal 280 zcmV+z0q6dS0TlxU08-{?u%b0~M*MDyA^`%(jtBlZoOkxsIH2@HEVRm@mR@xcbCpw4 zFaFS174MpTrcVL=KgAeq3Dm+8z<7rN@D=HWG2-vwno|GUYgMfZTZK4{pmd*ps}wF#hAZ^Ip?I;TfE!k!k}zi zv>NDTP&9F+sIb{ID+LA_MpysnFD4vJ5B)d9vXFn6p(9&_Rc-G1e&nEoqF7a5ReN(n z*QBb@Ags~+r*rnrF*o{ZH&3j|ee1A|@pyvXxtV{t1}Y%MaVnVjq){w~o?>g|0LT6N ejm8q_*O4v0KuQERPfi>)`;U;i1>0O2#AP_DlZ%@G literal 0 HcmV?d00001 diff --git a/augeas.changes b/augeas.changes index 26516d9..6f1a1af 100644 --- a/augeas.changes +++ b/augeas.changes @@ -1,3 +1,91 @@ +------------------------------------------------------------------- +Tue May 6 11:04:57 UTC 2014 - tchvatal@suse.com + +- Add check phase, comment out as 2 test fails now. +- Clean up with spec-cleaner +- Version bump to 1.2.0: + - API changes + * Add aug_cp and the cp and copy commands + * aug_to_xml now includes span information in the XML dump + - General changes/additions + * Fix documentation link in c_api NaturalDocs menu + * Fix NaturalDocs documentation for various lenses + * src/transform.c (filter_matches): wrap fnmatch to ensure that an incl + pattern containing "//" matches file paths, RHBZ#1031084 + * Correct locations table for transform_save() (Tomas Hoger) + * Corrections for CVE-2012-0786 tests (Tomas Hoger) + * Fix umask handling when creating new files, RHBZ#1034261 + - Lens changes/additions + * Access: support DOMAIN\user syntax for users and groups, bug #353 + * Authorized_Keys: Allow 'ssh-ed25519' as a valid authorized_key + type (Jasper Lievisse Adriaanse) + * Automounter: Handle hostnames with dashes in them, GH issue #27 + * Build: Add combinatorics group + * Cyrus_Imapd: Create new entries without space before separator, + RHBZ#1014974 (Dietmar Kling) + * Desktop: Support square brackets in keys + * Dhclient: Add dhclient.conf path for Debian/Ubuntu (Esteve Fernandez) + * Dhcpd: Support conditionals, GH issue #34 + Support a wider variety of allow/deny statement, including + booting and bootp (Yanis Guenane) + Support a wider variety of DHCP allow/deny/ignore statements + (Yanis Guenane) + * Dovecot: Various enhancements and bug fixes (Michael Haslgrübler): + add mailbox to block_names, fix for block_args in quotes, + fix for block's brackets upon write, + fixes broken tests for mailbox, + fixes indention, + test case for block_args with ", + fixes broken indention + Use Quote module + * Exports: Permit colons for IPv6 client addresses, bug #366 + * Grub: Support the 'setkey' and 'lock' directives + NFC fix whitespace errors + Handle makeactive menu command, bug #340 + Add 'verbose' option, GH issue #73 + * Interfaces: Add in support for the source stanza in + /etc/network/interfaces files + Map bond-slaves and bridge-ports to arrays (incompatible + change) (Kaarle Ritvanen) + Add /etc/network/interfaces.d/* support + Allow numeric characters in stanza options (Pascal Lalonde) + * Koji: New lens to parse Koji configs (Pat Riehecky) + * MongoDBServer: Accept quoted values (Tomas Klouda) + * NagiosCfg: Do not try to parse /etc/nagios/nrpe.cfg anymore, GH issue #43 + /etc/nagios/nrpe.cfg is parsed by Nrpe (Yanis Guenane) + * Nagiosobjects: Add support for optional spaces and indents + and whole-line comments (Sean Millichamp) + * OpenVPN: Support daemon, client-config-dir, route, and management + directives (Freakin https://github.com/Freakin) + * PHP: allow php-fpm syntax in keys, GH issue #35 + * Postfix_Main: Handle stray whitespace at end of multiline lines, bug #348 + * Postfix_virtual: allow '+' and '=' in email addresses (Tom Hendrikx) + * Properties: support multiline starting with an empty string, GH issue #19 + * Samba: Permit asterisk in key name, bug #354 + * Shellvars: Read /etc/firewalld/firewalld.conf, bug #363 + Support all types of quoted strings in arrays, bug #357 + Exclude /etc/sysconfig/ip*tables.save files + * Shellvars, Sysconfig: map "bare" export and unset lines to seq numbered + nodes to handle multiple variables (incompatible change), RHBZ#1033795 + * Shellvars_list: Handle backtick variable assignments, bug #368 + Allow end-of-line comments, bug #342 + * Simplevars: Add /etc/selinux/semanage.conf + * Slapd: use smart quotes for database entries; rename by/what to by/access; + allow access to be absent as per official docs (incompatible change) + * Sshd: Indent Match entries by 2 spaces by default + Support Ciphers and KexAlgorithms groups, GH issue #69 + Let all special keys be case-insensitive + * Sudoers: Permit underscores in group names, bug #370 (Matteo Cerutti) + Allow uppercase characters in user names, bug #376 + * Sysconfig: Permit empty comments after comment lines, RHBZ#1043636 + * Sysconfig_Route: New lens for RedHat's route configs + * Syslog: Accept UDP(@) and TCP(@@) protocol, bug #364 (Yanis Guenane) + * Xymon_Alerting: New lens for Xymon alerting files (François Maillard) + * Yum: Add yum-cron*.conf files (Pat Riehecky) + Include only *.repo files from yum.repos.d (Andrew N Golovkov) + Permit spaces after equals sign in list options, GH issue #45 + Split excludes as lists, bug #275 + ------------------------------------------------------------------- Fri Dec 13 12:29:08 UTC 2013 - meissner@suse.com diff --git a/augeas.spec b/augeas.spec index cdd82c3..a0ef536 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,7 +1,7 @@ # # spec file for package augeas # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,8 +16,9 @@ # +%define libname lib%{name}0 Name: augeas -Version: 1.1.0 +Version: 1.2.0 Release: 0 Summary: A library for changing configuration files License: GPL-3.0+ and LGPL-2.1+ @@ -25,13 +26,13 @@ Group: System/Libraries Url: http://augeas.net/ Source0: http://download.augeas.net/augeas-%{version}.tar.gz Source1: http://download.augeas.net/augeas-%{version}.tar.gz.sig -Source2: %name.keyring +Source2: %{name}.keyring Source3: baselibs.conf Patch0: augeas-modprobe-lense.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel BuildRequires: libxml2-devel BuildRequires: readline-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A library for programmatically editing configuration files. Augeas @@ -43,12 +44,11 @@ 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. -%define __shrlibname lib%{name}0 %package devel Summary: A library for changing configuration files Group: Development/Libraries/C and C++ -Requires: %{__shrlibname} = %{version} +Requires: %{libname} = %{version} %description devel A library for programmatically editing configuration files. Augeas @@ -60,12 +60,12 @@ 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 -n %{__shrlibname} +%package -n %{libname} Summary: A library for changing configuration files Group: Development/Libraries/C and C++ Recommends: %{name}-lenses = %{version} -%description -n %{__shrlibname} +%description -n %{libname} 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 @@ -76,9 +76,9 @@ details. It is controlled by ``lens'' definitions that describe the file format and the transformation into a tree. %package lenses -Summary: Official set of lenses for use by %{__shrlibname} +Summary: Official set of lenses for use by %{libname} Group: Development/Libraries/Other -Requires: %{__shrlibname} = %{version} +Requires: %{libname} = %{version} %description lenses Augeas parses configuration files described in lenses into a tree @@ -102,19 +102,25 @@ modifying the official lenses, or when creating new ones. %patch0 -p1 %build -export CFLAGS="-Wno-error $RPM_OPT_FLAGS" -%configure --disable-static +export CFLAGS="-Wno-error %{optflags}" +%configure \ + --disable-static \ + --disable-silent-rules \ + --disable-rpath make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -delete +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print # move vim files to the right location -mv $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles $RPM_BUILD_ROOT/%{_datadir}/vim/site +mv %{buildroot}/%{_datadir}/vim/vimfiles %{buildroot}/%{_datadir}/vim/site -%post -n %{__shrlibname} -p /sbin/ldconfig +#%check +#make check %{?_smp_mflags} -%postun -n %{__shrlibname} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig + +%postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -124,7 +130,7 @@ mv $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles $RPM_BUILD_ROOT/%{_datadir}/vim/site %{_mandir}/man1/* %doc AUTHORS COPYING NEWS -%files -n %{__shrlibname} +%files -n %{libname} %defattr(-,root,root,-) %{_libdir}/*.so.*