Update to facter-1.5.8

epel9
Todd Zullinger 15 years ago
parent 17e54b78b3
commit 3a4165f181

6
.gitignore vendored

@ -1 +1,5 @@
facter-1.5.7.tar.gz
*~
*.rpm
*.tar.gz
/.build*.log
/facter-*/

@ -1,28 +0,0 @@
From 4056c6474460535793f5d0c38521306d973571ca Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti@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

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJMeFGrAAoJEBBUt6JL1uwwFJ8P/2a7qg3wataDTQF8gcmbDhN+
sz64qzF5gLU2wCwfjTo8I2g1ZHUE0Sh9rNCHVdsNyeW9BG6EApD8qZGh50O/F4FN
NI6jdD1RRSCspBxC8UJm3FzStFaJPDDTYYBOVixyW/KscddClxuOfRgdlywP1IaW
j+v9f/Q0Uojwj2B4/QeV/+idz0zwJ6G91AvUFtrMzx4dcFC4cZK8lqWDYFAjma66
7doVFSzq3nAdcda3yGHE9EeAPqF86s5OUcQ5e8IvZiXAydP+nudgwXsXmjBD/0ut
7pRfIbArGyNx79H5l0qhVAssxB02rKS5iMU16XMdcWETEXmN2AQtI2xmZWxhmZ21
PLJ5xQ7KoEGVB+zGuYegxgZQ6dOYTmI9wd08sbChiS3VhSrftR0xmB+le0fkFopc
SitEB8C8pNo1kIx6zzkFSdSD0VFOKEg0p/8US4TwNGaF74/IZbaJZbQ4B1Hv/rC8
D3SVuNw7pch0RjydWr8dGtivzHDkRa1n8YClodi0Rw0owGrmAanXC8EcwuRjjOiX
jBFJ9CkClRTwVvgXKozQKwdh9B1MvoRU2ZNyfM/x+p4cyv6OsVve7KRkP7KFjqJm
VRAabQRkS860SYgJ46VrhsdWGXg2pQF+78l5lt1LjTWPqNUZ8CrRiNNf8mbNHb1s
qwJsTWPlKXabPADldWv9
=Ecby
-----END PGP SIGNATURE-----

@ -5,15 +5,13 @@
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
Version: 1.5.7
Version: 1.5.8
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.7-facts-hanging-on-_proc_xen_capabilities.patch
URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/
Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %has_ruby_noarch
@ -34,7 +32,6 @@ operating system. Additional facts can be added through simple Ruby scripts
%prep
%setup -q
%patch0 -p1
%build
@ -55,6 +52,9 @@ rm -rf %{buildroot}
%changelog
* Sat Aug 28 2010 Todd Zullinger <tmz@pobox.com> - 1.5.8-1
- Update to 1.5.8
* Fri Sep 25 2009 Todd Zullinger <tmz@pobox.com> - 1.5.7-1
- Update to 1.5.7
- Update #508037 patch from upstream ticket

@ -1 +1 @@
21db7b613fe14a54e72ef062f3d5e190 facter-1.5.7.tar.gz
4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz

Loading…
Cancel
Save