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

diff --git a/Documentation/licenses/COPYING.BSD-4-Clause-UC b/Documentation/licenses/COPYING.BSD-4-Clause-UC
deleted file mode 100644 (file)
index 9abbf24..0000000
--- 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 0d06b73fd16eb336699febfe3e6c28efc5d86a2f..d93141b1f8412f10b5eb660340b6b8a59944a17a 100644 (file)
--- 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 03b42a35badd4806b556f85c4963fd293c18f918..9aea543ea654c85644d834ec31f0155984ac3cac 100644 (file)
--- 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 74e1706852f525724e85cbfa7df64dbcb2be9680..25d148685017b456e28b256c84f446b21276e2fc 100644 (file)
--- 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 a464d56b4dfd5b8721f6c746c50b00220d4c75f2..7854b20f88f240790a90d5056bd0d3018b6c39fe 100644 (file)
--- 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 c264610671f7f6d508df54cbd5a7eb1b588b2e2e..d267380ad063cf563d43aa84c83c9dfeff6ca519 100644 (file)
--- 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 e5da434b664043b97aae21e77ad151e7d11c1e6d..4d2f95a37cab6965e7bb737ef0e074eda97cc925 100644 (file)
--- 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 f39d8cc700c78e499a647e26a5f36c7509f975ad..a566443d7230060f00765bcd9f43677fd23ffbec 100644 (file)
--- 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 61d1f3ccf935ff7f4e18f4767a2a12a349a9f600..7987e936566cad2916130611ac02c90c0e8abd0a 100644 (file)
--- 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 8a81c0952936c5635569732e7af3260594003fff..f6ea82f525d6447e1aadeb0ad8d19ca7bca9bf2a 100644 (file)
--- 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 5e8229a3632cfbfdb071210a3b59288fe2e2bc7d..b39bf34fe8c97739e407ff23c095d2a7dddc5569 100644 (file)
--- 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 fdf07791e1273a622dc919db26281c1e3b3506e5..e9355286ea56c740a30b887e4c173f8068037055 100644 (file)
--- 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 d780140fccbccb7892c4c8a375ce3c065aa0089f..2b94072175019a5c7e2ce5c3982a45393eba67ca 100644 (file)
--- 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 3bd6b3a626cdccfe839d4305a09399958c2440f1..d93f0582ce0c4b85281f39956040af9065d9fe95 100644 (file)
--- 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 6ee7c2174ee4e428da0fe55ced76082b29df478c..3fe76a77707993aee644a8d32e34180b90d608f4 100644 (file)
--- 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 6d24c3c1c55a76aff88d75b35770f41575597e93..2278923bbbc0e71f235600cc4e8bfc5286af8821 100644 (file)
--- 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 e417e8777048a2d8010841a1723892f7fc99a296..91c5e0a42cc916324207abe7e4a99dd49ab1b794 100644 (file)
--- 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 11be5e17ea9afea9c6b2de5440f155e864bf4aa4..1993e4466a6d17b125fccbcd43b11d7161081118 100644 (file)
--- 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 d3eea67117d280aae2b55df31a97c9aa49c233f9..6b44f9fda1ac3693e8efcc6eacf4b5490feae97f 100644 (file)
--- 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 c41198f30e902cd039dd5e908b191b6948082fa2..0fb43d23ea6298c0f94bede09a55d5990d7dd517 100644 (file)
--- 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 2d5083558e2d838b1d4b152c83eed170c4b8cd12..d7c885c71ab055159580f0d5c0d1fbf9aafc59cb 100644 (file)
--- 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 <kzak@redhat.com>
@@ -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 37ab94c196e978018c78d951a71028b4c276442d..20af4d66fc9ed7a8c5c4a046adb7bb96ab88f224 100644 (file)
--- 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 7c7936099c78de488f3ff56f70454947a0a75251..540bba6a0ccc9c3a09bd405dd9635665035bbc38 100644 (file)
--- 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 e7c46e7770b9dbfb6d1d9806f38e184bcde6cad6..5e64357f820c0a0da5ecf5d2a15fe81f1e46f438 100644 (file)
--- 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 0a6a4717bac3c1c64ab0a412bc9e356764a921f9..fc568d4a47815060b77670f593dd6d2bfa324dec 100644 (file)
--- 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 feb6751a2e3f6431adcb48febd72e4cd3a62db41..ec278acc053d7b159910e5f81ba1db59754bdcb7 100644 (file)
--- 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 050332d58e1f7b71a2d3b7fcfb3f2606afd4faf5..5cf334908e0f92df1bd7164da33b629250106147 100644 (file)
--- 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 ddf2a6109bb4f9b54798195b4728eb75d570a4e9..286a6f8334831e975ed669308c90f6ec44cad64d 100644 (file)
--- 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 e3bab5f9af3aef9756bfe5c5c8adbf8678f96f58..a0e2a80d72293c8ef13cb53ab1710f0e331024a9 100644 (file)
--- 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 2e5c4e56e742c23fbe95e118738b46df015487ad..cacabde2f64d75ba78a4b5d8d445d0a7df2adc74 100644 (file)
--- 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 <kerolasa@iki.fi>
  * Copyright (C) 2016 Karel Zak <kzak@redhat.com>
@@ -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 aa6f757cb5bf4018037f5d25494cbe2b105d01f3..3dd3236dc289262e838567457fc5ad8a5edb6fa4 100644 (file)
--- 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 dd36d18272d25a2e0974c1314969394acbccc749..b31f89ba4d7baab98ddd8df49a34a4c2cd6e38ae 100644 (file)
--- 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 2bb34ccf075e7bbac7087e93434cb5c8bdc85922..67931e435d9a43afd4c96df3f7779fdaf63ba108 100644 (file)
--- 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 b2be2e2251e40643ec0c1eb5eb51bf98869abd16..00e880e6162664a003239aceb550386dfaa20f93 100644 (file)
--- 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 f735c39a703f63e397f48884156e5d729c7a5c03..e94eddef4b245e66ce8eaf0929632c54e7b0eee4 100644 (file)
--- 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 bff827db8273ceebb6b5e34f39fc02c530fc710e..733318b5b9aa6021d6ce8f641b3fa74f3df23ef5 100644 (file)
--- 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 9363b957da204052e18011005cd340bbde72e5c3..f36b27e8d6e116b4d104d014d8b56a36e8cc37d1 100644 (file)
--- 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 612bfcca00332d9afb23eb0d7538061fd4f2e86f..350554452a02f10879bc0e5f2b4d43246dda8b5c 100644 (file)
--- 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 ba8d5e1f698703db16ea1506c502df3559ffd1a2..c2456a762693c50e5f0a69ee0021acf1658b147a 100644 (file)
--- 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 6fbf3cb0b9ff8a641f95f322f3a004410a214251..1268fa1c67fc2cd291fdd81b4fbbcee9355107b2 100644 (file)
--- 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 f9f1c9d568198ea4dccd794f9df7eb96d71f0006..922214c518dd2a9f5ea72dc10e843f49dfe817d0 100644 (file)
--- 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 d7b2002df3649e1ccb7fda19e2c651373f1f5891..fe8b0c90aa26b0e23741c5fdfa4a0d0a31498619 100644 (file)
--- 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 3b27fdbbf92c02eec66a10f02715a3e5e2d1445c..f8b43530f933147e45af7ddbf4b2d7137f7eb1aa 100644 (file)
--- 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 096688dc6ca80ac16571308d210ab9a5462055eb..3cd7488b1a2271a380044d824b85254f729f1d1d 100644 (file)
--- 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 d43f906d11e1a566e152ca115307879e42e7d395..ae8a2e97d7d84b42e62cc8781dd27c80d51dad30 100644 (file)
--- 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.
  *