Skip to content

Commit 8d587f0

Browse files
petkkrakjoe
authored andcommitted
Refactor ext/phar License info
1 parent 4c97dc0 commit 8d587f0

File tree

2 files changed

+49
-116
lines changed

2 files changed

+49
-116
lines changed

README.REDIST.BINS

+49-21
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
15. main/strlcat
1616
16. main/strlcpy
1717
17. libgd see ext/gd/libgd/COPYING
18+
18. ext/phar portions of tar implementations
1819

1920
5. ext/standard crypt
2021

@@ -46,7 +47,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
4647
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
4748
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
4849
SUCH DAMAGE.
49-
50+
5051

5152
6. ext/standard crypt's blowfish implementation
5253

@@ -92,7 +93,7 @@ http://www.usenix.org/events/usenix99/provos.html
9293
Some of the tricks in BF_ROUND might be inspired by Eric Young's
9394
Blowfish library (I can't be sure if I would think of something if I
9495
hadn't seen his code).
95-
96+
9697

9798
7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
9899

@@ -126,7 +127,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
126127

127128
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
128129
Copyright (C) 2000 - 2003, Richard J. Wagner
129-
All rights reserved.
130+
All rights reserved.
130131

131132
Redistribution and use in source and binary forms, with or without
132133
modification, are permitted provided that the following conditions
@@ -139,8 +140,8 @@ are met:
139140
notice, this list of conditions and the following disclaimer in the
140141
documentation and/or other materials provided with the distribution.
141142

142-
3. The names of its contributors may not be used to endorse or promote
143-
products derived from this software without specific prior written
143+
3. The names of its contributors may not be used to endorse or promote
144+
products derived from this software without specific prior written
144145
permission.
145146

146147
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -261,26 +262,26 @@ SUCH DAMAGE.
261262

262263
12. libxmlrpc ext/xmlrpc
263264

264-
Copyright 2000 Epinions, Inc.
265+
Copyright 2000 Epinions, Inc.
265266

266-
Subject to the following 3 conditions, Epinions, Inc. permits you, free
267-
of charge, to (a) use, copy, distribute, modify, perform and display this
268-
software and associated documentation files (the "Software"), and (b)
269-
permit others to whom the Software is furnished to do so as well.
267+
Subject to the following 3 conditions, Epinions, Inc. permits you, free
268+
of charge, to (a) use, copy, distribute, modify, perform and display this
269+
software and associated documentation files (the "Software"), and (b)
270+
permit others to whom the Software is furnished to do so as well.
270271

271-
1) The above copyright notice and this permission notice shall be included
272-
without modification in all copies or substantial portions of the
273-
Software.
272+
1) The above copyright notice and this permission notice shall be included
273+
without modification in all copies or substantial portions of the
274+
Software.
274275

275-
2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
276-
ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
277-
IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
278-
PURPOSE OR NONINFRINGEMENT.
276+
2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
277+
ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
278+
IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
279+
PURPOSE OR NONINFRINGEMENT.
279280

280-
3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
281-
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
282-
OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
283-
NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
281+
3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
282+
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
283+
OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
284+
NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
284285
DAMAGES.
285286

286287
13. libzip ext/zip
@@ -415,3 +416,30 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
415416
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
416417
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
417418

419+
18. ext/phar portions of tar implementations
420+
421+
portions of tar implementations in ext/phar - phar_tar_octal() are based on an
422+
implementation by Tim Kientzle from libarchive, licensed with this license:
423+
424+
Copyright (c) 2003-2007 Tim Kientzle
425+
All rights reserved.
426+
427+
Redistribution and use in source and binary forms, with or without
428+
modification, are permitted provided that the following conditions
429+
are met:
430+
1. Redistributions of source code must retain the above copyright
431+
notice, this list of conditions and the following disclaimer.
432+
2. Redistributions in binary form must reproduce the above copyright
433+
notice, this list of conditions and the following disclaimer in the
434+
documentation and/or other materials provided with the distribution.
435+
436+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
437+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
438+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
439+
IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
440+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
441+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
442+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
443+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
444+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
445+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ext/phar/LICENSE

-95
This file was deleted.

0 commit comments

Comments
 (0)