diff options
| author | Warner Losh <imp@FreeBSD.org> | 2023-05-10 15:40:58 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-05-12 16:44:03 +0000 |
| commit | 4d846d260e2b9a3d4d0a701462568268cbfe7a5b (patch) | |
| tree | e06136ddd235d1b7d34c2926249174a5840ad842 /libexec | |
| parent | 2b519b170709b9c2bb9f66641737d1d80a5d2538 (diff) | |
| download | src-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.tar.gz src-4d846d260e2b9a3d4d0a701462568268cbfe7a5b.zip | |
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD
The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.
Discussed with: pfg
MFC After: 3 days
Sponsored by: Netflix
Diffstat (limited to 'libexec')
39 files changed, 39 insertions, 39 deletions
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h index 15e163e027bc..f0ae6b45e868 100644 --- a/libexec/atrun/gloadavg.h +++ b/libexec/atrun/gloadavg.h @@ -2,7 +2,7 @@ * gloadavg.h - header for atrun(8) * Copyright (C) 1993 Thomas Koenig * - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/libexec/phttpget/phttpget.c b/libexec/phttpget/phttpget.c index 17935b122535..714f609d1fac 100644 --- a/libexec/phttpget/phttpget.c +++ b/libexec/phttpget/phttpget.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2005 Colin Percival * All rights reserved diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c index 5e56af7522e1..3ff845ce9757 100644 --- a/libexec/pppoed/pppoed.c +++ b/libexec/pppoed/pppoed.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999-2001 Brian Somers <brian@Awfulhak.org> * All rights reserved. diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index 0ca790e39a14..90306de9a8a7 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -1,7 +1,7 @@ # # Copyright 2022 Mateusz Piotrowski <0mp@FreeBSD.org> # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index c9a2734853b6..b92d89028d4e 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996, 1997, 1998, 1999 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h index e37301b8174a..8fcd9f225974 100644 --- a/libexec/rtld-elf/amd64/rtld_machdep.h +++ b/libexec/rtld-elf/amd64/rtld_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h index e4d68c360363..2c6eb67f8269 100644 --- a/libexec/rtld-elf/arm/rtld_machdep.h +++ b/libexec/rtld-elf/arm/rtld_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c index 20a47b2725bd..3aff42a557c9 100644 --- a/libexec/rtld-elf/debug.c +++ b/libexec/rtld-elf/debug.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996-1998 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h index 4dcefbabdb45..95c06c7babc3 100644 --- a/libexec/rtld-elf/debug.h +++ b/libexec/rtld-elf/debug.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996-1998 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index b9c16e2cd154..ae0a256e4033 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996, 1997, 1998, 1999 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h index 9d62bc26eb5b..b895eba6c06f 100644 --- a/libexec/rtld-elf/i386/rtld_machdep.h +++ b/libexec/rtld-elf/i386/rtld_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index 1ca5fc16477a..ff4bd513ee59 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996-1998 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h index 44298ec2a127..72de70accbda 100644 --- a/libexec/rtld-elf/powerpc/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc/rtld_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/powerpc64/rtld_machdep.h b/libexec/rtld-elf/powerpc64/rtld_machdep.h index 67c4810da93b..d686ec6e8b20 100644 --- a/libexec/rtld-elf/powerpc64/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc64/rtld_machdep.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ea56ade960d9..2b833e350e5a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra. * Copyright 2003 Alexander Kabaev <kan@FreeBSD.ORG>. diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 2db73c767502..bb5119bfb744 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index 9da8a8daccf9..10473618f787 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1999, 2000 John D. Polstra. * All rights reserved. diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h index c88b558b72b8..39277bc7c155 100644 --- a/libexec/rtld-elf/rtld_lock.h +++ b/libexec/rtld-elf/rtld_lock.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2003 Alexander Kabaev. * All rights reserved. diff --git a/libexec/rtld-elf/rtld_malloc.h b/libexec/rtld-elf/rtld_malloc.h index a8eb25272a57..961595685f07 100644 --- a/libexec/rtld-elf/rtld_malloc.h +++ b/libexec/rtld-elf/rtld_malloc.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 The FreeBSD Foundation * All rights reserved. diff --git a/libexec/rtld-elf/rtld_printf.h b/libexec/rtld-elf/rtld_printf.h index e2fac948dc53..a9e808062ab5 100644 --- a/libexec/rtld-elf/rtld_printf.h +++ b/libexec/rtld-elf/rtld_printf.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2011 Konstantin Belousov <kib@FreeBSD.org>. * All rights reserved. diff --git a/libexec/rtld-elf/rtld_tls.h b/libexec/rtld-elf/rtld_tls.h index e150ad7f2613..b7dedc3fdfee 100644 --- a/libexec/rtld-elf/rtld_tls.h +++ b/libexec/rtld-elf/rtld_tls.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Doug Rabson * All rights reserved. diff --git a/libexec/rtld-elf/tests/common.c b/libexec/rtld-elf/tests/common.c index 82dd5180b582..8af7892e3044 100644 --- a/libexec/rtld-elf/tests/common.c +++ b/libexec/rtld-elf/tests/common.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * Copyright 2014 Jonathan Anderson. * Copyright 2021 Mariusz Zaborski <oshogbo@FreeBSD.org> * diff --git a/libexec/rtld-elf/tests/common.h b/libexec/rtld-elf/tests/common.h index 12a9eec36eb5..91835021581a 100644 --- a/libexec/rtld-elf/tests/common.h +++ b/libexec/rtld-elf/tests/common.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * Copyright 2014 Jonathan Anderson. * Copyright 2021 Mariusz Zaborski <oshogbo@vexillium.org> * diff --git a/libexec/rtld-elf/tests/ld_preload_fds.c b/libexec/rtld-elf/tests/ld_preload_fds.c index 99378b549de5..64e1c6b84806 100644 --- a/libexec/rtld-elf/tests/ld_preload_fds.c +++ b/libexec/rtld-elf/tests/ld_preload_fds.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * Copyright 2021 Mariusz Zaborski <oshogbo@FreeBSD.org> * * Redistribution and use in source and binary forms, with or without diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c index 1ee3e1c3a74f..8d00fe78926d 100644 --- a/libexec/rtld-elf/xmalloc.c +++ b/libexec/rtld-elf/xmalloc.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 1996-1998 John D. Polstra. * All rights reserved. diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh index 00a0ab04e7d3..9b2f14148cc5 100755 --- a/libexec/save-entropy/save-entropy.sh +++ b/libexec/save-entropy/save-entropy.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2001-2006,2012 Douglas Barton, dougb@FreeBSD.org # All rights reserved. diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h index f81efe721029..be89923a0cd5 100644 --- a/libexec/talkd/extern.h +++ b/libexec/talkd/extern.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org> * diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 36f22ea33294..dd77ed5be1e5 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2018 Alan Somers. * diff --git a/libexec/tftpd/tftp-file.c b/libexec/tftpd/tftp-file.c index ec7ade63e5a2..1da85d3dec32 100644 --- a/libexec/tftpd/tftp-file.c +++ b/libexec/tftpd/tftp-file.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-file.h b/libexec/tftpd/tftp-file.h index 0cf32bd23a01..c456ffff313a 100644 --- a/libexec/tftpd/tftp-file.h +++ b/libexec/tftpd/tftp-file.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c index a39b7cfe1fa3..e32e472a07c2 100644 --- a/libexec/tftpd/tftp-io.c +++ b/libexec/tftpd/tftp-io.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-io.h b/libexec/tftpd/tftp-io.h index 107e37d70262..16590139461a 100644 --- a/libexec/tftpd/tftp-io.h +++ b/libexec/tftpd/tftp-io.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-options.c b/libexec/tftpd/tftp-options.c index 037517f9cd73..162a43d586e2 100644 --- a/libexec/tftpd/tftp-options.c +++ b/libexec/tftpd/tftp-options.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-options.h b/libexec/tftpd/tftp-options.h index ac2e0fda5f5b..82dc4169caae 100644 --- a/libexec/tftpd/tftp-options.h +++ b/libexec/tftpd/tftp-options.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-transfer.c b/libexec/tftpd/tftp-transfer.c index 1949d00657b6..4560101d7052 100644 --- a/libexec/tftpd/tftp-transfer.c +++ b/libexec/tftpd/tftp-transfer.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-transfer.h b/libexec/tftpd/tftp-transfer.h index 0cedc4b937de..0edfb1e0a5eb 100644 --- a/libexec/tftpd/tftp-transfer.h +++ b/libexec/tftpd/tftp-transfer.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c index 1647ad8be1c9..93abad7a8280 100644 --- a/libexec/tftpd/tftp-utils.c +++ b/libexec/tftpd/tftp-utils.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h index 8140841a3e6e..af80a9bfe092 100644 --- a/libexec/tftpd/tftp-utils.h +++ b/libexec/tftpd/tftp-utils.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2008 Edwin Groothuis. All rights reserved. * diff --git a/libexec/ulog-helper/ulog-helper.c b/libexec/ulog-helper/ulog-helper.c index 3b525f4fe76e..47174f633060 100644 --- a/libexec/ulog-helper/ulog-helper.c +++ b/libexec/ulog-helper/ulog-helper.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org> * All rights reserved. |