rpms/facter/EL-4 facter-1.5.7-facts-hanging-on-_proc_xen_capabilities.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 facter.spec, 1.12, 1.13 sources, 1.10, 1.11 facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, 1.1, NONE
Todd M. Zullinger
tmz at fedoraproject.org
Sat Sep 26 02:04:07 UTC 2009
- Previous message (by thread): rpms/facter/EL-5 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
- Next message (by thread): rpms/python-imdb/devel python-imdb-4.2-beautifulsoup.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 python-imdb.spec, 1.9, 1.10 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tmz
Update of /cvs/extras/rpms/facter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1178
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/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 26 May 2009 19:46:31 -0000 1.10
+++ .cvsignore 26 Sep 2009 02:04:06 -0000 1.11
@@ -1 +1 @@
-facter-1.5.5.tar.gz
+facter-1.5.7.tar.gz
Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- facter.spec 12 Aug 2009 22:56:23 -0000 1.12
+++ facter.spec 26 Sep 2009 02:04:06 -0000 1.13
@@ -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/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 26 May 2009 19:46:31 -0000 1.10
+++ sources 26 Sep 2009 02:04:07 -0000 1.11
@@ -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 ---
- Previous message (by thread): rpms/facter/EL-5 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
- Next message (by thread): rpms/python-imdb/devel python-imdb-4.2-beautifulsoup.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 python-imdb.spec, 1.9, 1.10 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list