Accepting request 163755 from home:poelzi:branches:devel:libraries:c_c++
update to augeas-1.0.0 OBS-URL: https://build.opensuse.org/request/show/163755 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/augeas?expand=0&rev=41
This commit is contained in:
parent
a84af65754
commit
c3c7caeede
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca
|
|
||||||
size 1676906
|
|
3
augeas-1.0.0.tar.gz
Normal file
3
augeas-1.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:31bf757c5b8197765946b3805f3793c32b03cd92a7a77ec95d37e71a1f131912
|
||||||
|
size 1880630
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/lenses/modprobe.aug b/lenses/modprobe.aug
|
diff --git a/lenses/modprobe.aug b/lenses/modprobe.aug
|
||||||
index f4bb27b..6b02b9c 100644
|
index bd897b9..d96f902 100644
|
||||||
--- a/lenses/modprobe.aug
|
--- a/lenses/modprobe.aug
|
||||||
+++ b/lenses/modprobe.aug
|
+++ b/lenses/modprobe.aug
|
||||||
@@ -70,6 +70,11 @@ let blacklist = Build.key_value_line_comment "blacklist" sep_space
|
@@ -73,6 +73,11 @@ let blacklist = Build.key_value_line_comment "blacklist" sep_space
|
||||||
sto_no_spaces
|
sto_no_spaces
|
||||||
comment
|
comment
|
||||||
|
|
||||||
@ -14,11 +14,11 @@ index f4bb27b..6b02b9c 100644
|
|||||||
(* View: config *)
|
(* View: config *)
|
||||||
let config = Build.key_value_line_comment "config" sep_space
|
let config = Build.key_value_line_comment "config" sep_space
|
||||||
(store /binary_indexes|yes|no/)
|
(store /binary_indexes|yes|no/)
|
||||||
@@ -80,6 +85,7 @@ let entry = alias
|
@@ -92,6 +97,7 @@ let entry = alias
|
||||||
| options
|
| options
|
||||||
| kv_line_command /install|remove/
|
| kv_line_command /install|remove/
|
||||||
| blacklist
|
| blacklist
|
||||||
+ | allow_unsupported_modules
|
+ | allow_unsupported_modules
|
||||||
| config
|
| config
|
||||||
|
| softdep
|
||||||
|
|
||||||
(************************************************************************
|
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
From: Jan Engelhardt <jengelh@medozas.de>
|
|
||||||
Date: 2012-03-17 15:49:17.431507472 +0100
|
|
||||||
|
|
||||||
Public augeas header files (for use by 3rd party programs) include
|
|
||||||
<libxml/tree.h>, so the .pc file must require xml2 for it to work.
|
|
||||||
|
|
||||||
---
|
|
||||||
augeas.pc.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
Index: augeas-0.10.0/augeas.pc.in
|
|
||||||
===================================================================
|
|
||||||
--- augeas-0.10.0.orig/augeas.pc.in
|
|
||||||
+++ augeas-0.10.0/augeas.pc.in
|
|
||||||
@@ -6,6 +6,6 @@ includedir=@includedir@
|
|
||||||
Name: augeas
|
|
||||||
Version: @VERSION@
|
|
||||||
Description: Augeas configuration editing library
|
|
||||||
-Requires:
|
|
||||||
+Requires: libxml-2.0
|
|
||||||
Libs: -L${libdir} -laugeas @LIBS@
|
|
||||||
Cflags: -I${includedir}
|
|
@ -1,14 +0,0 @@
|
|||||||
Index: augeas-0.10.0/gnulib/lib/stdio.in.h
|
|
||||||
===================================================================
|
|
||||||
--- augeas-0.10.0.orig/gnulib/lib/stdio.in.h
|
|
||||||
+++ augeas-0.10.0/gnulib/lib/stdio.in.h
|
|
||||||
@@ -162,7 +162,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
|
|
||||||
so any use of gets warrants an unconditional warning. Assume it is
|
|
||||||
always declared, since it is required by C89. */
|
|
||||||
#undef gets
|
|
||||||
+#if HAVE_RAW_DECL_GETS
|
|
||||||
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if @GNULIB_FOPEN@
|
|
||||||
# if @REPLACE_FOPEN@
|
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 7 14:35:11 UTC 2013 - poelzleithner@b1-systems.de
|
||||||
|
|
||||||
|
- update to 1.0.0
|
||||||
|
- drop bnc-729491-recognize-suse-sysconfig-files.patch:
|
||||||
|
upstream ShellVars lense now uses /etc/sysconfig/* include filter
|
||||||
|
- drop patches, now upstream: augeas-pkgdeps.diff, augeas-stdio.h.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 10 16:50:19 UTC 2012 - cfarrell@suse.com
|
Wed Oct 10 16:50:19 UTC 2012 - cfarrell@suse.com
|
||||||
|
|
||||||
|
11
augeas.spec
11
augeas.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package augeas
|
# spec file for package augeas
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: augeas
|
Name: augeas
|
||||||
Version: 0.10.0
|
Version: 1.0.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A library for changing configuration files
|
Summary: A library for changing configuration files
|
||||||
License: GPL-3.0+ and LGPL-2.1+
|
License: GPL-3.0+ and LGPL-2.1+
|
||||||
@ -26,10 +26,6 @@ Url: http://augeas.net/
|
|||||||
Source0: http://augeas.net/download/augeas-%{version}.tar.gz
|
Source0: http://augeas.net/download/augeas-%{version}.tar.gz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
Patch0: augeas-modprobe-lense.patch
|
Patch0: augeas-modprobe-lense.patch
|
||||||
# PATCH-FIX-OPENSUSE bnc-729491-recognize-suse-sysconfig-files.patch [bnc#729491]
|
|
||||||
Patch1: bnc-729491-recognize-suse-sysconfig-files.patch
|
|
||||||
Patch2: augeas-pkgdeps.diff
|
|
||||||
Patch3: augeas-stdio.h.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
@ -102,9 +98,6 @@ modifying the official lenses, or when creating new ones.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
%patch -P 2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
|
export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
|
||||||
|
@ -1,170 +0,0 @@
|
|||||||
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
|
|
||||||
index faa0e72..722ab4b 100644
|
|
||||||
--- a/lenses/shellvars.aug
|
|
||||||
+++ b/lenses/shellvars.aug
|
|
||||||
@@ -189,6 +189,156 @@ module Shellvars =
|
|
||||||
sc_incl "xend" .
|
|
||||||
sc_incl "xendomains"
|
|
||||||
|
|
||||||
+ let filter_sysconfig_suse =
|
|
||||||
+ sc_incl "apcupsd" .
|
|
||||||
+ sc_incl "arpd" .
|
|
||||||
+ sc_incl "atftpd" .
|
|
||||||
+ sc_incl "automatic_online_update" .
|
|
||||||
+ sc_incl "debugfs" .
|
|
||||||
+ sc_incl "libvirt-guests" .
|
|
||||||
+ sc_incl "mcelog" .
|
|
||||||
+ sc_incl "oracle" .
|
|
||||||
+ sc_incl "pciback" .
|
|
||||||
+ sc_incl "puppetmasterd" .
|
|
||||||
+ sc_incl "racoon" .
|
|
||||||
+ sc_incl "snapper" .
|
|
||||||
+ sc_incl "tomcat6" .
|
|
||||||
+ sc_incl "xencommons" .
|
|
||||||
+ sc_incl "xsp2" .
|
|
||||||
+ sc_incl "abuild" .
|
|
||||||
+ sc_incl "add-on-creator" .
|
|
||||||
+ sc_incl "amavis" .
|
|
||||||
+ sc_incl "amazon" .
|
|
||||||
+ sc_incl "apache2" .
|
|
||||||
+ sc_incl "argus" .
|
|
||||||
+ sc_incl "arpwatch" .
|
|
||||||
+ sc_incl "atd" .
|
|
||||||
+ sc_incl "auditd" .
|
|
||||||
+ sc_incl "autoinstall" .
|
|
||||||
+ sc_incl "autoupdate" .
|
|
||||||
+ sc_incl "backup" .
|
|
||||||
+ sc_incl "bigsister" .
|
|
||||||
+ sc_incl "bluetooth" .
|
|
||||||
+ sc_incl "boot" .
|
|
||||||
+ sc_incl "bootloader" .
|
|
||||||
+ sc_incl "bootsplash" .
|
|
||||||
+ sc_incl "cgred" .
|
|
||||||
+ sc_incl "console" .
|
|
||||||
+ sc_incl "cron" .
|
|
||||||
+ sc_incl "ctdb" .
|
|
||||||
+ sc_incl "cups" .
|
|
||||||
+ sc_incl "ddclient" .
|
|
||||||
+ sc_incl "dhcpd" .
|
|
||||||
+ sc_incl "dhcrelay" .
|
|
||||||
+ sc_incl "displaymanager" .
|
|
||||||
+ sc_incl "dmraid" .
|
|
||||||
+ sc_incl "dracd" .
|
|
||||||
+ sc_incl "esound" .
|
|
||||||
+ sc_incl "fam" .
|
|
||||||
+ sc_incl "festival" .
|
|
||||||
+ sc_incl "fetchmail" .
|
|
||||||
+ sc_incl "fonts-config" .
|
|
||||||
+ sc_incl "git-daemon" .
|
|
||||||
+ sc_incl "gpsd" .
|
|
||||||
+ sc_incl "hardware" .
|
|
||||||
+ sc_incl "hardware/*" .
|
|
||||||
+ sc_incl "icecream" .
|
|
||||||
+ sc_incl "ide" .
|
|
||||||
+ sc_incl "infiniband" .
|
|
||||||
+ sc_incl "inputattach" .
|
|
||||||
+ sc_incl "ipmi" .
|
|
||||||
+ sc_incl "ipvsadm" .
|
|
||||||
+ sc_incl "ispell" .
|
|
||||||
+ sc_incl "joystick" .
|
|
||||||
+ sc_incl "kernel" .
|
|
||||||
+ sc_incl "kernel-tunables" .
|
|
||||||
+ sc_incl "language" .
|
|
||||||
+ sc_incl "ldap" .
|
|
||||||
+ sc_incl "lighttpd" .
|
|
||||||
+ sc_incl "lirc" .
|
|
||||||
+ sc_incl "locate" .
|
|
||||||
+ sc_incl "lvm" .
|
|
||||||
+ sc_incl "mail" .
|
|
||||||
+ sc_incl "mailman" .
|
|
||||||
+ sc_incl "mdadm" .
|
|
||||||
+ sc_incl "media-changer" .
|
|
||||||
+ sc_incl "memcached" .
|
|
||||||
+ sc_incl "mouse" .
|
|
||||||
+ sc_incl "mpi-selector" .
|
|
||||||
+ sc_incl "mysql" .
|
|
||||||
+ sc_incl "nagios" .
|
|
||||||
+ sc_incl "named" .
|
|
||||||
+ sc_incl "ncpfs" .
|
|
||||||
+ sc_incl "net-snmp" .
|
|
||||||
+ sc_incl "network/config" .
|
|
||||||
+ sc_incl "network/dhcp" .
|
|
||||||
+ sc_incl "network/dhcp6r" .
|
|
||||||
+ sc_incl "network/dhcp6s" .
|
|
||||||
+ sc_incl "network/ifcfg-*" .
|
|
||||||
+ sc_incl "network/if-down.d/*" .
|
|
||||||
+ sc_incl "network/ifroute-*" .
|
|
||||||
+ sc_incl "network/if-up.d/*" .
|
|
||||||
+ sc_incl "network/providers/*" .
|
|
||||||
+ sc_incl "news" .
|
|
||||||
+ sc_incl "ntp" .
|
|
||||||
+ sc_incl "obs-server" .
|
|
||||||
+ sc_incl "obs-worker" .
|
|
||||||
+ sc_incl "openldap" .
|
|
||||||
+ sc_incl "opensm" .
|
|
||||||
+ sc_incl "osa-dispatcher" .
|
|
||||||
+ sc_incl "pm-profiler" .
|
|
||||||
+ sc_incl "portmap" .
|
|
||||||
+ sc_incl "postfix" .
|
|
||||||
+ sc_incl "postgresql" .
|
|
||||||
+ sc_incl "product-creator" .
|
|
||||||
+ sc_incl "proxy" .
|
|
||||||
+ sc_incl "ptpd" .
|
|
||||||
+ sc_incl "radvd" .
|
|
||||||
+ sc_incl "readonlyroot" .
|
|
||||||
+ sc_incl "rpcbind" .
|
|
||||||
+ sc_incl "sapconf" .
|
|
||||||
+ sc_incl "scpm" .
|
|
||||||
+ sc_incl "seccheck" .
|
|
||||||
+ sc_incl "security" .
|
|
||||||
+ sc_incl "services" .
|
|
||||||
+ sc_incl "shutdown" .
|
|
||||||
+ sc_incl "smt-client" .
|
|
||||||
+ sc_incl "sound" .
|
|
||||||
+ sc_incl "spamd" .
|
|
||||||
+ sc_incl "squid" .
|
|
||||||
+ sc_incl "ssh" .
|
|
||||||
+ sc_incl "storage" .
|
|
||||||
+ sc_incl "SuSEfirewall2" .
|
|
||||||
+ sc_incl "SuSEfirewall2.d/cobbler" .
|
|
||||||
+ sc_incl "SuSEfirewall2.d/services/*" .
|
|
||||||
+ sc_incl "susehelp" .
|
|
||||||
+ sc_incl "suse_register" .
|
|
||||||
+ sc_incl "sysctl" .
|
|
||||||
+ sc_incl "syslog" .
|
|
||||||
+ sc_incl "texlive" .
|
|
||||||
+ sc_incl "ulimit" .
|
|
||||||
+ sc_incl "websphere-as_ce-2.1" .
|
|
||||||
+ sc_incl "windowmanager" .
|
|
||||||
+ sc_incl "wondershaper" .
|
|
||||||
+ sc_incl "words" .
|
|
||||||
+ sc_incl "yast2" .
|
|
||||||
+ sc_incl "ypbind" .
|
|
||||||
+ sc_incl "ypserv"
|
|
||||||
+
|
|
||||||
+ let filter_sysconfig_rhn =
|
|
||||||
+ sc_incl "rhn/allowed-actions/*" .
|
|
||||||
+ sc_incl "rhn/allowed-actions/script/*" .
|
|
||||||
+ sc_incl "rhn/clientCaps.d/*" .
|
|
||||||
+ sc_incl "rhn/osad-auth.conf" .
|
|
||||||
+ sc_incl "rhn/osad.conf" .
|
|
||||||
+ sc_incl "rhn/rhncfg-client.conf" .
|
|
||||||
+ sc_incl "rhn/rhncfg-manager.conf" .
|
|
||||||
+ sc_incl "rhn/rhnpushrc" .
|
|
||||||
+ sc_incl "rhn/rhnsd" .
|
|
||||||
+ sc_incl "rhn/up2date" .
|
|
||||||
+ sc_incl "rhn/virt" .
|
|
||||||
+ sc_incl "rhn/virt/auto"
|
|
||||||
+
|
|
||||||
let filter_ifcfg = incl "/etc/sysconfig/network-scripts/ifcfg-*"
|
|
||||||
. incl "/etc/sysconfig/network/ifcfg-*"
|
|
||||||
let filter_default = incl "/etc/default/*"
|
|
||||||
@@ -198,6 +348,8 @@ module Shellvars =
|
|
||||||
. incl "/etc/blkid.conf"
|
|
||||||
|
|
||||||
let filter = filter_sysconfig
|
|
||||||
+ . filter_sysconfig_suse
|
|
||||||
+ . filter_sysconfig_rhn
|
|
||||||
. filter_ifcfg
|
|
||||||
. filter_default
|
|
||||||
. filter_misc
|
|
Loading…
Reference in New Issue
Block a user