From owner-cvs-all@FreeBSD.ORG Sun Jun 12 01:45:23 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: by hub.freebsd.org (Postfix, from userid 664) id B288A16A41F; Sun, 12 Jun 2005 01:45:23 +0000 (GMT) Date: Sun, 12 Jun 2005 01:45:23 +0000 From: David O'Brien To: Brooks Davis Message-ID: <20050612014523.GA75047@hub.freebsd.org> References: <200506070405.j57459LA049510@repoman.freebsd.org> <97ff78d80fdc5a4ccfddde0bdb49d1fc@FreeBSD.org> <20050608171852.GA20036@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050608171852.GA20036@odin.ac.hmc.edu> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 4.11-STABLE Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Cc: cvs-src@FreeBSD.org, Brooks Davis , cvs-all@FreeBSD.org, John Baldwin , src-committers@FreeBSD.org Subject: Re: cvs commit: src/sbin/dhclient - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jun 2005 01:45:23 -0000 On Wed, Jun 08, 2005 at 10:18:52AM -0700, Brooks Davis wrote: > On Wed, Jun 08, 2005 at 10:02:27AM -0700, John Baldwin wrote: > > On Jun 6, 2005, at 9:05 PM, Brooks Davis wrote: > > >brooks 2005-06-07 04:05:09 UTC > > > FreeBSD src repository > > > src/sbin/dhclient - Imported sources > > > Update of /home/ncvs/src/sbin/dhclient > > > In directory repoman.freebsd.org:/tmp/cvs-serv49480 > > > > > > Log Message: > > > Import the OpenBSD dhclient as shipped with OpenBSD-3.7 (the tag > > > OPENBSD_3_7). > > > > > > Vendor Tag: OPENBSD > > > Release Tags: dhclient_openbsd_3_7 > > > > Is there a reason this wasn't imported into src/contrib/dhclient? Are > > we not going to import any future updates from OpenBSD? Having vendor > > code in src that's not in src/contrib and src/crypto is very > > non-intuitive as people think that stuff outside of those directories > > is free to hack on and not regard vendor branches, etc. If this is a > > one-shot import that is ok I guess. > > We will take some future changes from OpenBSD, but we will also be > modifying the code to suit out APIs and needs. As such, I felt > src/sbin/dhclient was a better location because I don't want to treat it > as some untouchable gift from the gods of code the way we tend to do > with things in contrib. Since the OpenBSD dhclient is a branch of the ISC version 2 dhclient, it would have been "cleaner" to have resurrected the ISC version 2 client in src/contrib/dhclient and then imported the OpenBSD code. This would make it easy to see the development of our dhclient (the reason we care about SCM history). It would also have pulled every file off the vendor branch so you would have also achieved the "change these files as needed" goal. -- -- David (obrien@FreeBSD.org)