Skip to content

Commit f6b00fd

Browse files
committed
Update to latest versions of GPL-2.0 and LGPL-2.1
Pull copies of these files directly from the GNU website: http://www.gnu.org/licenses/gpl-2.0.txt http://www.gnu.org/licenses/lgpl-2.1.txt Fixes the address of the Free Software Foundation (BZ #15844). Also includes some minor formatting changes and corrects references to the GNU "Library" General Public License.
1 parent d4f66d3 commit f6b00fd

File tree

4 files changed

+65
-68
lines changed

4 files changed

+65
-68
lines changed

COPYING

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
GNU GENERAL PUBLIC LICENSE
2-
Version 2, June 1991
1+
GNU GENERAL PUBLIC LICENSE
2+
Version 2, June 1991
33

4-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
66
Everyone is permitted to copy and distribute verbatim copies
77
of this license document, but changing it is not allowed.
88

9-
Preamble
9+
Preamble
1010

1111
The licenses for most software are designed to take away your
1212
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
1515
General Public License applies to most of the Free Software
1616
Foundation's software and to any other program whose authors commit to
1717
using it. (Some other Free Software Foundation software is covered by
18-
the GNU Library General Public License instead.) You can apply it to
18+
the GNU Lesser General Public License instead.) You can apply it to
1919
your programs, too.
2020

2121
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
5555

5656
The precise terms and conditions for copying, distribution and
5757
modification follow.
58-
59-
GNU GENERAL PUBLIC LICENSE
58+
59+
GNU GENERAL PUBLIC LICENSE
6060
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
6161

6262
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
110110
License. (Exception: if the Program itself is interactive but
111111
does not normally print such an announcement, your work based on
112112
the Program is not required to print an announcement.)
113-
113+
114114
These requirements apply to the modified work as a whole. If
115115
identifiable sections of that work are not derived from the Program,
116116
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
168168
access to copy the source code from the same place counts as
169169
distribution of the source code, even though third parties are not
170170
compelled to copy the source along with the object code.
171-
171+
172172
4. You may not copy, modify, sublicense, or distribute the Program
173173
except as expressly provided under this License. Any attempt
174174
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
225225

226226
This section is intended to make thoroughly clear what is believed to
227227
be a consequence of the rest of this License.
228-
228+
229229
8. If the distribution and/or use of the Program is restricted in
230230
certain countries either by patents or by copyrighted interfaces, the
231231
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
255255
of preserving the free status of all derivatives of our free software and
256256
of promoting the sharing and reuse of software generally.
257257

258-
NO WARRANTY
258+
NO WARRANTY
259259

260260
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261261
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277277
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278278
POSSIBILITY OF SUCH DAMAGES.
279279

280-
END OF TERMS AND CONDITIONS
281-
282-
How to Apply These Terms to Your New Programs
280+
END OF TERMS AND CONDITIONS
281+
282+
How to Apply These Terms to Your New Programs
283283

284284
If you develop a new program, and you want it to be of the greatest
285285
possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
303303
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304304
GNU General Public License for more details.
305305

306-
You should have received a copy of the GNU General Public License
307-
along with this program; if not, write to the Free Software
308-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309-
306+
You should have received a copy of the GNU General Public License along
307+
with this program; if not, write to the Free Software Foundation, Inc.,
308+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
310309

311310
Also add information on how to contact you by electronic and paper mail.
312311

@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
336335
This General Public License does not permit incorporating your program into
337336
proprietary programs. If your program is a subroutine library, you may
338337
consider it more useful to permit linking proprietary applications with the
339-
library. If this is what you want to do, use the GNU Library General
338+
library. If this is what you want to do, use the GNU Lesser General
340339
Public License instead of this License.

COPYING.LIB

+38-46
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
GNU LESSER GENERAL PUBLIC LICENSE
32
Version 2.1, February 1999
43

54
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
6-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
76
Everyone is permitted to copy and distribute verbatim copies
87
of this license document, but changing it is not allowed.
98

@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
2322
Free Software Foundation and other authors who decide to use it. You
2423
can use it too, but we suggest you first think carefully about whether
2524
this license or the ordinary General Public License is the better
26-
strategy to use in any particular case, based on the explanations
27-
below.
25+
strategy to use in any particular case, based on the explanations below.
2826

2927
When we speak of free software, we are referring to freedom of use,
3028
not price. Our General Public Licenses are designed to make sure that
@@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know
5755
that what they have is not the original version, so that the original
5856
author's reputation will not be affected by problems that might be
5957
introduced by others.
60-
^L
58+
6159
Finally, software patents pose a constant threat to the existence of
6260
any free program. We wish to make sure that a company cannot
6361
effectively restrict the users of a free program by obtaining a
@@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain
8987
special circumstances.
9088

9189
For example, on rare occasions, there may be a special need to
92-
encourage the widest possible use of a certain library, so that it
93-
becomes a de-facto standard. To achieve this, non-free programs must
94-
be allowed to use the library. A more frequent case is that a free
90+
encourage the widest possible use of a certain library, so that it becomes
91+
a de-facto standard. To achieve this, non-free programs must be
92+
allowed to use the library. A more frequent case is that a free
9593
library does the same job as widely used non-free libraries. In this
9694
case, there is little to gain by limiting the free library to free
9795
software only, so we use the Lesser General Public License.
@@ -113,7 +111,7 @@ modification follow. Pay close attention to the difference between a
113111
"work based on the library" and a "work that uses the library". The
114112
former contains code derived from the library, whereas the latter must
115113
be combined with the library in order to run.
116-
^L
114+
117115
GNU LESSER GENERAL PUBLIC LICENSE
118116
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
119117

@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
138136
"Source code" for a work means the preferred form of the work for
139137
making modifications to it. For a library, complete source code means
140138
all the source code for all modules it contains, plus any associated
141-
interface definition files, plus the scripts used to control
142-
compilation and installation of the library.
139+
interface definition files, plus the scripts used to control compilation
140+
and installation of the library.
143141

144142
Activities other than copying, distribution and modification are not
145143
covered by this License; they are outside its scope. The act of
@@ -218,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
218216
ordinary GNU General Public License has appeared, then you can specify
219217
that version instead if you wish.) Do not make any other change in
220218
these notices.
221-
^L
219+
222220
Once this change is made in a given copy, it is irreversible for
223221
that copy, so the ordinary GNU General Public License applies to all
224222
subsequent copies and derivative works made from that copy.
@@ -269,7 +267,7 @@ Library will still fall under Section 6.)
269267
distribute the object code for the work under the terms of Section 6.
270268
Any executables containing that work also fall under Section 6,
271269
whether or not they are linked directly with the Library itself.
272-
^L
270+
273271
6. As an exception to the Sections above, you may also combine or
274272
link a "work that uses the Library" with the Library to produce a
275273
work containing portions of the Library, and distribute that work
@@ -305,10 +303,10 @@ of these things:
305303
the user installs one, as long as the modified version is
306304
interface-compatible with the version that the work was made with.
307305

308-
c) Accompany the work with a written offer, valid for at least
309-
three years, to give the same user the materials specified in
310-
Subsection 6a, above, for a charge no more than the cost of
311-
performing this distribution.
306+
c) Accompany the work with a written offer, valid for at
307+
least three years, to give the same user the materials
308+
specified in Subsection 6a, above, for a charge no more
309+
than the cost of performing this distribution.
312310

313311
d) If distribution of the work is made by offering access to copy
314312
from a designated place, offer equivalent access to copy the above
@@ -331,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
331329
accompany the operating system. Such a contradiction means you cannot
332330
use both them and the Library together in an executable that you
333331
distribute.
334-
^L
332+
335333
7. You may place library facilities that are a work based on the
336334
Library side-by-side in a single library together with other library
337335
facilities not covered by this License, and distribute such a combined
@@ -372,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
372370
restrictions on the recipients' exercise of the rights granted herein.
373371
You are not responsible for enforcing compliance by third parties with
374372
this License.
375-
^L
373+
376374
11. If, as a consequence of a court judgment or allegation of patent
377375
infringement or for any other reason (not limited to patent issues),
378376
conditions are imposed on you (whether by court order, agreement or
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
386384
the only way you could satisfy both it and this License would be to
387385
refrain entirely from distribution of the Library.
388386

389-
If any portion of this section is held invalid or unenforceable under
390-
any particular circumstance, the balance of the section is intended to
391-
apply, and the section as a whole is intended to apply in other
392-
circumstances.
387+
If any portion of this section is held invalid or unenforceable under any
388+
particular circumstance, the balance of the section is intended to apply,
389+
and the section as a whole is intended to apply in other circumstances.
393390

394391
It is not the purpose of this section to induce you to infringe any
395392
patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
407404

408405
12. If the distribution and/or use of the Library is restricted in
409406
certain countries either by patents or by copyrighted interfaces, the
410-
original copyright holder who places the Library under this License
411-
may add an explicit geographical distribution limitation excluding those
412-
countries, so that distribution is permitted only in or among
413-
countries not thus excluded. In such case, this License incorporates
414-
the limitation as if written in the body of this License.
407+
original copyright holder who places the Library under this License may add
408+
an explicit geographical distribution limitation excluding those countries,
409+
so that distribution is permitted only in or among countries not thus
410+
excluded. In such case, this License incorporates the limitation as if
411+
written in the body of this License.
415412

416413
13. The Free Software Foundation may publish revised and/or new
417414
versions of the Lesser General Public License from time to time.
@@ -425,7 +422,7 @@ conditions either of that version or of any later version published by
425422
the Free Software Foundation. If the Library does not specify a
426423
license version number, you may choose any version ever published by
427424
the Free Software Foundation.
428-
^L
425+
429426
14. If you wish to incorporate parts of the Library into other free
430427
programs whose distribution conditions are incompatible with these,
431428
write to the author to ask for permission. For software which is
@@ -459,21 +456,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
459456
DAMAGES.
460457

461458
END OF TERMS AND CONDITIONS
462-
^L
459+
463460
How to Apply These Terms to Your New Libraries
464461

465462
If you develop a new library, and you want it to be of the greatest
466463
possible use to the public, we recommend making it free software that
467464
everyone can redistribute and change. You can do so by permitting
468-
redistribution under these terms (or, alternatively, under the terms
469-
of the ordinary General Public License).
470-
471-
To apply these terms, attach the following notices to the library.
472-
It is safest to attach them to the start of each source file to most
473-
effectively convey the exclusion of warranty; and each file should
474-
have at least the "copyright" line and a pointer to where the full
475-
notice is found.
465+
redistribution under these terms (or, alternatively, under the terms of the
466+
ordinary General Public License).
476467

468+
To apply these terms, attach the following notices to the library. It is
469+
safest to attach them to the start of each source file to most effectively
470+
convey the exclusion of warranty; and each file should have at least the
471+
"copyright" line and a pointer to where the full notice is found.
477472

478473
<one line to give the library's name and a brief idea of what it does.>
479474
Copyright (C) <year> <name of author>
@@ -490,21 +485,18 @@ notice is found.
490485

491486
You should have received a copy of the GNU Lesser General Public
492487
License along with this library; if not, write to the Free Software
493-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
488+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
494489

495490
Also add information on how to contact you by electronic and paper mail.
496491

497-
You should also get your employer (if you work as a programmer) or
498-
your school, if any, to sign a "copyright disclaimer" for the library,
499-
if necessary. Here is a sample; alter the names:
492+
You should also get your employer (if you work as a programmer) or your
493+
school, if any, to sign a "copyright disclaimer" for the library, if
494+
necessary. Here is a sample; alter the names:
500495

501496
Yoyodyne, Inc., hereby disclaims all copyright interest in the
502-
library `Frob' (a library for tweaking knobs) written by James
503-
Random Hacker.
497+
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
504498

505499
<signature of Ty Coon>, 1 April 1990
506500
Ty Coon, President of Vice
507501

508502
That's all there is to it!
509-
510-

ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2013-09-09 Allan McRae <[email protected]>
2+
3+
[BZ #15844]
4+
* COPYING: Update from GNU website to fix FSF address.
5+
* COPYING.LIB: Likewise.
6+
17
2013-09-06 David S. Miller <[email protected]>
28

39
* po/zh_TW.po: Update Chinese (traditional) translation from

NEWS

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Version 2.19
99

1010
* The following bugs are resolved with this release:
1111

12-
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15867,
13-
15886, 15887, 15890, 15897, 15905, 15909, 15921.
12+
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
13+
15867, 15886, 15887, 15890, 15897, 15905, 15909, 15921.
1414

1515
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
1616
to the d_name member of struct dirent, or omit the terminating NUL

0 commit comments

Comments
 (0)