[puppet/el4] Capture stderr from exec resources (upstream #2359)

[Todd Zullinger]

commit 6b40506838002982e243c67938352417f708fb74
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Oct 3 21:14:45 2011 -0400

    Capture stderr from exec resources (upstream #2359)

 puppet-0.25.5-capture-stderr-from-exec.patch |   26 ++++++++++++++++++++++++++
 puppet.spec                                  |    4 ++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/puppet-0.25.5-capture-stderr-from-exec.patch b/puppet-0.25.5-capture-stderr-from-exec.patch
new file mode 100644
index 0000000..c1b4dcd
--- /dev/null
+++ b/puppet-0.25.5-capture-stderr-from-exec.patch
@@ -0,0 +1,26 @@
+From e5f67b7b0b7fa6165ce0e7b040c3f2d5ec5c21fc Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Thu, 30 Sep 2010 16:46:47 -0700
+Subject: [PATCH/puppet] capture stderr from exec resources
+
+Signed-off-by: Nigel Kersten <nigelk at google.com>
+---
+ lib/puppet/util/suidmanager.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
+index 424fb46..90f1728 100644
+--- a/lib/puppet/util/suidmanager.rb
++++ b/lib/puppet/util/suidmanager.rb
+@@ -85,7 +85,7 @@ module Puppet::Util::SUIDManager
+     module_function :initgroups
+ 
+     def run_and_capture(command, new_uid=nil, new_gid=nil)
+-        output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
++        output = Puppet::Util.execute(command, :failonfail => false, :combine => true, :uid => new_uid, :gid => new_gid)
+         [output, $?.dup]
+     end
+     module_function :run_and_capture
+-- 
+1.7.3
+
diff --git a/puppet.spec b/puppet.spec
index b5ba383..c4bca66 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -17,6 +17,8 @@ Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.g
 Patch0:         puppet-0.25.5-yumrepo-deprecation-warning.patch
 # http://projects.reductivelabs.com/issues/3514
 Patch1:         puppet-0.25.5-puppet.conf-line-endings.patch
+# http://projects.puppetlabs.com/issues/2359
+Patch2:         puppet-0.25.5-capture-stderr-from-exec.patch
 
 Group:          System Environment/Base
 
@@ -73,6 +75,7 @@ The server can also function as a certificate authority and file server.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 patch -p1 < conf/redhat/rundir-perms.patch
 
 %build
@@ -233,6 +236,7 @@ rm -rf %{buildroot}
 - Create and own /usr/share/puppet/modules (#615432)
 - Silence deprecation warnings in yumrepo type (#615175, upstream #4252)
 - Handle CR/LF in puppet.conf (upstream #3514)
+- Capture stderr from exec resources (upstream #2359)
 
 * Mon May 17 2010 Todd Zullinger <tmz at pobox.com> - 0.25.5-1
 - Update to 0.25.5