authorbors <bors@rust-lang.org> 2024-11-25 05:31:12 UTC
committerbors <bors@rust-lang.org> 2024-11-25 05:31:12 UTC
log67a8c642592f86eaf3b84030c04e0305d79953d1
tree910a5c9ac2254cbf6fb4b8d9ec50f6babe7fe31b
parent28fc2ba7142654fa6e654926f96ff913027b200e
parent6d2a3e9786ec43a0e0af20386e7046328296ac86

Auto merge of #133236 - dtolnay:unicodelicense, r=Mark-Simulacrum

Synchronize Unicode license text from unicode.org The text of <https://unicode.org/license.txt> was swapped out from "UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE" to "UNICODE LICENSE V3" between the dates of [2023.06.03](https://web.archive.org/web/20230603182532/https://www.unicode.org/license.txt) and [2023.09.11](https://web.archive.org/web/20230911222703/https://www.unicode.org/license.txt), which means between Unicode 15.0.0 ([2022.09.13](https://unicode.org/versions/Unicode15.0.0/)) and Unicode 15.1.0 ([2023.09.12](https://unicode.org/versions/Unicode15.1.0/)). A license wording change is not mentioned in the 15.1.0 [release summary](https://www.unicode.org/versions/Unicode15.1.0/) or [announcement post](http://blog.unicode.org/2023/09/announcing-unicode-standard-version-151.html). But I guess we are intended to infer that data files from Unicode 15.1.0 should be specified as licensed [Unicode-3.0](https://spdx.org/licenses/Unicode-3.0.html) as opposed to [Unicode-DFS-2016](https://spdx.org/licenses/Unicode-DFS-2016.html). The Rust standard library has been using Unicode 15.1.0+ since https://github.com/rust-lang/rust/pull/120777.

4 files changed, 77 insertions(+), 67 deletions(-)

COPYRIGHT+36-43
......@@ -343,49 +343,42 @@ their own copyright notices and license terms:
343343* Portions of internationalization code use code or data from Unicode, which
344344 carry the following license:
345345
346 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
347
348 See Terms of Use <https://www.unicode.org/copyright.html>
349 for definitions of Unicode Inc.’s Data Files and Software.
350
351 NOTICE TO USER: Carefully read the following legal agreement.
352 BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
353 DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
354 YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355 TERMS AND CONDITIONS OF THIS AGREEMENT.
356 IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
357 THE DATA FILES OR SOFTWARE.
346 UNICODE LICENSE V3
358347
359348 COPYRIGHT AND PERMISSION NOTICE
360349
361 Copyright © 1991-2022 Unicode, Inc. All rights reserved.
362 Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
363
364 Permission is hereby granted, free of charge, to any person obtaining
365 a copy of the Unicode data files and any associated documentation
366 (the "Data Files") or Unicode software and any associated documentation
367 (the "Software") to deal in the Data Files or Software
368 without restriction, including without limitation the rights to use,
369 copy, modify, merge, publish, distribute, and/or sell copies of
370 the Data Files or Software, and to permit persons to whom the Data Files
371 or Software are furnished to do so, provided that either
372 (a) this copyright and permission notice appear with all copies
373 of the Data Files or Software, or
374 (b) this copyright and permission notice appear in associated
375 Documentation.
376
377 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
378 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
379 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
380 NONINFRINGEMENT OF THIRD PARTY RIGHTS.
381 IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
382 NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
383 DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
384 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
385 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
386 PERFORMANCE OF THE DATA FILES OR SOFTWARE.
387
388 Except as contained in this notice, the name of a copyright holder
389 shall not be used in advertising or otherwise to promote the sale,
390 use or other dealings in these Data Files or Software without prior
391 written authorization of the copyright holder.
350 Copyright © 1991-2024 Unicode, Inc.
351
352 NOTICE TO USER: Carefully read the following legal agreement. BY
353 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
354 SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355 TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
356 DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
357
358 Permission is hereby granted, free of charge, to any person obtaining a
359 copy of data files and any associated documentation (the "Data Files") or
360 software and any associated documentation (the "Software") to deal in the
361 Data Files or Software without restriction, including without limitation
362 the rights to use, copy, modify, merge, publish, distribute, and/or sell
363 copies of the Data Files or Software, and to permit persons to whom the
364 Data Files or Software are furnished to do so, provided that either (a)
365 this copyright and permission notice appear with all copies of the Data
366 Files or Software, or (b) this copyright and permission notice appear in
367 associated Documentation.
368
369 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
370 KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
371 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
372 THIRD PARTY RIGHTS.
373
374 IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
375 BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
376 OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
377 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
378 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
379 FILES OR SOFTWARE.
380
381 Except as contained in this notice, the name of a copyright holder shall
382 not be used in advertising or otherwise to promote the sale, use or other
383 dealings in these Data Files or Software without prior written
384 authorization of the copyright holder.
LICENSES/Unicode-3.0.txt created+39
......@@ -0,0 +1,39 @@
1UNICODE LICENSE V3
2
3COPYRIGHT AND PERMISSION NOTICE
4
5Copyright © 1991-2024 Unicode, Inc.
6
7NOTICE TO USER: Carefully read the following legal agreement. BY
8DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
9SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
10TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
11DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
12
13Permission is hereby granted, free of charge, to any person obtaining a
14copy of data files and any associated documentation (the "Data Files") or
15software and any associated documentation (the "Software") to deal in the
16Data Files or Software without restriction, including without limitation
17the rights to use, copy, modify, merge, publish, distribute, and/or sell
18copies of the Data Files or Software, and to permit persons to whom the
19Data Files or Software are furnished to do so, provided that either (a)
20this copyright and permission notice appear with all copies of the Data
21Files or Software, or (b) this copyright and permission notice appear in
22associated Documentation.
23
24THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
25KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
27THIRD PARTY RIGHTS.
28
29IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
30BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
31OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
32WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
33ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
34FILES OR SOFTWARE.
35
36Except as contained in this notice, the name of a copyright holder shall
37not be used in advertising or otherwise to promote the sale, use or other
38dealings in these Data Files or Software without prior written
39authorization of the copyright holder.
LICENSES/Unicode-DFS-2016.txt deleted-22
......@@ -1,22 +0,0 @@
1UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
2
3Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
4
5Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
6
7Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
8
9NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
10
11COPYRIGHT AND PERMISSION NOTICE
12
13Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
14
15Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that either
16
17 (a) this copyright and permission notice appear with all copies of the Data Files or Software, or
18 (b) this copyright and permission notice appear in associated Documentation.
19
20THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
21
22Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
REUSE.toml+2-2
......@@ -63,8 +63,8 @@ SPDX-License-Identifier = "Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR MIT
6363[[annotations]]
6464path = "library/core/src/unicode/unicode_data.rs"
6565precedence = "override"
66SPDX-FileCopyrightText = "1991-2022 Unicode, Inc. All rights reserved."
67SPDX-License-Identifier = "Unicode-DFS-2016"
66SPDX-FileCopyrightText = "1991-2024 Unicode, Inc."
67SPDX-License-Identifier = "Unicode-3.0"
6868
6969[[annotations]]
7070path = "library/std/src/sync/mpmc/**"