summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2010-12-09 13:59:11 +0100
committerRob Crittenden <rcritten@redhat.com>2010-12-20 17:19:53 -0500
commit7493d781dfcaa7995f7864a09ad39ba6a89f1a9c (patch)
tree4e7ff4188d2f8105679369e58d6a2734b4872998 /contrib
parentffd467bd7e12faad3f1574fe3c1e505820bdf459 (diff)
downloadfreeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.zip
freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.gz
freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.xz
Change FreeIPA license to GPLv3+
The changes include: * Change license blobs in source files to mention GPLv3+ not GPLv2 only * Add GPLv3+ license text * Package COPYING not LICENSE as the license blobs (even the old ones) mention COPYING specifically, it is also more common, I think https://fedorahosted.org/freeipa/ticket/239
Diffstat (limited to 'contrib')
-rw-r--r--contrib/RHEL4/ipa-client-setup10
-rw-r--r--contrib/RHEL4/ipachangeconf.py19
-rw-r--r--contrib/RHEL4/setup.py10
3 files changed, 19 insertions, 20 deletions
diff --git a/contrib/RHEL4/ipa-client-setup b/contrib/RHEL4/ipa-client-setup
index 8f43cc8..fe81616 100644
--- a/contrib/RHEL4/ipa-client-setup
+++ b/contrib/RHEL4/ipa-client-setup
@@ -5,9 +5,10 @@
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#
-# 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 only
+# 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
@@ -15,8 +16,7 @@
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
VERSION = "%prog .1"
diff --git a/contrib/RHEL4/ipachangeconf.py b/contrib/RHEL4/ipachangeconf.py
index 34c08d1..4007229 100644
--- a/contrib/RHEL4/ipachangeconf.py
+++ b/contrib/RHEL4/ipachangeconf.py
@@ -4,19 +4,18 @@
# Copyright (c) 1999-2007 Red Hat, Inc.
# Author: Simo Sorce <ssorce@redhat.com>
#
-# This 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 only
+# 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.
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
import fcntl
import os
diff --git a/contrib/RHEL4/setup.py b/contrib/RHEL4/setup.py
index ef0f36b..df0adcf 100644
--- a/contrib/RHEL4/setup.py
+++ b/contrib/RHEL4/setup.py
@@ -2,9 +2,10 @@
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#
-# 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 only
+# 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
@@ -12,8 +13,7 @@
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
"""FreeIPA python support library