From 57ef3b4df9f0c07449bf0191cf6f8f70bcedf8be Mon Sep 17 00:00:00 2001 From: Andreea Florescu Date: Thu, 11 Aug 2022 10:51:42 +0300 Subject: [PATCH] update license to BSD-3-Clause As per the discussion in: https://github.com/rust-vmm/vmm-sys-util/issues/161 Signed-off-by: Andreea Florescu --- Cargo.toml | 2 +- LICENSE-APACHE | 201 ------------------------------------- README.md | 3 +- src/errno.rs | 2 +- src/fam.rs | 2 +- src/lib.rs | 2 +- src/linux/aio.rs | 2 +- src/linux/epoll.rs | 2 +- src/linux/eventfd.rs | 2 +- src/linux/fallocate.rs | 2 +- src/linux/ioctl.rs | 2 +- src/linux/mod.rs | 3 + src/linux/poll.rs | 2 +- src/linux/seek_hole.rs | 2 +- src/linux/signal.rs | 2 +- src/linux/sock_ctrl_msg.rs | 1 + src/linux/timerfd.rs | 2 +- src/linux/write_zeroes.rs | 2 +- src/metric.rs | 2 +- src/rand.rs | 2 +- src/syscall.rs | 2 +- src/unix/file_traits.rs | 2 +- src/unix/mod.rs | 2 + src/unix/tempdir.rs | 2 +- src/unix/terminal.rs | 2 +- 25 files changed, 27 insertions(+), 223 deletions(-) delete mode 100644 LICENSE-APACHE diff --git a/Cargo.toml b/Cargo.toml index 4a858fe..0af1fb9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/rust-vmm/vmm-sys-util" readme = "README.md" keywords = ["utils"] edition = "2018" -license = "Apache-2.0 AND BSD-3-Clause" +license = "BSD-3-Clause" [features] with-serde = ["serde", "serde_derive"] diff --git a/LICENSE-APACHE b/LICENSE-APACHE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE-APACHE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index c900f30..293a11a 100644 --- a/README.md +++ b/README.md @@ -21,5 +21,4 @@ with files, event file descriptors, ioctls and others. ## License -This code is licensed under [Apache-2.0](LICENSE-APACHE) and -[BSD-3-Clause](LICENSE-BSD-3-Clause). +This code is licensed under [BSD-3-Clause](LICENSE-BSD-3-Clause). diff --git a/src/errno.rs b/src/errno.rs index 57f684a..b4a7792 100644 --- a/src/errno.rs +++ b/src/errno.rs @@ -4,7 +4,7 @@ // // Portions Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Structures, helpers, and type definitions for working with //! [`errno`](http://man7.org/linux/man-pages/man3/errno.3.html). diff --git a/src/fam.rs b/src/fam.rs index 6030b77..d6cf76e 100644 --- a/src/fam.rs +++ b/src/fam.rs @@ -2,7 +2,7 @@ // // Portions Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Trait and wrapper for working with C defined FAM structures. //! diff --git a/src/lib.rs b/src/lib.rs index 72b9d3d..1929816 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2019 Intel Corporation. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: BSD-3-Clause //! Collection of modules that provides helpers and utilities used by multiple //! [rust-vmm](https://github.com/rust-vmm/community) components. diff --git a/src/linux/aio.rs b/src/linux/aio.rs index 444c751..cd5e0f1 100644 --- a/src/linux/aio.rs +++ b/src/linux/aio.rs @@ -1,5 +1,5 @@ // Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: BSD-3-Clause //! Safe wrapper over [`Linux AIO`](http://man7.org/linux/man-pages/man7/aio.7.html). diff --git a/src/linux/epoll.rs b/src/linux/epoll.rs index 4634a93..83cc8b9 100644 --- a/src/linux/epoll.rs +++ b/src/linux/epoll.rs @@ -1,5 +1,5 @@ // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: BSD-3-Clause //! Safe wrappers over the //! [`epoll`](http://man7.org/linux/man-pages/man7/epoll.7.html) API. diff --git a/src/linux/eventfd.rs b/src/linux/eventfd.rs index e01c98b..3606b3c 100644 --- a/src/linux/eventfd.rs +++ b/src/linux/eventfd.rs @@ -2,7 +2,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Structure and wrapper functions for working with //! [`eventfd`](http://man7.org/linux/man-pages/man2/eventfd.2.html). diff --git a/src/linux/fallocate.rs b/src/linux/fallocate.rs index 17538bf..4040b7c 100644 --- a/src/linux/fallocate.rs +++ b/src/linux/fallocate.rs @@ -2,7 +2,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Enum and function for dealing with an allocated disk space //! by [`fallocate`](http://man7.org/linux/man-pages/man2/fallocate.2.html). diff --git a/src/linux/ioctl.rs b/src/linux/ioctl.rs index eb8bf30..a1e29d5 100644 --- a/src/linux/ioctl.rs +++ b/src/linux/ioctl.rs @@ -4,7 +4,7 @@ // // Portions Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Macros and functions for working with //! [`ioctl`](http://man7.org/linux/man-pages/man2/ioctl.2.html). diff --git a/src/linux/mod.rs b/src/linux/mod.rs index 0fecb32..daf86f5 100644 --- a/src/linux/mod.rs +++ b/src/linux/mod.rs @@ -1,3 +1,6 @@ +// Copyright 2022 rust-vmm Authors or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: BSD-3-Clause + #[macro_use] pub mod ioctl; pub mod aio; diff --git a/src/linux/poll.rs b/src/linux/poll.rs index d077cf8..be5235c 100644 --- a/src/linux/poll.rs +++ b/src/linux/poll.rs @@ -2,7 +2,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Traits and structures for working with //! [`epoll`](http://man7.org/linux/man-pages/man7/epoll.7.html) diff --git a/src/linux/seek_hole.rs b/src/linux/seek_hole.rs index 42c3a7b..87bd325 100644 --- a/src/linux/seek_hole.rs +++ b/src/linux/seek_hole.rs @@ -2,7 +2,7 @@ // // Copyright 2018 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Traits and implementations over [lseek64](https://linux.die.net/man/3/lseek64). diff --git a/src/linux/signal.rs b/src/linux/signal.rs index 81adaea..5e1e28e 100644 --- a/src/linux/signal.rs +++ b/src/linux/signal.rs @@ -4,7 +4,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Enums, traits and functions for working with //! [`signal`](http://man7.org/linux/man-pages/man7/signal.7.html). diff --git a/src/linux/sock_ctrl_msg.rs b/src/linux/sock_ctrl_msg.rs index 47c0475..2c97c96 100644 --- a/src/linux/sock_ctrl_msg.rs +++ b/src/linux/sock_ctrl_msg.rs @@ -1,6 +1,7 @@ // Copyright 2017 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-BSD-3-Clause file. +// SPDX-License-Identifier: BSD-3-Clause /* Copied from the crosvm Project, commit 186eb8b */ diff --git a/src/linux/timerfd.rs b/src/linux/timerfd.rs index 629e1ac..691b994 100644 --- a/src/linux/timerfd.rs +++ b/src/linux/timerfd.rs @@ -2,7 +2,7 @@ // // Copyright 2018 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Structure and functions for working with //! [`timerfd`](http://man7.org/linux/man-pages/man2/timerfd_create.2.html). diff --git a/src/linux/write_zeroes.rs b/src/linux/write_zeroes.rs index 6b11986..e6084da 100644 --- a/src/linux/write_zeroes.rs +++ b/src/linux/write_zeroes.rs @@ -4,7 +4,7 @@ // // Copyright 2018 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Traits for replacing a range with a hole and writing zeroes in a file. diff --git a/src/metric.rs b/src/metric.rs index 2183c3d..c728161 100644 --- a/src/metric.rs +++ b/src/metric.rs @@ -1,5 +1,5 @@ // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: BSD-3-Clause //! The purpose of this module is to provide abstractions for working with //! metrics in the context of rust-vmm components where there is a strong need //! to have metrics as an optional feature. diff --git a/src/rand.rs b/src/rand.rs index 6b759ff..91c5215 100644 --- a/src/rand.rs +++ b/src/rand.rs @@ -1,5 +1,5 @@ // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: BSD-3-Clause //! Miscellaneous functions related to getting (pseudo) random numbers and //! strings. diff --git a/src/syscall.rs b/src/syscall.rs index e515717..6fb4d64 100644 --- a/src/syscall.rs +++ b/src/syscall.rs @@ -1,5 +1,5 @@ // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: BSD-3-Clause //! Wrapper for interpreting syscall exit codes. diff --git a/src/unix/file_traits.rs b/src/unix/file_traits.rs index a139f8b..ce9fa29 100644 --- a/src/unix/file_traits.rs +++ b/src/unix/file_traits.rs @@ -2,7 +2,7 @@ // // Copyright 2018 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Traits for handling file synchronization and length. diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 3c99d2c..5c26a9c 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -1,3 +1,5 @@ +// Copyright 2022 rust-vmm Authors or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: BSD-3-Clause pub mod file_traits; pub mod tempdir; pub mod terminal; diff --git a/src/unix/tempdir.rs b/src/unix/tempdir.rs index d265039..2ef6b2c 100644 --- a/src/unix/tempdir.rs +++ b/src/unix/tempdir.rs @@ -2,7 +2,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Structure for handling temporary directories. use std::env::temp_dir; diff --git a/src/unix/terminal.rs b/src/unix/terminal.rs index 9a11ec2..2fdcd08 100644 --- a/src/unix/terminal.rs +++ b/src/unix/terminal.rs @@ -4,7 +4,7 @@ // // Copyright 2017 The Chromium OS Authors. All rights reserved. // -// SPDX-License-Identifier: (Apache-2.0 AND BSD-3-Clause) +// SPDX-License-Identifier: BSD-3-Clause //! Trait for working with [`termios`](http://man7.org/linux/man-pages/man3/termios.3.html).