From owner-svn-src-all@freebsd.org Sat Dec 30 15:14:58 2017 Return-Path: Delivered-To: svn-src-all@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 251DBE8A23F; Sat, 30 Dec 2017 15:14:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F070D7FBF3; Sat, 30 Dec 2017 15:14:57 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vBUFEuNl076297; Sat, 30 Dec 2017 07:14:56 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vBUFEubp076296; Sat, 30 Dec 2017 07:14:56 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201712301514.vBUFEubp076296@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r327370 - head/sbin/ccdconfig In-Reply-To: <201712300026.vBU0QhXr009672@repo.freebsd.org> To: "Pedro F. Giffuni" Date: Sat, 30 Dec 2017 07:14:56 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Dec 2017 15:14:58 -0000 > Author: pfg > Date: Sat Dec 30 00:26:42 2017 > New Revision: 327370 > URL: https://svnweb.freebsd.org/changeset/base/327370 > > Log: > ccdconfig: Move VCS tags to be more consistent with our style. > > Update a now-bogus SPDX tag while here. > > Modified: > head/sbin/ccdconfig/ccdconfig.8 > head/sbin/ccdconfig/ccdconfig.c > head/sbin/ccdconfig/pathnames.h > > Modified: head/sbin/ccdconfig/ccdconfig.8 > ============================================================================== > --- head/sbin/ccdconfig/ccdconfig.8 Sat Dec 30 00:24:53 2017 (r327369) > +++ head/sbin/ccdconfig/ccdconfig.8 Sat Dec 30 00:26:42 2017 (r327370) > @@ -1,5 +1,3 @@ > -.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ > -.\" > .\" Copyright (c) 1996 The NetBSD Foundation, Inc. > .\" All rights reserved. > .\" > @@ -27,6 +25,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > +.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ Obtained from: NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24) So now this confuses me, you just claimed to have pulled in ccdconfig 1.24 changes yet our NetBSD tag is still 1.4??? > .\" $FreeBSD$ > .\" > .Dd October 3, 2016 > > Modified: head/sbin/ccdconfig/ccdconfig.c > ============================================================================== > --- head/sbin/ccdconfig/ccdconfig.c Sat Dec 30 00:24:53 2017 (r327369) > +++ head/sbin/ccdconfig/ccdconfig.c Sat Dec 30 00:26:42 2017 (r327370) > @@ -1,7 +1,5 @@ > -/* $NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ > - > /*- > - * SPDX-License-Identifier: BSD-4-Clause > + * SPDX-License-Identifier: BSD-2-Clause > * > * Copyright (c) 2003 Poul-Henning Kamp > * Copyright (c) 1996 The NetBSD Foundation, Inc. > @@ -30,6 +28,8 @@ > * 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. > + * > + * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ Obtained from: NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24) Ditto on 1.6 vs 1.47 > */ > > #include > > Modified: head/sbin/ccdconfig/pathnames.h > ============================================================================== > --- head/sbin/ccdconfig/pathnames.h Sat Dec 30 00:24:53 2017 (r327369) > +++ head/sbin/ccdconfig/pathnames.h Sat Dec 30 00:26:42 2017 (r327370) > @@ -1,5 +1,3 @@ > -/* $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $ */ > - > /*- > * SPDX-License-Identifier: BSD-2-Clause-NetBSD > * > @@ -30,6 +28,7 @@ > * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > + * $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $ > * $FreeBSD$ > */ > > > -- Rod Grimes rgrimes@freebsd.org