Skip to content

Commit b391199

Browse files
authored
[3.12] gh-46968: Fix invalid reference to Sound eXchange (SoX) 12.17.7 license (#115094)
Fix invalid reference to Sound eXchange (SoX) 12.17.7 license
1 parent 5e64828 commit b391199

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
@@ -1045,29 +1045,32 @@ https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the
10451045
Audioop
10461046
-------
10471047

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

10721075

10731076
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-
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)