Merge branch 'master' into next

11 files changed, 103 insertions, 25 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 445a3ab..13b23f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,20 @@
+1.5.8
+=====
+ca2da36  Updated install.rb and created man page
+3671c9f  [#4583] Refactor uptime to use Resolution.exec
+fca8861  [#4594] Reintroduce fix for #1291 from original patch
+32c0cb0  [#4594] Revert "fixes #2573, #2085, #1291..."
+e7df4c0  Updated CHANGELOG for 1.5.8rc2
+9c9cabd  Better fix for Bug 4569: Uptime Fact is incorrect on Windows
+01a515f  [#4289] operatingsystemrelease fact for oel, ovs
+b6c0a6b  Fix for bug #4569
+51bcebe  Fixed Rakefile package task version detection
+81ccb48  Removed references to Reductive Labs in the Rakefile
+
 1.5.8rc1
 ========
+f280703  Incremented version to 1.5.8
+98ef5e8  Updated CHANGELOG for 1.5.8rc1
 4398b36  Updated CHANGELOG rake task
 e02be1d  [#4156] Updating spec to match Kai's change
 bff84c2  [#4156] Applying patch by Kai
diff --git a/INSTALL b/INSTALL
index c972664..7c82ecc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 Run 'ruby install.rb' or use one of the distributed gem files at
-http://reductivelabs.com/downloads/gems .
+http://puppetlabs.com/downloads/gems .
 
 install.rb should successfully install; let me know if it doesn't.
 
diff --git a/README b/README
index 5866b70..683833f 100644
--- a/README
+++ b/README
@@ -5,4 +5,4 @@ processors, etc.
 
 See bin/facter for an example of the interface.
 
-See http://reductivelabs.com/projects/facter/ for more details.
+See http://www.puppetlabs.com/puppet/related-projects/facter for more details.
diff --git a/README.rst b/README.rst
index 3b69d09..2b71136 100644
--- a/README.rst
+++ b/README.rst
@@ -16,11 +16,11 @@ Run the ``facter`` binary on the command for a full list of facts supported on y
 Adding your own facts
 +++++++++++++++++++++
 
-See the `Adding Facts`_ wiki page for details of how to add your own custom facts to Facter.
+See the `Adding Facts`_ page for details of how to add your own custom facts to Facter.
  
 Further Information
 +++++++++++++++++++
 
-See http://reductivelabs.com/projects/facter/ for more details.
+See http://www.puppetlabs.com/puppet/related-projects/facter for more details.
 
-.. _Adding Facts: http://reductivelabs.com/trac/puppet/wiki/AddingFacts
+.. _Adding Facts: http://docs.puppetlabs.com/guides/custom_facts.html
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index b907d5b..1148fd3 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -5,12 +5,14 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
+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
+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
 BuildArch: noarch
@@ -50,6 +52,19 @@ 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
+
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz@pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch
@@ -58,6 +73,9 @@ rm -rf %{buildroot}
 - New version
 - Use upstream install script
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Sep 09 2008 Todd Zullinger <tmz@pobox.com> - 1.5.2-1
 - New version
 - Simplify spec file checking for Fedora and RHEL versions
diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo
index 05eef1f..968a459 100644
--- a/conf/solaris/pkginfo
+++ b/conf/solaris/pkginfo
@@ -2,6 +2,6 @@ PKG=CSWfacter
 NAME=facter - System Fact Gatherer
 VERSION=1.3.5
 CATEGORY=application
-VENDOR=http://reductivelabs.com/projects/facter
-HOTLINE=http://reductivelabs.com/cgi-bin/facter.cgi
+VENDOR=http://www.puppetlabs.com/puppet/related-projects/facter
+HOTLINE=http://puppetlabs.com/cgi-bin/facter.cgi
 EMAIL=luke@madstop.com
diff --git a/install.rb b/install.rb
index a40e292..bbf4007 100755
--- a/install.rb
+++ b/install.rb
@@ -316,12 +316,6 @@ def build_man(bins)
         # Locate rst2man
         rst2man = %x{which rst2man.py}
         rst2man.chomp!
-        # Create puppet.conf.8 man page
-        %x{bin/puppetdoc --reference configuration > ./puppet.conf.rst}
-        %x{#{rst2man} ./puppet.conf.rst ./man/man8/puppet.conf.8}
-        File.unlink("./puppet.conf.rst")
-
-        # Create binary man pages
         bins.each do |bin|
             b = bin.gsub( "bin/", "")
             %x{#{bin} --help > ./#{b}.rst}
diff --git a/lib/facter/domain.rb b/lib/facter/domain.rb
index b1bba4d..29bb204 100644
--- a/lib/facter/domain.rb
+++ b/lib/facter/domain.rb
@@ -9,9 +9,6 @@ Facter.add(:domain) do
         domain = Facter::Util::Resolution.exec('dnsdomainname')
         next domain if domain =~ /.+\..+/
 
-        domain = Facter::Util::Resolution.exec('domainname')
-        next domain if domain =~ /.+\..+/
-
         if FileTest.exists?("/etc/resolv.conf")
             domain = nil
             search = nil
diff --git a/lib/facter/util/uptime.rb b/lib/facter/util/uptime.rb
index 6c60ace..9a59d30 100644
--- a/lib/facter/util/uptime.rb
+++ b/lib/facter/util/uptime.rb
@@ -19,19 +19,19 @@ module Facter::Util::Uptime
     private
 
     def self.uptime_proc_uptime
-        if output = `/bin/cat #{uptime_file} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("/bin/cat #{uptime_file} 2>/dev/null")
             output.chomp.split(" ").first.to_i
         end
     end
 
     def self.uptime_sysctl
-        if output = `#{uptime_sysctl_cmd} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
             compute_uptime(Time.at(output.unpack('L').first))
         end
     end
 
     def self.uptime_who_dash_b
-        if output = `#{uptime_who_cmd} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
             compute_uptime(Time.parse(output))
         end
     end
diff --git a/man/man8/facter.8 b/man/man8/facter.8
new file mode 100644
index 0000000..ff24b89
--- /dev/null
+++ b/man/man8/facter.8
@@ -0,0 +1,54 @@
+.TH   "" "" ""
+.SH NAME
+ \- 
+.\" Man page generated from reStructeredText.
+.
+.SH SYNOPSIS
+.sp
+Collect and display facts about the system.
+.SH USAGE
+.INDENT 0.0
+.INDENT 3.5
+.sp
+facter [\-d|\-\-debug] [\-h|\-\-help] [\-p|\-\-puppet] [\-v|\-\-version] [\-y|\-\-yaml] [fact] [fact] [...]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Collect and display facts about the current system. The library behind
+Facter is easy to expand, making Facter an easy way to collect
+information about a system from within the shell or within Ruby.
+.sp
+If no facts are specifically asked for, then all facts will be returned.
+.SH OPTIONS
+.sp
+debug:   Enable debugging.
+.sp
+help:    Print this help message
+.INDENT 0.0
+.TP
+.B puppet:  Load the Puppet libraries, thus allowing Facter to load
+.
+Puppet\-specific facts.
+.UNINDENT
+.sp
+version: Print the version and exit.
+.sp
+yaml:    Emit facts in YAML format.
+.SH EXAMPLE
+.INDENT 0.0
+.INDENT 3.5
+.sp
+facter kernel
+.UNINDENT
+.UNINDENT
+.SH AUTHOR
+.sp
+Luke Kanies
+.SH COPYRIGHT
+.sp
+Copyright (c) 2006 Reductive Labs, LLC Licensed under the GNU Public
+License
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/tasks/rake/sign.rake b/tasks/rake/sign.rake
index be5697b..f0e9d83 100644
--- a/tasks/rake/sign.rake
+++ b/tasks/rake/sign.rake
@@ -1,14 +1,14 @@
-desc "Sign the package with the Reductive Labs release key"
+desc "Sign the package with the Puppet Labs release key"
 task :sign_packages do
 
 version = Facter::FACTERVERSION
 
 # Sign package
 
-sh "gpg --homedir $HOME/release_key --detach-sign --output pkg/facter-#{version}.tar.gz.sign --armor pkg/facter-#{version}.tar.gz"
+sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.tar.gz.sign --armor pkg/facter-#{version}.tar.gz"
 
 # Sign gem
 
-sh "gpg --homedir $HOME/release_key --detach-sign --output pkg/facter-#{version}.gem.sign --armor pkg/facter-#{version}.gem"
+sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.gem.sign --armor pkg/facter-#{version}.gem"
 
 end