From 78b77912a1a02592445698ccbec48028852cd535 Mon Sep 17 00:00:00 2001 From: Dongsun Lee Date: Wed, 16 Oct 2024 14:29:13 +0900 Subject: Fixing License Announcement - Change LGPL-2.1-or-later to LGPL-2.1+ - Change LicenseRef-Fedora-Public-Domain to PD - Remove BSD-2-Clause-FreeBSD, 0BSD, and CC0-1.0 - Add COPYING.BSD-2-Clause and COPYING.BSD-3-Clause file Change-Id: I5e7afb9eb2948e496e3172d04e0ac1068c06baf3 --- COPYING.BSD-2-Clause | 32 ++++++++++++++++++++++++++++++++ COPYING.BSD-3-Clause | 36 ++++++++++++++++++++++++++++++++++++ packaging/libxcrypt.spec | 5 ++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 COPYING.BSD-2-Clause create mode 100644 COPYING.BSD-3-Clause diff --git a/COPYING.BSD-2-Clause b/COPYING.BSD-2-Clause new file mode 100644 index 0000000..da366e2 --- /dev/null +++ b/COPYING.BSD-2-Clause @@ -0,0 +1,32 @@ +Valid-License-Identifier: BSD-2-Clause +SPDX-URL: https://spdx.org/licenses/BSD-2-Clause.html +Usage-Guide: + To use the BSD 2-clause "Simplified" License put the following SPDX + tag/value pair into a comment according to the placement guidelines in + the licensing rules documentation: + SPDX-License-Identifier: BSD-2-Clause +License-Text: + +Copyright (c) . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/COPYING.BSD-3-Clause b/COPYING.BSD-3-Clause new file mode 100644 index 0000000..34c7f05 --- /dev/null +++ b/COPYING.BSD-3-Clause @@ -0,0 +1,36 @@ +Valid-License-Identifier: BSD-3-Clause +SPDX-URL: https://spdx.org/licenses/BSD-3-Clause.html +Usage-Guide: + To use the BSD 3-clause "New" or "Revised" License put the following SPDX + tag/value pair into a comment according to the placement guidelines in + the licensing rules documentation: + SPDX-License-Identifier: BSD-3-Clause +License-Text: + +Copyright (c) . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/packaging/libxcrypt.spec b/packaging/libxcrypt.spec index 2819c2c..3dcebe1 100644 --- a/packaging/libxcrypt.spec +++ b/packaging/libxcrypt.spec @@ -7,7 +7,7 @@ Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and other # For explicit license breakdown, see the # LICENSING file in the source tarball. -License: LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause AND BSD-2-Clause-FreeBSD AND 0BSD AND CC0-1.0 AND LicenseRef-Fedora-Public-Domain +License: LGPL-2.1+ AND BSD-3-Clause AND BSD-2-Clause AND BSD-2-Clause AND PD URL: https://github.com/besser82/%{name} Source0: %{name}-%{version}.tar.bz2 @@ -83,6 +83,9 @@ discouraged. %postun -p /sbin/ldconfig %files +%license COPYING.LIB +%license COPYING.BSD-2-Clause +%license COPYING.BSD-3-Clause %{_libdir}/libcrypt.so.* %{_libdir}/libowcrypt.so.* %{_mandir}/man5/crypt.5* -- cgit v1.2.3