Fixed #6974 - Moved to Apache 2.0 license

This is in line with our proposed plan to change
from the GPL license to Apache 2.0.

Please see this link for further explanation:

https://groups.google.com/d/topic/puppet-users/NuspYhMpE5o/discussion

7 files changed, 11 insertions, 81 deletions

diff --git a/lib/facter.rb b/lib/facter.rb
index 63eea37..2073b84 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -1,21 +1,18 @@
-#--
-# Copyright 2006 Luke Kanies <luke@madstop.com>
+# Facter - Host Fact Detection and Reporting
 #
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
+# Copyright 2011 Puppet Labs Inc
 #
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-#--
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License.
 
 module Facter
     # This is just so the other classes have the constant.
diff --git a/lib/facter/Cfkey.rb b/lib/facter/Cfkey.rb
index 8353392..e54aeb0 100644
--- a/lib/facter/Cfkey.rb
+++ b/lib/facter/Cfkey.rb
@@ -12,17 +12,6 @@
 ## Cfkey.rb
 ## Facts related to cfengine
 ##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation (version 2 of the License)
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-##
 
 Facter.add(:Cfkey) do
     setcode do
diff --git a/lib/facter/lsb.rb b/lib/facter/lsb.rb
index 107419a..7beb41d 100644
--- a/lib/facter/lsb.rb
+++ b/lib/facter/lsb.rb
@@ -13,18 +13,6 @@
 
 ## lsb.rb
 ## Facts related to Linux Standard Base (LSB)
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation (version 2 of the License)
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-##
 
 {  "LSBRelease"         => %r{^LSB Version:\t(.*)$},
    "LSBDistId"          => %r{^Distributor ID:\t(.*)$},
diff --git a/lib/facter/macosx.rb b/lib/facter/macosx.rb
index f5289df..7c8562d 100644
--- a/lib/facter/macosx.rb
+++ b/lib/facter/macosx.rb
@@ -18,17 +18,6 @@
 # Copyright (C) 2007 Jeff McCune
 # Author: Jeff McCune <jeff.mccune@northstarlabs.net>
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation (version 2 of the License)
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA    02110-1301 USA
-
 # Jeff McCune
 # There's a lot more information coming out of system_profiler -xml
 # We could add quite a bit more, but I didn't want to overload facter
diff --git a/lib/facter/ssh.rb b/lib/facter/ssh.rb
index beb5692..5ae68ed 100644
--- a/lib/facter/ssh.rb
+++ b/lib/facter/ssh.rb
@@ -10,17 +10,6 @@
 ## ssh.rb
 ## Facts related to SSH
 ##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation (version 2 of the License)
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-##
 
 ["/etc/ssh","/usr/local/etc/ssh","/etc","/usr/local/etc"].each do |dir|
     {"SSHDSAKey" => "ssh_host_dsa_key.pub", "SSHRSAKey" => "ssh_host_rsa_key.pub"}.each do |name,file|
diff --git a/lib/facter/util/macosx.rb b/lib/facter/util/macosx.rb
index 6754f18..cc9b2df 100644
--- a/lib/facter/util/macosx.rb
+++ b/lib/facter/util/macosx.rb
@@ -4,17 +4,6 @@
 ## Copyright (C) 2007 Jeff McCune
 ## Author: Jeff McCune <jeff.mccune@northstarlabs.net>
 ##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation (version 2 of the License)
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-##
 
 module Facter::Util::Macosx
     require 'thread'
diff --git a/lib/facter/util/memory.rb b/lib/facter/util/memory.rb
index d86a423..d49079d 100644
--- a/lib/facter/util/memory.rb
+++ b/lib/facter/util/memory.rb
@@ -1,17 +1,6 @@
 ## memory.rb
 ## Support module for memory related facts
 ##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation (version 2 of the License)
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-##
 
 module Facter::Memory
     require 'thread'