rpms/facter/EL-5 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE, 1.1 import.log, NONE, 1.1 facter.spec, 1.13, 1.14

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/facter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19591/EL-5

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:EL-5:facter-1.5.5-3.fc11.src.rpm:1250117801


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- facter.spec	22 May 2009 21:39:10 -0000	1.13
+++ facter.spec	12 Aug 2009 22:56:54 -0000	1.14
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 3%{?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
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz at pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch