Skip to content

Commit 7493d78

Browse files
jhrozekrcritten
authored andcommitted
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
1 parent ffd467b commit 7493d78

File tree

277 files changed

+2468
-2006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+2468
-2006
lines changed

COPYING

+674
Large diffs are not rendered by default.

LICENSE

-339
This file was deleted.

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
include LICENSE TODO lite-server.py
1+
include COPYING TODO lite-server.py
22
include tests/*/*.py

README

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Licensing
4848
---------
4949

50-
Please see the file called LICENSE.
50+
Please see the file called COPYING.
5151

5252
Contacts
5353
--------

checks/check-ra.py

+20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
#!/usr/bin/python
2+
# Authors:
3+
# Jason Gerard DeRose <[email protected]>
4+
# John Dennis <[email protected]>
5+
#
6+
# Copyright (C) 2009 Red Hat
7+
# see file 'COPYING' for use and warranty information
8+
#
9+
# This program is free software; you can redistribute it and/or modify
10+
# it under the terms of the GNU General Public License as published by
11+
# the Free Software Foundation, either version 3 of the License, or
12+
# (at your option) any later version.
13+
#
14+
# This program is distributed in the hope that it will be useful,
15+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
# GNU General Public License for more details.
18+
#
19+
# You should have received a copy of the GNU General Public License
20+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
21+
#
222

323
"""
424
This tests the api.Backend.ra plugin against a test CA server awnuk has runnig.

contrib/RHEL4/ipa-client-setup

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
# Copyright (C) 2007 Red Hat
66
# see file 'COPYING' for use and warranty information
77
#
8-
# This program is free software; you can redistribute it and/or
9-
# modify it under the terms of the GNU General Public License as
10-
# published by the Free Software Foundation; version 2 only
8+
# This program is free software; you can redistribute it and/or modify
9+
# it under the terms of the GNU General Public License as published by
10+
# the Free Software Foundation, either version 3 of the License, or
11+
# (at your option) any later version.
1112
#
1213
# This program is distributed in the hope that it will be useful,
1314
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1415
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1516
# GNU General Public License for more details.
1617
#
1718
# You should have received a copy of the GNU General Public License
18-
# along with this program; if not, write to the Free Software
19-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
#
2121

2222
VERSION = "%prog .1"

contrib/RHEL4/ipachangeconf.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
# Copyright (c) 1999-2007 Red Hat, Inc.
55
# Author: Simo Sorce <[email protected]>
66
#
7-
# This is free software; you can redistribute it and/or modify it
8-
# under the terms of the GNU General Public License as published by
9-
# the Free Software Foundation; version 2 only
7+
# This program is free software; you can redistribute it and/or modify
8+
# it under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation, either version 3 of the License, or
10+
# (at your option) any later version.
1011
#
11-
# This program is distributed in the hope that it will be useful, but
12-
# WITHOUT ANY WARRANTY; without even the implied warranty of
13-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14-
# General Public License for more details.
12+
# This program is distributed in the hope that it will be useful,
13+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
# GNU General Public License for more details.
1516
#
1617
# You should have received a copy of the GNU General Public License
17-
# along with this program; if not, write to the Free Software
18-
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19-
#
18+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
2019

2120
import fcntl
2221
import os

contrib/RHEL4/setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Copyright (C) 2007 Red Hat
33
# see file 'COPYING' for use and warranty information
44
#
5-
# This program is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU General Public License as
7-
# published by the Free Software Foundation; version 2 only
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation, either version 3 of the License, or
8+
# (at your option) any later version.
89
#
910
# This program is distributed in the hope that it will be useful,
1011
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1112
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
# GNU General Public License for more details.
1314
#
1415
# You should have received a copy of the GNU General Public License
15-
# along with this program; if not, write to the Free Software
16-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
#
1818

1919
"""FreeIPA python support library

daemons/ipa-kpasswd/ipa_kpasswd.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
* Copyright (C) 2007, 2008 Red Hat
77
* see file 'COPYING' for use and warranty information
88
*
9-
* This program is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License as
11-
* published by the Free Software Foundation; version 2 only
9+
* This program is free software you can redistribute it and/or modify
10+
* it under the terms of the GNU General Public License as published by
11+
* the Free Software Foundation, either version 3 of the License, or
12+
* (at your option) any later version.
1213
*
1314
* This program is distributed in the hope that it will be useful,
1415
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1516
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1617
* GNU General Public License for more details.
1718
*
1819
* You should have received a copy of the GNU General Public License
19-
* along with this program; if not, write to the Free Software
20-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2121
*/
2222

2323
#define _GNU_SOURCE

daemons/ipa-slapi-plugins/common/util.h

+36
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
/** BEGIN COPYRIGHT BLOCK
2+
* This program is free software; you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*
12+
* You should have received a copy of the GNU General Public License
13+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
14+
*
15+
* Additional permission under GPLv3 section 7:
16+
*
17+
* In the following paragraph, "GPL" means the GNU General Public
18+
* License, version 3 or any later version, and "Non-GPL Code" means
19+
* code that is governed neither by the the GPL nor a license
20+
* compatible with the GPL.
21+
*
22+
* You may link the code of this Program with Non-GPL Code and convey
23+
* linked combinations including the two, provided that such Non-GPL
24+
* Code only links to the code of this Program through those well
25+
* defined interfaces identified in the file named EXCEPTION found in
26+
* the source code files (the "Approved Interfaces"). The files of
27+
* Non-GPL Code may instantiate templates or use macros or inline
28+
* functions from the Approved Interfaces without causing the resulting
29+
* work to be covered by the GPL. Only the copyright holders of this
30+
* Program may make changes or additions to the list of Approved
31+
* Interfaces.
32+
*
33+
* Copyright (C) 2010 Red Hat, Inc.
34+
* All rights reserved.
35+
* END COPYRIGHT BLOCK **/
36+
137
#ifndef _SLAPI_PLUGINS_UTIL_H
238
#define _SLAPI_PLUGINS_UTIL_H
339

daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c

+26-27
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
/** BEGIN COPYRIGHT BLOCK
2-
* This Program is free software; you can redistribute it and/or modify it under
3-
* the terms of the GNU General Public License as published by the Free Software
4-
* Foundation; version 2 of the License.
2+
* This program is free software; you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
56
*
6-
* This Program is distributed in the hope that it will be useful, but WITHOUT
7-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
8-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
911
*
10-
* You should have received a copy of the GNU General Public License along with
11-
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
12-
* Place, Suite 330, Boston, MA 02111-1307 USA.
12+
* You should have received a copy of the GNU General Public License
13+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1314
*
14-
* In addition, as a special exception, Red Hat, Inc. gives You the additional
15-
* right to link the code of this Program with code not covered under the GNU
16-
* General Public License ("Non-GPL Code") and to distribute linked combinations
17-
* including the two, subject to the limitations in this paragraph. Non-GPL Code
18-
* permitted under this exception must only link to the code of this Program
19-
* through those well defined interfaces identified in the file named EXCEPTION
20-
* found in the source code files (the "Approved Interfaces"). The files of
21-
* Non-GPL Code may instantiate templates or use macros or inline functions from
22-
* the Approved Interfaces without causing the resulting work to be covered by
23-
* the GNU General Public License. Only Red Hat, Inc. may make changes or
24-
* additions to the list of Approved Interfaces. You must obey the GNU General
25-
* Public License in all respects for all of the Program code and other code used
26-
* in conjunction with the Program except the Non-GPL Code covered by this
27-
* exception. If you modify this file, you may extend this exception to your
28-
* version of the file, but you are not obligated to do so. If you do not wish to
29-
* provide this exception without modification, you must delete this exception
30-
* statement from your version and license this file solely under the GPL without
31-
* exception.
15+
* Additional permission under GPLv3 section 7:
3216
*
17+
* In the following paragraph, "GPL" means the GNU General Public
18+
* License, version 3 or any later version, and "Non-GPL Code" means
19+
* code that is governed neither by the the GPL nor a license
20+
* compatible with the GPL.
21+
*
22+
* You may link the code of this Program with Non-GPL Code and convey
23+
* linked combinations including the two, provided that such Non-GPL
24+
* Code only links to the code of this Program through those well
25+
* defined interfaces identified in the file named EXCEPTION found in
26+
* the source code files (the "Approved Interfaces"). The files of
27+
* Non-GPL Code may instantiate templates or use macros or inline
28+
* functions from the Approved Interfaces without causing the resulting
29+
* work to be covered by the GPL. Only the copyright holders of this
30+
* Program may make changes or additions to the list of Approved
31+
* Interfaces.
3332
*
3433
* Copyright (C) 2005 Red Hat, Inc.
3534
* All rights reserved.

daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c

+26-27
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
/** BEGIN COPYRIGHT BLOCK
2-
* This Program is free software; you can redistribute it and/or modify it under
3-
* the terms of the GNU General Public License as published by the Free Software
4-
* Foundation; version 2 of the License.
2+
* This program is free software; you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
56
*
6-
* This Program is distributed in the hope that it will be useful, but WITHOUT
7-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
8-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
911
*
10-
* You should have received a copy of the GNU General Public License along with
11-
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
12-
* Place, Suite 330, Boston, MA 02111-1307 USA.
12+
* You should have received a copy of the GNU General Public License
13+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1314
*
14-
* In addition, as a special exception, Red Hat, Inc. gives You the additional
15-
* right to link the code of this Program with code not covered under the GNU
16-
* General Public License ("Non-GPL Code") and to distribute linked combinations
17-
* including the two, subject to the limitations in this paragraph. Non-GPL Code
18-
* permitted under this exception must only link to the code of this Program
19-
* through those well defined interfaces identified in the file named EXCEPTION
20-
* found in the source code files (the "Approved Interfaces"). The files of
21-
* Non-GPL Code may instantiate templates or use macros or inline functions from
22-
* the Approved Interfaces without causing the resulting work to be covered by
23-
* the GNU General Public License. Only Red Hat, Inc. may make changes or
24-
* additions to the list of Approved Interfaces. You must obey the GNU General
25-
* Public License in all respects for all of the Program code and other code used
26-
* in conjunction with the Program except the Non-GPL Code covered by this
27-
* exception. If you modify this file, you may extend this exception to your
28-
* version of the file, but you are not obligated to do so. If you do not wish to
29-
* provide this exception without modification, you must delete this exception
30-
* statement from your version and license this file solely under the GPL without
31-
* exception.
15+
* Additional permission under GPLv3 section 7:
3216
*
17+
* In the following paragraph, "GPL" means the GNU General Public
18+
* License, version 3 or any later version, and "Non-GPL Code" means
19+
* code that is governed neither by the the GPL nor a license
20+
* compatible with the GPL.
21+
*
22+
* You may link the code of this Program with Non-GPL Code and convey
23+
* linked combinations including the two, provided that such Non-GPL
24+
* Code only links to the code of this Program through those well
25+
* defined interfaces identified in the file named EXCEPTION found in
26+
* the source code files (the "Approved Interfaces"). The files of
27+
* Non-GPL Code may instantiate templates or use macros or inline
28+
* functions from the Approved Interfaces without causing the resulting
29+
* work to be covered by the GPL. Only the copyright holders of this
30+
* Program may make changes or additions to the list of Approved
31+
* Interfaces.
3332
*
3433
* Copyright (C) 2010 Red Hat, Inc.
3534
* All rights reserved.

daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
/** BEGIN COPYRIGHT BLOCK
2-
* This Program is free software; you can redistribute it and/or modify it under
3-
* the terms of the GNU General Public License as published by the Free Software
4-
* Foundation; version 2 of the License.
2+
* This program is free software; you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
56
*
6-
* This Program is distributed in the hope that it will be useful, but WITHOUT
7-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
8-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
911
*
10-
* You should have received a copy of the GNU General Public License along with
11-
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
12-
* Place, Suite 330, Boston, MA 02111-1307 USA.
12+
* You should have received a copy of the GNU General Public License
13+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1314
*
14-
* In addition, as a special exception, Red Hat, Inc. gives You the additional
15-
* right to link the code of this Program with code not covered under the GNU
16-
* General Public License ("Non-GPL Code") and to distribute linked combinations
17-
* including the two, subject to the limitations in this paragraph. Non-GPL Code
18-
* permitted under this exception must only link to the code of this Program
19-
* through those well defined interfaces identified in the file named EXCEPTION
20-
* found in the source code files (the "Approved Interfaces"). The files of
21-
* Non-GPL Code may instantiate templates or use macros or inline functions from
22-
* the Approved Interfaces without causing the resulting work to be covered by
23-
* the GNU General Public License. Only Red Hat, Inc. may make changes or
24-
* additions to the list of Approved Interfaces. You must obey the GNU General
25-
* Public License in all respects for all of the Program code and other code
26-
* used in conjunction with the Program except the Non-GPL Code covered by this
27-
* exception. If you modify this file, you may extend this exception to your
28-
* version of the file, but you are not obligated to do so. If you do not wish
29-
* to provide this exception without modification, you must delete this
30-
* exception statement from your version and license this file solely under the
31-
* GPL without exception.
15+
* Additional permission under GPLv3 section 7:
16+
*
17+
* In the following paragraph, "GPL" means the GNU General Public
18+
* License, version 3 or any later version, and "Non-GPL Code" means
19+
* code that is governed neither by the the GPL nor a license
20+
* compatible with the GPL.
21+
*
22+
* You may link the code of this Program with Non-GPL Code and convey
23+
* linked combinations including the two, provided that such Non-GPL
24+
* Code only links to the code of this Program through those well
25+
* defined interfaces identified in the file named EXCEPTION found in
26+
* the source code files (the "Approved Interfaces"). The files of
27+
* Non-GPL Code may instantiate templates or use macros or inline
28+
* functions from the Approved Interfaces without causing the resulting
29+
* work to be covered by the GPL. Only the copyright holders of this
30+
* Program may make changes or additions to the list of Approved
31+
* Interfaces.
3232
*
3333
* Authors:
3434
* Simo Sorce <[email protected]>

0 commit comments

Comments
 (0)