Fix a number of packaging and source bugspuppet-0_24_8-4_fc12F-12-startF-12-split

Fri Aug 07 2009 Todd Zullinger <tmz@pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)
Wed Jun 24 2009 Jeroen van Meeuwen <kanarip@kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)

1 files changed, 41 insertions, 0 deletions

diff --git a/puppet-0.24.8-status-options.patch b/puppet-0.24.8-status-options.patch
new file mode 100644
index 0000000..aad9ee5
--- /dev/null
+++ b/puppet-0.24.8-status-options.patch
@@ -0,0 +1,41 @@
+From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger <tmz@pobox.com>
+Date: Fri, 3 Jul 2009 09:08:17 -0400
+Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL
+
+On RHEL < 5, the status function does not accept a -p option.  Using it
+causes 'service puppet status' to produce erroneous output.  This was
+also reported by Aaron Dummer in Red Hat bug #501577.
+---
+ conf/redhat/client.init |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/conf/redhat/client.init b/conf/redhat/client.init
+index 44caab1..f40e81d 100644
+--- a/conf/redhat/client.init
++++ b/conf/redhat/client.init
+@@ -62,6 +62,11 @@ restart() {
+     start
+ }
+ 
++rh_status() {
++    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
++    status $statusopts $puppetd
++}
++
+ genconfig() {
+   echo -n $"Generate configuration puppet: "
+   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+@@ -84,8 +89,7 @@ case "$1" in
+ 	[ -f "$pidfile" ] && restart
+ 	;;
+   status)
+-        status -p "$pidfile" $puppetd
+-        RETVAL=$?
++        rh_status
+ 	;;
+   once)
+         shift
+-- 
+1.6.3.3
+