svn commit: r326419 - head/usr.bin/pr
Eitan Adler
eadler at FreeBSD.org
Fri Dec 1 03:22:42 UTC 2017
Author: eadler
Date: Fri Dec 1 03:22:40 2017
New Revision: 326419
URL: https://svnweb.freebsd.org/changeset/base/326419
Log:
Revert license change.
This isn't identical to the one permitted by UCB since
it is copyright multiple people.
Modified:
head/usr.bin/pr/egetopt.c
head/usr.bin/pr/extern.h
head/usr.bin/pr/pr.c
head/usr.bin/pr/pr.h
Modified: head/usr.bin/pr/egetopt.c
==============================================================================
--- head/usr.bin/pr/egetopt.c Fri Dec 1 01:51:32 2017 (r326418)
+++ head/usr.bin/pr/egetopt.c Fri Dec 1 03:22:40 2017 (r326419)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,7 +16,11 @@
* 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. Neither the name of the University nor the names of its contributors
+ * 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.
*
Modified: head/usr.bin/pr/extern.h
==============================================================================
--- head/usr.bin/pr/extern.h Fri Dec 1 01:51:32 2017 (r326418)
+++ head/usr.bin/pr/extern.h Fri Dec 1 03:22:40 2017 (r326419)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,7 +16,11 @@
* 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. Neither the name of the University nor the names of its contributors
+ * 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.
*
Modified: head/usr.bin/pr/pr.c
==============================================================================
--- head/usr.bin/pr/pr.c Fri Dec 1 01:51:32 2017 (r326418)
+++ head/usr.bin/pr/pr.c Fri Dec 1 03:22:40 2017 (r326419)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,7 +16,11 @@
* 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. Neither the name of the University nor the names of its contributors
+ * 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.
*
Modified: head/usr.bin/pr/pr.h
==============================================================================
--- head/usr.bin/pr/pr.h Fri Dec 1 01:51:32 2017 (r326418)
+++ head/usr.bin/pr/pr.h Fri Dec 1 03:22:40 2017 (r326419)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,7 +16,11 @@
* 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. Neither the name of the University nor the names of its contributors
+ * 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.
*
More information about the svn-src-all
mailing list