From 7493d781dfcaa7995f7864a09ad39ba6a89f1a9c Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 9 Dec 2010 13:59:11 +0100 Subject: 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 --- ipaserver/install/__init__.py | 10 +++++----- ipaserver/install/bindinstance.py | 10 +++++----- ipaserver/install/cainstance.py | 10 +++++----- ipaserver/install/certs.py | 10 +++++----- ipaserver/install/dsinstance.py | 10 +++++----- ipaserver/install/httpinstance.py | 10 +++++----- ipaserver/install/installutils.py | 10 +++++----- ipaserver/install/krbinstance.py | 10 +++++----- ipaserver/install/ldapupdate.py | 10 +++++----- ipaserver/install/ntpinstance.py | 10 +++++----- ipaserver/install/replication.py | 10 +++++----- ipaserver/install/service.py | 10 +++++----- ipaserver/install/upgradeinstance.py | 10 +++++----- 13 files changed, 65 insertions(+), 65 deletions(-) (limited to 'ipaserver/install') diff --git a/ipaserver/install/__init__.py b/ipaserver/install/__init__.py index ef86f9ec5..bc2229415 100644 --- a/ipaserver/install/__init__.py +++ b/ipaserver/install/__init__.py @@ -4,9 +4,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 or later +# 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 @@ -14,8 +15,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 . # __all__ = ["dsinstance", "krbinstance"] diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 30ce41138..c791d20ed 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import tempfile diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 9d7a4c237..7d374370a 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -5,9 +5,10 @@ # Copyright (C) 2009 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 . # import logging diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index 0a40c667c..209ed3e1c 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import os, stat, subprocess, re diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 751be78f6..3dbedfb8b 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -4,9 +4,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 @@ -14,8 +15,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 . # import shutil diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 411f2ae46..776511fa0 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import os diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index ff2e2bd31..ab7baccaa 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import logging diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index bffd7c1b9..f0078e968 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import shutil diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 3ab5a0e4d..939f04553 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -3,9 +3,10 @@ # Copyright (C) 2008 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 @@ -13,8 +14,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 . # # Documentation can be found at http://freeipa.org/page/LdapUpdate diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py index 1c9531677..d85e430b7 100644 --- a/ipaserver/install/ntpinstance.py +++ b/ipaserver/install/ntpinstance.py @@ -4,9 +4,10 @@ # Copyright (C) 2007-2010 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 @@ -14,8 +15,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 . # import logging diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index cdff50e7f..f3e007c6e 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import time, logging diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 80a9a51f1..6517b8905 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -3,9 +3,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 @@ -13,8 +14,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 . # import logging, sys diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 79a7f9545..156c4c2db 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -3,9 +3,10 @@ # Copyright (C) 2010 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 @@ -13,8 +14,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 . # import os -- cgit