pool/augeas
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 101693 from home:dmacvicar:branches:devel:libraries:c_c++

Browse Source 
- Patch shellvars.aug to recognize SUSE specific files in 
  sysconfig (bnc#729491)

OBS-URL: https://build.opensuse.org/request/show/101693
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/augeas?expand=0&rev=28
This commit is contained in:
Ismail Dönmez 2012-01-26 20:39:55 +00:00 committed by Git OBS Bridge
parent 9aab37fd69
commit 16b8beb09f
3 changed files with 170 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
augeas.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 26 12:38:03 UTC 2012 - dmacvicar@suse.de
- Patch shellvars.aug to recognize SUSE specific files in
sysconfig (bnc#729491)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 22 08:50:38 UTC 2011 - dmacvicar@suse.de Thu Sep 22 08:50:38 UTC 2011 - dmacvicar@suse.de

15
augeas.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package augeas # spec file for package augeas
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 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
@ -22,11 +22,13 @@ Version: 0.9.0
Release: 1 Release: 1
Summary: A library for changing configuration files Summary: A library for changing configuration files
Group: System/Libraries Group: System/Libraries
License: GPLv3+ ; LGPLv2.1+ License: GPL-3.0+ ; LGPL-2.1+
Url: http://augeas.net/ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel readline-devel BuildRequires: glib2-devel readline-devel
@ -43,7 +45,7 @@ file format and the transformation into a tree.
%define __shrlibname lib%{name}0 %define __shrlibname lib%{name}0
%package devel %package devel
License: GPLv3+ ; LGPLv2.1+ License: GPL-3.0+ ; LGPL-2.1+
Summary: A library for changing configuration files Summary: A library for changing configuration files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{__shrlibname} = %{version} Requires: %{__shrlibname} = %{version}
@ -59,7 +61,7 @@ details. It is controlled by ``lens'' definitions that describe the
file format and the transformation into a tree. file format and the transformation into a tree.
%package -n %{__shrlibname} %package -n %{__shrlibname}
License: GPLv3+ ; LGPLv2.1+ License: GPL-3.0+ ; LGPL-2.1+
Summary: A library for changing configuration files Summary: A library for changing configuration files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Recommends: %{name}-lenses = %{version} Recommends: %{name}-lenses = %{version}
@ -75,7 +77,7 @@ details. It is controlled by ``lens'' definitions that describe the
file format and the transformation into a tree. file format and the transformation into a tree.
%package lenses %package lenses
License: GPLv3+ ; LGPLv2.1+ License: GPL-3.0+ ; LGPL-2.1+
Summary: Official set of lenses for use by %{__shrlibname} Summary: Official set of lenses for use by %{__shrlibname}
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: %{__shrlibname} = %{version} Requires: %{__shrlibname} = %{version}
@ -89,7 +91,7 @@ mapping of its contents into a tree. This package includes the official
set of lenses. set of lenses.
%package lense-tests %package lense-tests
License: GPLv3+ ; LGPLv2.1+ License: GPL-3.0+ ; LGPL-2.1+
Summary: Set of tests for official Augeas lenses Summary: Set of tests for official Augeas lenses
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: %{name}-lenses = %{version} Requires: %{name}-lenses = %{version}
@ -101,6 +103,7 @@ modifying the official lenses, or when creating new ones.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
export CFLAGS="-Wno-error $RPM_OPT_FLAGS" export CFLAGS="-Wno-error $RPM_OPT_FLAGS"

155
bnc-729491-recognize-suse-sysconfig-files.patch Normal file
View File

@ -0,0 +1,155 @@
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
index 3a64b38..dc216da 100644
--- a/lenses/shellvars.aug
+++ b/lenses/shellvars.aug
@@ -112,6 +112,141 @@ module Shellvars =
sc_incl "xend" .
sc_incl "xendomains"
+ let filter_sysconfig_suse =
+ 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/*"
@@ -121,6 +256,8 @@ module Shellvars =
. incl "/etc/rc.conf"
let filter = filter_sysconfig
+ . filter_sysconfig_suse
+ . filter_sysconfig_rhn
. filter_ifcfg
. filter_default
. filter_misc