From b2bd77b9bc805b8440cf52af227292180cee8487 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Thu, 1 Jun 2023 03:32:33 +0200 Subject: Relicense some files as GPL-3.0-or-later Signed-off-by: Alejandro Colomar --- lib/alloc.h | 5 ++--- lib/bit.h | 5 ++--- lib/mempcpy.h | 5 ++--- lib/stpecpy.h | 5 ++--- lib/stpeprintf.h | 5 ++--- libmisc/agetpass.c | 5 ++--- libmisc/bit.c | 5 ++--- libmisc/csrand.c | 5 ++--- libmisc/date_to_str.c | 27 ++------------------------- libmisc/mempcpy.c | 5 ++--- libmisc/stpecpy.c | 5 ++--- libmisc/stpeprintf.c | 5 ++--- 12 files changed, 24 insertions(+), 58 deletions(-) diff --git a/lib/alloc.h b/lib/alloc.h index dddb7a08..398cfb17 100644 --- a/lib/alloc.h +++ b/lib/alloc.h @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/lib/bit.h b/lib/bit.h index 7f09eb4d..44360b71 100644 --- a/lib/bit.h +++ b/lib/bit.h @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/lib/mempcpy.h b/lib/mempcpy.h index 528b976a..53404dfa 100644 --- a/lib/mempcpy.h +++ b/lib/mempcpy.h @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/lib/stpecpy.h b/lib/stpecpy.h index e2c2f479..57260d74 100644 --- a/lib/stpecpy.h +++ b/lib/stpecpy.h @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/lib/stpeprintf.h b/lib/stpeprintf.h index 4929019a..4ff73ac4 100644 --- a/lib/stpeprintf.h +++ b/lib/stpeprintf.h @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/libmisc/agetpass.c b/libmisc/agetpass.c index 1ff9d63b..e6931f64 100644 --- a/libmisc/agetpass.c +++ b/libmisc/agetpass.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/libmisc/bit.c b/libmisc/bit.c index 1ffc6dc9..d8d9c6f7 100644 --- a/libmisc/bit.c +++ b/libmisc/bit.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/libmisc/csrand.c b/libmisc/csrand.c index 2557fac8..32df37d7 100644 --- a/libmisc/csrand.c +++ b/libmisc/csrand.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ #include diff --git a/libmisc/date_to_str.c b/libmisc/date_to_str.c index 67b99317..a3a65af5 100644 --- a/libmisc/date_to_str.c +++ b/libmisc/date_to_str.c @@ -1,29 +1,6 @@ /* - * Copyright (c) 2021, Alejandro Colomar - * - * 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. The name of the copyright holders or contributors may not 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 - * HOLDERS 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. + * SPDX-FileCopyrightText: 2021, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ #include diff --git a/libmisc/mempcpy.c b/libmisc/mempcpy.c index 14a09613..f4290594 100644 --- a/libmisc/mempcpy.c +++ b/libmisc/mempcpy.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/libmisc/stpecpy.c b/libmisc/stpecpy.c index faa02d69..1d9d4500 100644 --- a/libmisc/stpecpy.c +++ b/libmisc/stpecpy.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ diff --git a/libmisc/stpeprintf.c b/libmisc/stpeprintf.c index f3238eaf..c5bdd7fe 100644 --- a/libmisc/stpeprintf.c +++ b/libmisc/stpeprintf.c @@ -1,7 +1,6 @@ /* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar + * SPDX-License-Identifier: GPL-3.0-or-later */ -- cgit v1.2.3