From e12ff891366cf94db4bfe4c2c810b26a5531053d Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 26 Sep 2019 16:19:22 +0000 Subject: [PATCH] Further normalize copyright notices - s/C/c/ where I've been inconsistent about it - +SPDX tags - Remove "All rights reserved" where possible Requested by: rgrimes (all rights reserved) --- lib/libc/sys/shm_open.c | 1 - lib/libregex/tests/libregex_test.sh | 3 ++- stand/lua/config.lua | 2 +- stand/lua/menu.lua | 2 +- stand/lua/password.lua | 2 +- tests/sys/kern/memfd_test.c | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/shm_open.c b/lib/libc/sys/shm_open.c index 2c91eb2c8e1e..03c98a0c8421 100644 --- a/lib/libc/sys/shm_open.c +++ b/lib/libc/sys/shm_open.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2019 Kyle Evans - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libregex/tests/libregex_test.sh b/lib/libregex/tests/libregex_test.sh index 071f407cdb10..9e41db67e10b 100755 --- a/lib/libregex/tests/libregex_test.sh +++ b/lib/libregex/tests/libregex_test.sh @@ -1,6 +1,7 @@ # +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# # Copyright (c) 2017 Kyle Evans -# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/stand/lua/config.lua b/stand/lua/config.lua index c3f79314b20c..873e778810b1 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -2,7 +2,7 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2015 Pedro Souza --- Copyright (C) 2018 Kyle Evans +-- Copyright (c) 2018 Kyle Evans -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 51098844e87e..e8d9b91b6a54 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -2,7 +2,7 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2015 Pedro Souza --- Copyright (C) 2018 Kyle Evans +-- Copyright (c) 2018 Kyle Evans -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without diff --git a/stand/lua/password.lua b/stand/lua/password.lua index 8042a5d3d0b5..8edd4edd7ec3 100644 --- a/stand/lua/password.lua +++ b/stand/lua/password.lua @@ -2,7 +2,7 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2015 Pedro Souza --- Copyright (C) 2018 Kyle Evans +-- Copyright (c) 2018 Kyle Evans -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without diff --git a/tests/sys/kern/memfd_test.c b/tests/sys/kern/memfd_test.c index 6b48ab85bd60..6ab4c2a14258 100644 --- a/tests/sys/kern/memfd_test.c +++ b/tests/sys/kern/memfd_test.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2019 Kyle Evans - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions