rpms/facter/F-10 facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 facter.spec, 1.14, 1.15 sources, 1.11, 1.12 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, 1.1, NONE

[Todd M. Zullinger]

Author: tmz

Update of /cvs/extras/rpms/facter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv719

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch 
Removed Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
Log Message:
Update to 1.5.7

- Update #508037 patch from upstream ticket


facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Fri, 11 Sep 2009 01:09:22 -0400
Subject: [PATCH/facter] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7

---
 lib/facter/virtual.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78413a9..6f3f5a2 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -25,9 +25,9 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
-- 
1.6.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 May 2009 21:37:24 -0000	1.11
+++ .cvsignore	26 Sep 2009 02:03:27 -0000	1.12
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/facter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- facter.spec	12 Aug 2009 22:57:25 -0000	1.14
+++ facter.spec	26 Sep 2009 02:03:28 -0000	1.15
@@ -5,15 +5,15 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
 
 # Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
-Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+Patch0: facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 25 2009 Todd Zullinger <tmz at pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
 * Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
 - Fix #508037 or upstream #2355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 May 2009 21:37:25 -0000	1.11
+++ sources	26 Sep 2009 02:03:28 -0000	1.12
@@ -1 +1 @@
-7a783f99f8651095a0b2a8d0b75c48b4  facter-1.5.5.tar.gz
+21db7b613fe14a54e72ef062f3d5e190  facter-1.5.7.tar.gz


--- facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch DELETED ---