From owner-p4-projects Mon Feb 10 7:20:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C850737B407; Mon, 10 Feb 2003 07:20:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46AAF37B406; Mon, 10 Feb 2003 07:20:48 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A83C43F85; Mon, 10 Feb 2003 07:20:47 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.6/8.12.5) with SMTP id h1AFKcP4031179; Mon, 10 Feb 2003 10:20:38 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Mon, 10 Feb 2003 10:20:37 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Juli Mallett Cc: Perforce Change Reviews Subject: Re: PERFORCE change 24870 for review In-Reply-To: <200302090534.h195Y8qr063360@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Usually if you're preserving the copyright, you'll also want to preserve the credits associated with the copyright and explicitly embedded in the license. You insert "in part" as followes: * This software was developed for the FreeBSD Project in part by Poul-Henning ... Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Sat, 8 Feb 2003, Juli Mallett wrote: > http://perforce.freebsd.org/chv.cgi?CH=24870 > > Change 24870 by jmallett@jmallett_dalek on 2003/02/08 21:33:16 > > I may be giving credit, for the stuff I based this on, but it was > not itself part of PHK's work. > > Affected files ... > > .. //depot/projects/mips/sys/geom/geom_fx.c#6 edit > > Differences ... > > ==== //depot/projects/mips/sys/geom/geom_fx.c#6 (text+ko) ==== > > @@ -4,11 +4,6 @@ > * Copyright (c) 2002 Networks Associates Technology, Inc. > * All rights reserved. > * > - * This software was developed for the FreeBSD Project by Poul-Henning Kamp > - * and NAI Labs, the Security Research Division of Network Associates, Inc. > - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the > - * DARPA CHATS research program. > - * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > * are met: > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message