From owner-svn-src-head@freebsd.org Fri Dec 1 03:22:42 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3013ADF25F2; Fri, 1 Dec 2017 03:22:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E45611C96; Fri, 1 Dec 2017 03:22:41 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB13MfBH097621; Fri, 1 Dec 2017 03:22:41 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB13Meq8097617; Fri, 1 Dec 2017 03:22:40 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201712010322.vB13Meq8097617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 1 Dec 2017 03:22:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326419 - head/usr.bin/pr X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/pr X-SVN-Commit-Revision: 326419 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 03:22:42 -0000 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. *