From owner-freebsd-security Mon Feb 10 14:22:35 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id OAA29066 for security-outgoing; Mon, 10 Feb 1997 14:22:35 -0800 (PST) Received: from rover.village.org (rover.village.org [204.144.255.49]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id OAA29058 for ; Mon, 10 Feb 1997 14:22:29 -0800 (PST) Received: from rover.village.org [127.0.0.1] by rover.village.org with esmtp (Exim 0.56 #1) id E0vu479-0005XM-00; Mon, 10 Feb 1997 15:22:19 -0700 To: Dev Chanchani Subject: Re: Don't fulminate, be productive Cc: freebsd-security@freebsd.org In-reply-to: Your message of "Mon, 10 Feb 1997 17:02:56 EST." References: Date: Mon, 10 Feb 1997 15:22:19 -0700 From: Warner Losh Message-Id: Sender: owner-security@freebsd.org X-Loop: FreeBSD.org Precedence: bulk In message Dev Chanchani writes: : tree with the freebsd tree. However, I was under the impression that : openbsd is more a derivative of netbsd than freebsd. But, I guess most of : the utilities would yield interesting diff's. So far in my efforts in this area, I've found that there are three types of programs in the FreeBSD: 1) Those in FreeBSD and not in OpenBSD (eg ppp) 2) Those in Both, but with different implementations (yp?) 3) Those that have a common ancestor (most of the system). Most of the programs fall into the 3) cat. These are very easy to merge the diffs. When I talk about the CVS tree, I talk about going to the OpenBSD cvs tree, doing a cvs diff -r 1.3 -r 1.4 -u xxx.c | (cd /usr/FreeBSD/... ; patch -p0) to get the changes into FreeBSD. I'm not diffing the trees, per se. Once I have them applied, I sometimes do a diff to see what, if anything, I missed. I also look at the logs to see all the previous/future fixes that were made to this program and try to batch them up, since OpenBSD's commits tend to not solve all the problems with a given program in a single commit (which is what one generally expects of any software effort). OpenBSD started with the NetBSD tree, then added a lot of the cool stuff from FreeBSD and a lot of their own work. All three systems are more alike than different. However, the differences can be in very important detail cases :-). What is really needed is for someone to do a line by line review of the cat 1 and cat 2 programs, since I'm not looking at them too closely (except for the little work I did on ppp) or at all. Warner