(maint) Fix licensing references to GNU GPL.

diff --git a/LICENSE b/LICENSE
index b9920253e84d037092a7bebe742c39a8b5eb4594..e43c1c5cc95d0dc820a0a80374d3e4b8de9dd69b 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Puppet Firewall Module - Puppet module for managing Firewalls
 
-Copyright (C) 2011 Puppet Labs Inc
+Copyright (C) 2011 Puppet Labs, Inc.
 Copyright (C) 2011 Jonathan Boyett
 
 Some of the iptables code was taken from puppet-iptables which was:

diff --git a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
index 7e21d50112840b69765f90c162426b834b87e86c..faf5977fc35e0147d606719277b90f2ca52b5379 100644 (file)
--- a/lib/puppet/util/firewall.rb
+++ b/lib/puppet/util/firewall.rb
@@ -1,25 +1,7 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# 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, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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, see <http://www.gnu.org/licenses/>.
-
 require 'socket'
 require 'puppet/util/ipcidr'
 
+# Util module for puppetlabs-firewall
 module Puppet::Util::Firewall
   # Translate the symbolic names for icmp packet types to integers
   def icmp_name_to_number(value_icmp)

diff --git a/lib/puppet/util/ipcidr.rb b/lib/puppet/util/ipcidr.rb
index 3b19bc06c823726ba641dfc555cfebfaa22ff8d8..7b59eb8f3c79ada3469bc7e860263d125ea5f87c 100644 (file)
--- a/lib/puppet/util/ipcidr.rb
+++ b/lib/puppet/util/ipcidr.rb
@@ -1,24 +1,6 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# 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, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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, see <http://www.gnu.org/licenses/>.
-
 require 'ipaddr'
 
+# IPCidr object wrapper for IPAddr
 module Puppet
   module Util
     class IPCidr < IPAddr