From c85e5f560cb3f079e0a74fa6e06cea2895b87f7d Mon Sep 17 00:00:00 2001 From: ionmeo Date: Wed, 13 May 2026 11:57:11 -0400 Subject: [PATCH] license: switch from BSD 4-clause to 3-clause Remove the advertising clause (clause 3) and renumber the non-endorsement clause from 4 to 3 in all files containing the BSD 4-clause license, following the notice issued by UC Berkeley (quoted below). Additional changes: - Add SPDX-License-Identifier: BSD-3-Clause to each affected file. - Remove the BSD-4-Clause-UC entry from README.licensing. - Delete Documentation/licenses/COPYING.BSD-4-Clause-UC. Reference: https://ipira.berkeley.edu/sites/default/files/amendment_of_4-clause_bsd_software_license.pdf Relevant text: January 31, 2012 To all licensees, and distributors of software officially licensed under a UC Berkeley version of the BSD license: As you may know, certain software officially licensed by UC Berkeley using the original 4-clause BSD license required that further distributions of products containing all or portions of the software acknowledge within their advertising materials that such products contain software developed by UC Berkeley and its contributors. Specifically, the provision reads: "3. All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed by the University of California, Berkeley and its contributors." Effective immediately, licensees and distributors are no longer required to include the acknowledgement within advertising materials. Accordingly, the advertising clause 3 of the original 4-clause BSD license for any and all software officially licensed by UC Berkeley, is hereby deleted in its entirety. Michael Katz Executive Director Intellectual Property and Industry Research Alliances University of California, Berkeley --- .../licenses/COPYING.BSD-4-Clause-UC | 32 ----- README.licensing | 2 - login-utils/vipw.8.adoc | 7 +- login-utils/vipw.c | 7 +- misc-utils/cal.1.adoc | 7 +- misc-utils/cal.c | 7 +- misc-utils/kill.c | 7 +- misc-utils/logger.1.adoc | 7 +- misc-utils/logger.c | 7 +- misc-utils/look.1.adoc | 7 +- misc-utils/look.c | 7 +- misc-utils/whereis.1.adoc | 7 +- misc-utils/whereis.c | 7 +- po-man/sv.po | 133 +++++------------- sys-utils/fstab.5.adoc | 7 +- sys-utils/renice.1.adoc | 7 +- sys-utils/renice.c | 8 +- term-utils/mesg.1.adoc | 7 +- term-utils/mesg.c | 7 +- term-utils/script.1.adoc | 7 +- term-utils/script.c | 7 +- term-utils/ttymsg.c | 7 +- term-utils/wall.1.adoc | 7 +- term-utils/wall.c | 7 +- term-utils/write.1.adoc | 7 +- term-utils/write.c | 7 +- text-utils/col.1.adoc | 7 +- text-utils/col.c | 7 +- text-utils/colcrt.1.adoc | 7 +- text-utils/colcrt.c | 7 +- text-utils/colrm.1.adoc | 7 +- text-utils/colrm.c | 7 +- text-utils/column.1.adoc | 7 +- text-utils/column.c | 7 +- text-utils/hexdump-conv.c | 7 +- text-utils/hexdump-display.c | 7 +- text-utils/hexdump-parse.c | 7 +- text-utils/hexdump.1.adoc | 7 +- text-utils/hexdump.c | 7 +- text-utils/hexdump.h | 7 +- text-utils/more.1.adoc | 7 +- text-utils/rev.1.adoc | 7 +- text-utils/rev.c | 7 +- text-utils/ul.1.adoc | 7 +- text-utils/ul.c | 7 +- 45 files changed, 122 insertions(+), 340 deletions(-) delete mode 100644 Documentation/licenses/COPYING.BSD-4-Clause-UC diff --git a/Documentation/licenses/COPYING.BSD-4-Clause-UC b/Documentation/licenses/COPYING.BSD-4-Clause-UC deleted file mode 100644 index 9abbf2410e..0000000000 --- a/Documentation/licenses/COPYING.BSD-4-Clause-UC +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 1989 The Regents of the University of California. - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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/README.licensing b/README.licensing index 0d06b73fd1..d93141b1f8 100644 --- a/README.licensing +++ b/README.licensing @@ -18,8 +18,6 @@ There is code under: * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License - * BSD-4-Clause-UC - BSD 4-Clause University of California-Specific - * EUPL-1.2 - European Union Public Licence version 1.2 * Public Domain diff --git a/login-utils/vipw.8.adoc b/login-utils/vipw.8.adoc index 03b42a35ba..9aea543ea6 100644 --- a/login-utils/vipw.8.adoc +++ b/login-utils/vipw.8.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1983, 1991 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/login-utils/vipw.c b/login-utils/vipw.c index 74e1706852..25d1486850 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/misc-utils/cal.1.adoc b/misc-utils/cal.1.adoc index a464d56b4d..7854b20f88 100644 --- a/misc-utils/cal.1.adoc +++ b/misc-utils/cal.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1989, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -14,11 +15,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/misc-utils/cal.c b/misc-utils/cal.c index c264610671..d267380ad0 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -13,11 +14,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/misc-utils/kill.c b/misc-utils/kill.c index e5da434b66..4d2f95a37c 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/misc-utils/logger.1.adoc b/misc-utils/logger.1.adoc index f39d8cc700..a566443d72 100644 --- a/misc-utils/logger.1.adoc +++ b/misc-utils/logger.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1983, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 61d1f3ccf9..7987e93656 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/misc-utils/look.1.adoc b/misc-utils/look.1.adoc index 8a81c09529..f6ea82f525 100644 --- a/misc-utils/look.1.adoc +++ b/misc-utils/look.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/misc-utils/look.c b/misc-utils/look.c index 5e8229a363..b39bf34fe8 100644 --- a/misc-utils/look.c +++ b/misc-utils/look.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -13,11 +14,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/misc-utils/whereis.1.adoc b/misc-utils/whereis.1.adoc index fdf07791e1..e9355286ea 100644 --- a/misc-utils/whereis.1.adoc +++ b/misc-utils/whereis.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1990 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c index d780140fcc..2b94072175 100644 --- a/misc-utils/whereis.c +++ b/misc-utils/whereis.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /*- * Copyright (c) 1980 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/po-man/sv.po b/po-man/sv.po index 3bd6b3a626..d93f0582ce 100644 --- a/po-man/sv.po +++ b/po-man/sv.po @@ -9559,6 +9559,7 @@ msgstr "*last*(1), *w*(1), *who*(1), *utmp*(5)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1983, 1991 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -9569,11 +9570,7 @@ msgstr "*last*(1), *w*(1), *who*(1), *utmp*(5)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -12214,6 +12211,7 @@ msgstr "*libblkid*(3), *findfs*(8), *lsblk*(8), *wipefs*(8)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1989, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. This code is derived from software contributed to Berkeley by @@ -12226,11 +12224,7 @@ msgstr "*libblkid*(3), *findfs*(8), *lsblk*(8), *wipefs*(8)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -14982,6 +14976,7 @@ msgstr "*liblastlog2*(3)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1983, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -14992,11 +14987,7 @@ msgstr "*liblastlog2*(3)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -15548,6 +15539,7 @@ msgstr "*journalctl*(1), *syslog*(3), *systemd.journal-fields*(7)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -15558,11 +15550,7 @@ msgstr "*journalctl*(1), *syslog*(3), *systemd.journal-fields*(7)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -17808,6 +17796,7 @@ msgstr "*waitpid*(2) *wait*(1P)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1990 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -17818,11 +17807,7 @@ msgstr "*waitpid*(2) *wait*(1P)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -21867,6 +21852,7 @@ msgstr "*montering*(8)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1989, 1991 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -21877,11 +21863,7 @@ msgstr "*montering*(8)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -31255,6 +31237,7 @@ msgstr " sudo readprofile -M 20\n" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1983, 1991, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -31265,11 +31248,7 @@ msgstr " sudo readprofile -M 20\n" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -35490,6 +35469,7 @@ msgstr "Den ursprungliga *agetty* för seriella terminaler skrevs av mailto:wiet # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1987, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -35500,11 +35480,7 @@ msgstr "Den ursprungliga *agetty* för seriella terminaler skrevs av mailto:wiet #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -35630,6 +35606,7 @@ msgstr "*login*(1), *talk*(1), *write*(1), *wall*(1), *xterm*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1990 Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -35640,11 +35617,7 @@ msgstr "*login*(1), *talk*(1), *write*(1), *wall*(1), *xterm*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -36758,6 +36731,7 @@ msgstr "*stty*(1), *tput*(1), *tty*(4), *terminfo*(5)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1989, 1990 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -36768,11 +36742,7 @@ msgstr "*stty*(1), *tput*(1), *tty*(4), *terminfo*(5)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -36864,6 +36834,7 @@ msgstr "*mesg*(1), *talk*(1), *write*(1), *shutdown*(8)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1989, 1993 #. The Regents of the University of California. All rights reserved. #. This code is derived from software contributed to Berkeley by @@ -36876,11 +36847,7 @@ msgstr "*mesg*(1), *talk*(1), *write*(1), *shutdown*(8)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -36966,6 +36933,7 @@ msgstr "*mesg*(1), *talk*(1), *who*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1990 The Regents of the University of California. #. All rights reserved. #. This code is derived from software contributed to Berkeley by @@ -36978,11 +36946,7 @@ msgstr "*mesg*(1), *talk*(1), *who*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -37254,6 +37218,7 @@ msgstr "*expand*(1), *nroff*(1), *tbl*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -37264,11 +37229,7 @@ msgstr "*expand*(1), *nroff*(1), *tbl*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -37375,6 +37336,7 @@ msgstr "*col*(1), *more*(1), *nroff*(1), *troff*(1), *ul*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1990 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -37385,11 +37347,7 @@ msgstr "*col*(1), *more*(1), *nroff*(1), *troff*(1), *ul*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -37448,6 +37406,7 @@ msgstr "*awk*(1p), *column*(1), *expand*(1), *paste*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1989, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -37458,11 +37417,7 @@ msgstr "*awk*(1p), *column*(1), *expand*(1), *paste*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -38028,6 +37983,7 @@ msgstr "*colrm*(1), *ls*(1), *paste*(1), *sort*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1989, 1990, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -38038,11 +37994,7 @@ msgstr "*colrm*(1), *ls*(1), *paste*(1), *sort*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -38655,6 +38607,7 @@ msgstr "*read*(1p)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1988, 1990 The Regents of the University of California. #. Copyright (c) 1988 Mark Nudleman #. All rights reserved. @@ -38666,11 +38619,7 @@ msgstr "*read*(1p)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -39498,6 +39447,7 @@ msgstr "*cat*(1), *more*(1), *sh*(1p), *terminfo*(5), *locale*(7), *regex*(7), * # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1985, 1992 The Regents of the University of California. #. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -39508,11 +39458,7 @@ msgstr "*cat*(1), *more*(1), *sh*(1p), *terminfo*(5), *locale*(7), *regex*(7), * #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -39572,6 +39518,7 @@ msgstr "*tac*(1)" # # # +#. SPDX-License-Identifier: BSD-3-Clause #. Copyright (c) 1980, 1991, 1993 #. The Regents of the University of California. All rights reserved. #. Redistribution and use in source and binary forms, with or without @@ -39582,11 +39529,7 @@ msgstr "*tac*(1)" #. 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. All advertising materials mentioning features or use of this software -#. must display the following acknowledgement: -#. This product includes software developed by the University of -#. California, Berkeley and its contributors. -#. 4. Neither the name of the University nor the names of its contributors +#. 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND diff --git a/sys-utils/fstab.5.adoc b/sys-utils/fstab.5.adoc index 6ee7c2174e..3fe76a7770 100644 --- a/sys-utils/fstab.5.adoc +++ b/sys-utils/fstab.5.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1989, 1991 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/sys-utils/renice.1.adoc b/sys-utils/renice.1.adoc index 6d24c3c1c5..2278923bbb 100644 --- a/sys-utils/renice.1.adoc +++ b/sys-utils/renice.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1983, 1991, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/sys-utils/renice.c b/sys-utils/renice.c index e417e87770..91c5e0a42c 100644 --- a/sys-utils/renice.c +++ b/sys-utils/renice.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: BSD-4-Clause-UC + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -12,11 +12,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/term-utils/mesg.1.adoc b/term-utils/mesg.1.adoc index 11be5e17ea..1993e4466a 100644 --- a/term-utils/mesg.1.adoc +++ b/term-utils/mesg.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1987, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/term-utils/mesg.c b/term-utils/mesg.c index d3eea67117..6b44f9fda1 100644 --- a/term-utils/mesg.c +++ b/term-utils/mesg.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. @@ -15,11 +16,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/term-utils/script.1.adoc b/term-utils/script.1.adoc index c41198f30e..0fb43d23ea 100644 --- a/term-utils/script.1.adoc +++ b/term-utils/script.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1990 Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/term-utils/script.c b/term-utils/script.c index 2d5083558e..d7c885c71a 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (C) 1980 Regents of the University of California. * Copyright (C) 2013-2019 Karel Zak @@ -12,11 +13,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/term-utils/ttymsg.c b/term-utils/ttymsg.c index 37ab94c196..20af4d66fc 100644 --- a/term-utils/ttymsg.c +++ b/term-utils/ttymsg.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/term-utils/wall.1.adoc b/term-utils/wall.1.adoc index 7c7936099c..540bba6a0c 100644 --- a/term-utils/wall.1.adoc +++ b/term-utils/wall.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1989, 1990 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/term-utils/wall.c b/term-utils/wall.c index e7c46e7770..5e64357f82 100644 --- a/term-utils/wall.c +++ b/term-utils/wall.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/term-utils/write.1.adoc b/term-utils/write.1.adoc index 0a6a4717ba..fc568d4a47 100644 --- a/term-utils/write.1.adoc +++ b/term-utils/write.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. @@ -14,11 +15,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/term-utils/write.c b/term-utils/write.c index feb6751a2e..ec278acc05 100644 --- a/term-utils/write.c +++ b/term-utils/write.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -13,11 +14,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/col.1.adoc b/text-utils/col.1.adoc index 050332d58e..5cf334908e 100644 --- a/text-utils/col.1.adoc +++ b/text-utils/col.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1990 The Regents of the University of California. All rights reserved. @@ -14,11 +15,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/col.c b/text-utils/col.c index ddf2a6109b..286a6f8334 100644 --- a/text-utils/col.c +++ b/text-utils/col.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -13,11 +14,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/colcrt.1.adoc b/text-utils/colcrt.1.adoc index e3bab5f9af..a0e2a80d72 100644 --- a/text-utils/colcrt.1.adoc +++ b/text-utils/colcrt.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c index 2e5c4e56e7..cacabde2f6 100644 --- a/text-utils/colcrt.c +++ b/text-utils/colcrt.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (C) 2016 Sami Kerola * Copyright (C) 2016 Karel Zak @@ -13,11 +14,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/colrm.1.adoc b/text-utils/colrm.1.adoc index aa6f757cb5..3dd3236dc2 100644 --- a/text-utils/colrm.1.adoc +++ b/text-utils/colrm.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1990 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/colrm.c b/text-utils/colrm.c index dd36d18272..b31f89ba4d 100644 --- a/text-utils/colrm.c +++ b/text-utils/colrm.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/column.1.adoc b/text-utils/column.1.adoc index 2bb34ccf07..67931e435d 100644 --- a/text-utils/column.1.adoc +++ b/text-utils/column.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1989, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/column.c b/text-utils/column.c index b2be2e2251..00e880e616 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -12,11 +13,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/hexdump-conv.c b/text-utils/hexdump-conv.c index f735c39a70..e94eddef4b 100644 --- a/text-utils/hexdump-conv.c +++ b/text-utils/hexdump-conv.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/hexdump-display.c b/text-utils/hexdump-display.c index bff827db82..733318b5b9 100644 --- a/text-utils/hexdump-display.c +++ b/text-utils/hexdump-display.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c index 9363b957da..f36b27e8d6 100644 --- a/text-utils/hexdump-parse.c +++ b/text-utils/hexdump-parse.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/hexdump.1.adoc b/text-utils/hexdump.1.adoc index 612bfcca00..350554452a 100644 --- a/text-utils/hexdump.1.adoc +++ b/text-utils/hexdump.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1989, 1990, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c index ba8d5e1f69..c2456a7626 100644 --- a/text-utils/hexdump.c +++ b/text-utils/hexdump.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h index 6fbf3cb0b9..1268fa1c67 100644 --- a/text-utils/hexdump.h +++ b/text-utils/hexdump.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/more.1.adoc b/text-utils/more.1.adoc index f9f1c9d568..922214c518 100644 --- a/text-utils/more.1.adoc +++ b/text-utils/more.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1988, 1990 The Regents of the University of California. Copyright (c) 1988 Mark Nudleman @@ -12,11 +13,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/rev.1.adoc b/text-utils/rev.1.adoc index d7b2002df3..fe8b0c90aa 100644 --- a/text-utils/rev.1.adoc +++ b/text-utils/rev.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1985, 1992 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/rev.c b/text-utils/rev.c index 3b27fdbbf9..f8b43530f9 100644 --- a/text-utils/rev.c +++ b/text-utils/rev.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /*- * Copyright (c) 1987, 1992 The Regents of the University of California. * All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/text-utils/ul.1.adoc b/text-utils/ul.1.adoc index 096688dc6c..3cd7488b1a 100644 --- a/text-utils/ul.1.adoc +++ b/text-utils/ul.1.adoc @@ -1,4 +1,5 @@ //po4a: entry man manual +// SPDX-License-Identifier: BSD-3-Clause //// Copyright (c) 1980, 1991, 1993 The Regents of the University of California. All rights reserved. @@ -11,11 +12,7 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: -This product includes software developed by the University of -California, Berkeley and its contributors. -4. Neither the name of the University nor the names of its contributors +3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/text-utils/ul.c b/text-utils/ul.c index d43f906d11..ae8a2e97d7 100644 --- a/text-utils/ul.c +++ b/text-utils/ul.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1980, 1993 * The Regents of the University of California. All rights reserved. @@ -10,11 +11,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * -- 2.47.3