8000 [3.11] gh-46968: Fix invalid reference to Sound eXchange (SoX) 12.17.… · python/cpython@350d1d0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 350d1d0

Browse files
miss-islingtonambv
miss-islington
and
ambv
authored
[3.11] gh-46968: Fix invalid reference to Sound eXchange (SoX) 12.17.7 license (GH-115094) (GH-115095)
(cherry picked from commit b391199) Co-authored-by: Łukasz Langa <lukasz@langa.pl>
1 parent b5a6793 commit 350d1d0

File tree

2 files changed

+48
-47
lines changed

2 files changed

+48
-47
lines changed

‎Doc/license.rst

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,29 +1041,32 @@ https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the
10411041
Audioop
10421042
-------
10431043

1044-
The audioop module uses the code base in g771.c file of the SoX project::
1045-
1046-
Programming the AdLib/Sound Blaster
1047-
FM Music Chips
1048-
Version 2.0 (24 Feb 1992)
1049-
Copyright (c) 1991, 1992 by Jeffrey S. Lee
1050-
jlee@smylex.uucp
1051-
Warranty and Copyright Policy
1052-
This document is provided on an "as-is" basis, and its author makes
1053-
no warranty or representation, express or implied, with respect to
1054-
its quality performance or fitness for a particular purpose. In no
1055-
event will the author of this document be liable for direct, indirect,
1056-
special, incidental, or consequential damages arising out of the use
1057-
or inability to use the information contained within. Use of this
1058-
document is at your own risk.
1059-
This file may be used and copied freely so long as the applicable
1060-
copyright notices are retained, and no modifications are made to the
1061-
text of the document. No money shall be charged for its distribution
1062-
beyond reasonable shipping, handling and duplication costs, nor shall
1063-
proprietary changes be made to this document so that it cannot be
1064-
distributed freely. This document may not be included in published
1065-
material or commercial packages without the written consent of its
1066-
author.
1044+
The audioop module uses the code base in g771.c file of the SoX project.
1045+
https://sourceforge.net/projects/sox/files/sox/12.17.7/sox-12.17.7.tar.gz
1046+
1047+
This source code is a product of Sun Microsystems, Inc. and is provided
1048+
for unrestricted use. Users may copy or modify this source code without
1049+
charge.
1050+
1051+
SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
1052+
THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
1053+
PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
1054+
1055+
Sun source code is provided with no support and without any obligation on
1056+
the part of Sun Microsystems, Inc. to assist in its use, correction,
1057+
modification or enhancement.
1058+
1059+
SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
1060+
INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
1061+
OR ANY PART THEREOF.
1062+
1063+
In no event will Sun Microsystems, Inc. be liable for any lost revenue
1064+
or profits or other special, indirect and consequential damages, even if
1065+
Sun has been advised of the possibility of such damages.
1066+
1067+
Sun Microsystems, Inc.
1068+
2550 Garcia Avenue
1069+
Mountain View, California 94043
10671070

10681071

10691072
asyncio

‎Modules/audioop.c

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
/* The audioop module uses the code base in g777.c file of the Sox project.
2-
* Source: https://web.archive.org/web/19970716121258/http://www.spies.com/Sox/Archive/soxgamma.tar.gz
3-
* Programming the AdLib/Sound Blaster
4-
* FM Music Chips
5-
* Version 2.0 (24 Feb 1992)
6-
*
7-
* Copyright (c) 1991, 1992 by Jeffrey S. Lee
8-
*
9-
* jlee@smylex.uucp
2+
Source: https://sourceforge.net/projects/sox/files/sox/12.17.7/sox-12.17.7.tar.gz
3+
4+
Copyright of g771.c:
5+
6+
* This source code is a product of Sun Microsystems, Inc. and is provided
7+
* for unrestricted use. Users may copy or modify this source code without
8+
* charge.
109
*
10+
* SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
11+
* THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
12+
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
1113
*
14+
* Sun source code is provided with no support and without any obligation on
15+
* the part of Sun Microsystems, Inc. to assist in its use, correction,
16+
* modification or enhancement.
1217
*
13-
* Warranty and Copyright Policy
18+
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
19+
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
20+
* OR ANY PART THEREOF.
1421
*
15-
* This document is provided on an "as-is" basis, and its author makes
16-
* no warranty or representation, express or implied, with respect to
17-
* its quality performance or fitness for a particular purpose. In no
18-
* event will the author of this document be liable for direct, indirect,
19-
* special, incidental, or consequential damages arising out of the use
20-
* or inability to use the information contained within. Use of this
21-
* document is at your own risk.
22+
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
23+
* or profits or other special, indirect and consequential damages, even if
24+
* Sun has been advised of the possibility of such damages.
2225
*
23-
* This file may be used and copied freely so long as the applicable
24-
* copyright notices are retained, and no modifications are made to the
25-
* text of the document. No money shall be charged for its distribution
26-
* beyond reasonable shipping, handling and duplication costs, nor shall
27-
* proprietary changes be made to this document so that it cannot be
28-
* distributed freely. This document may not be included in published
29-
* material or commercial packages without the written consent of its
30-
* author. */
26+
* Sun Microsystems, Inc.
27+
* 2550 Garcia Avenue
28+
* Mountain View, California 94043 */
3129

3230
/* audioopmodule - Module to detect peak values in arrays */
3331

0 commit comments

Comments
 (0)
0