From 633924c7217731fa059b816f4dbdce3a9526a222627b15dbce757184f1676086 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 6 May 2008 16:46:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=84

---
 aaa_base-chkconfig-help.patch | 54 +++++++++++++++++++++++++
 aaa_base-lsb-keywords-patch   | 39 ++++++++++++++++++
 aaa_base-rpmlintrc            | 75 +++++++++++++++++++++++++++++++++++
 aaa_base.changes              | 11 +++++
 aaa_base.spec                 | 23 ++++++++---
 5 files changed, 197 insertions(+), 5 deletions(-)
 create mode 100644 aaa_base-chkconfig-help.patch
 create mode 100644 aaa_base-lsb-keywords-patch
 create mode 100644 aaa_base-rpmlintrc

diff --git a/aaa_base-chkconfig-help.patch b/aaa_base-chkconfig-help.patch
new file mode 100644
index 0000000..57d84be
--- /dev/null
+++ b/aaa_base-chkconfig-help.patch
@@ -0,0 +1,54 @@
+Index: aaa_base/sbin/chkconfig
+===================================================================
+--- aaa_base.orig/sbin/chkconfig
++++ aaa_base/sbin/chkconfig
+@@ -489,6 +489,7 @@ sub addmode {
+ sub usage {
+   print <<EOF;
+ usage:
++        chkconfig -A|--allservices              (together with -l: show all services)
+         chkconfig -t|--terse [names]            (shows the links)
+         chkconfig -e|--edit  [names]            (configure services)
+         chkconfig -s|--set   [name state]...    (configure services)
+Index: aaa_base/usr/share/man/man8/chkconfig.8
+===================================================================
+--- aaa_base.orig/usr/share/man/man8/chkconfig.8
++++ aaa_base/usr/share/man/man8/chkconfig.8
+@@ -34,6 +34,9 @@ chkconfig \- enable or disable system se
+ .RI [ names ]
+ .br
+ .B chkconfig
++.B -A|--allservices
++.br
++.B chkconfig
+ .B -a|--add
+ .RI [ names ]
+ .br
+@@ -68,7 +71,11 @@ are used. Inetd/xinetd services are conf
+ .I /etc/inetd.d
+ and
+ .IR /etc/xinetd.d ,
+-respectively.
++respectively. You can use the 
++.B -A
++or
++.B --allservices
++parameter to get all services (even the boot.*-services) listed.
+ .PP
+ If chkconfig is called without arguments, all services are listed
+ in terse mode.
+@@ -121,7 +128,13 @@ terminal. If the
+ .B --deps
+ option is given, the names of the services that must be started
+ before this service is appended to each line. The inetd/xinetd
+-services are listed in extra sections.
++services are listed in extra sections. 
++
++You can use the
++.B -A
++or
++.B --allservices
++parameter to get all services (even the boot.*-services) listed.
+ .SH ADD MODE
+ Calls insserv
+ to enable a service and uses list mode to display the new
diff --git a/aaa_base-lsb-keywords-patch b/aaa_base-lsb-keywords-patch
new file mode 100644
index 0000000..78463a1
--- /dev/null
+++ b/aaa_base-lsb-keywords-patch
@@ -0,0 +1,39 @@
+Index: aaa_base/etc/init.d/boot.cleanup
+===================================================================
+--- aaa_base.orig/etc/init.d/boot.cleanup
++++ aaa_base/etc/init.d/boot.cleanup
+@@ -13,6 +13,9 @@
+ # Default-Start:     B
+ # Default-Stop:
+ # Short-Description: do cleanup
++# Description: Cleanup left over tempfiles from 
++#	last run: screen sockets, temporary rpm-database files,
++#	ssh agent infos, various lockfiles, utmp and some more.
+ ### END INIT INFO
+ 
+ . /etc/rc.status
+Index: aaa_base/etc/init.d/boot.ipconfig
+===================================================================
+--- aaa_base.orig/etc/init.d/boot.ipconfig
++++ aaa_base/etc/init.d/boot.ipconfig
+@@ -13,6 +13,8 @@
+ # Default-Start:     B
+ # Default-Stop:
+ # Short-Description: run ip configuration hooks
++# Description: Set IP configuration hooks depending on 
++#	values entered in /etc/sysconfig/sysctl
+ ### END INIT INFO
+ 
+ . /etc/rc.status
+Index: aaa_base/etc/init.d/random
+===================================================================
+--- aaa_base.orig/etc/init.d/random
++++ aaa_base/etc/init.d/random
+@@ -20,6 +20,7 @@
+ # Required-Stop:
+ # Default-Start:  2 3 5
+ # Default-Stop:
++# Short-Description: Snapshot random state
+ # Description:    Script to snapshot random state and reload it at boot time.
+ ### END INIT INFO
+ 
diff --git a/aaa_base-rpmlintrc b/aaa_base-rpmlintrc
new file mode 100644
index 0000000..6f62e03
--- /dev/null
+++ b/aaa_base-rpmlintrc
@@ -0,0 +1,75 @@
+# it's just a README....
+addFilter("non-remote_fs-dependency.*/etc/init.d/README")
+addFilter("init-script-non-executable.*/etc/init.d/README")
+addFilter("no-status-entry.*/etc/init.d/README")
+addFilter("non-executable-script.*/sbin/init.d.README")
+addFilter("non-executable-in-bin.*/sbin/init.d.README")
+addFilter("script-without-shebang.*/sbin/init.d.README")
+# contains just functions - executable bit is not needed
+addFilter("non-executable-script.*/lib/YaST/SuSEconfig.functions")
+# random don't need $remote-fs
+addFilter("non-remote_fs-dependency.*/etc/init.d/random")
+# if this script is triggered, remote-fs is not important
+addFilter("non-remote_fs-dependency.*/etc/init.d/powerfail")
+# single user mode is without remote connection
+addFilter("non-remote_fs-dependency.*/etc/init.d/single")
+# no comment
+addFilter("non-remote_fs-dependency.*/etc/init.d/halt")
+# this script is only for runlevel changes
+addFilter("non-remote_fs-dependency.*/etc/init.d/rc")
+# this is currently needed
+addFilter("non-etc-or-var-file-marked-as-conffile.*/root/.exrc")
+addFilter("hidden-file-or-dir.*/root/.exrc")
+# perhaps should be configurable later...
+addFilter("non-etc-or-var-file-marked-as-conffile.*/sbin/quick_halt")
+# confirmed - but standard
+addFilter("non-root-group-log-file.*/var/log/lastlog.*tty")
+# the following init script don't need to be reloaded - 
+# even after an update
+addFilter("no-reload-entry.*/etc/init.d/README")
+addFilter("no-reload-entry.*/etc/init.d/boot.swap")
+addFilter("no-reload-entry.*/etc/init.d/boot.getclock")
+addFilter("no-reload-entry.*/etc/init.d/boot.proc")
+addFilter("no-reload-entry.*/etc/init.d/random")
+addFilter("no-reload-entry.*/etc/init.d/boot.ipconfig")
+addFilter("no-reload-entry.*/etc/init.d/boot.rootfsck")
+addFilter("no-reload-entry.*/etc/init.d/powerfail")
+addFilter("no-reload-entry.*/etc/init.d/single")
+addFilter("no-reload-entry.*/etc/init.d/boot.cleanup")
+addFilter("no-reload-entry.*/etc/init.d/halt")
+addFilter("no-reload-entry.*/etc/init.d/boot.loadmodules")
+addFilter("no-reload-entry.*/etc/init.d/boot.ldconfig")
+addFilter("no-reload-entry.*/etc/init.d/boot")
+addFilter("no-reload-entry.*/etc/init.d/boot.sched")
+addFilter("no-reload-entry.*/etc/init.d/boot.klog")
+addFilter("no-reload-entry.*/etc/init.d/rc")
+addFilter("no-reload-entry.*/etc/init.d/boot.setclock")
+addFilter("no-reload-entry.*/etc/init.d/boot.localnet")
+addFilter("no-reload-entry.*/etc/init.d/boot.localfs")
+# the following init scripts don't need to be stopped - 
+# even after an update
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/skeleton.compat")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/README")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.swap")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.getclock")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.proc")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/random")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.ipconfig")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.rootfsck")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/powerfail")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/single")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.cleanup")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/skeleton")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/halt")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.loadmodules")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.ldconfig")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.sched")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.klog")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/rc")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.setclock")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localnet")
+addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localfs")
+
+# aaa_base requires net-tools
+addFilter("dangling-symlink.*/usr/lib/restricted/bin/hostname.*/bin/hostname")
diff --git a/aaa_base.changes b/aaa_base.changes
index adcd9be..f9daa49 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue May  6 13:13:25 CEST 2008 - lrupp@suse.de
+
+- added help for 'chkconfig -A' option (bnc#371548)
+  (aa_base-chkconfig-help.patch)
+- add some lsb-keywords to the init scripts
+  (aa_base-lsb-keywords-patch)
+- recommend cron as this is not installed per default
+- disable "Obsoletes: tpctl" for now
+- added aaa_base-rpmlintrc to suppress some rpmlint warnings
+
 -------------------------------------------------------------------
 Mon May  5 15:25:00 CEST 2008 - werner@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 0ba8bd0..7ec5d01 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -17,11 +17,11 @@ Group:          System/Fhs
 Provides:       bin bootutls etc skeleng skelger aaa_skel
 Obsoletes:      aaa_skel
 Requires:       filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio udev psmisc
-Recommends:     logrotate
+Recommends:     cron logrotate
 PreReq:         /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
 AutoReqProv:    on
 Version:        11.0
-Release:        58
+Release:        60
 Summary:        SUSE Linux Base Package
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         aaa_base.tar.bz2
@@ -29,11 +29,14 @@ Source3:        aaa_base.specialfilelist
 Source5:        arch_special.tar.bz2
 Source7:        sysconfig_parts.tar.bz2
 Source8:        get_kernel_version.c
+Source20:       aaa_base-rpmlintrc
 Source21:       aaa_base.pre
 Source22:       aaa_base.post
-%ifarch x86_64
-Obsoletes:      tpctl
-%endif
+Patch1:         aaa_base-chkconfig-help.patch
+Patch2:         aaa_base-lsb-keywords-patch
+# %ifarch x86_64
+# Obsoletes:      tpctl <= 4.17
+# %endif
 
 %description
 This package installs several important configuration files. Central
@@ -51,6 +54,8 @@ Authors:
 
 %prep
 %setup -n aaa_base -b 5 -b 7
+%patch1 -p1
+%patch2 -p1
 cd ..
 mkdir -p scripts
 cp -v %{SOURCE21} scripts
@@ -142,6 +147,14 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %defattr(-,root,root)
 
 %changelog
+* Tue May 06 2008 lrupp@suse.de
+- added help for 'chkconfig -A' option (bnc#371548)
+  (aa_base-chkconfig-help.patch)
+- add some lsb-keywords to the init scripts
+  (aa_base-lsb-keywords-patch)
+- recommend cron as this is not installed per default
+- disable "Obsoletes: tpctl" for now
+- added aaa_base-rpmlintrc to suppress some rpmlint warnings
 * Mon May 05 2008 werner@suse.de
 - Replace `/bin/hostname -s' with `/bin/uname -n' (bnc#386621)
 - Also change reference boo.clock in sysconfig and add boot.clock