From owner-cvs-src@FreeBSD.ORG Sun Mar 5 03:39:06 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F14316A420; Sun, 5 Mar 2006 03:39:06 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E2FA43D46; Sun, 5 Mar 2006 03:39:05 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 0F44846B3B; Sat, 4 Mar 2006 22:38:45 -0500 (EST) Date: Sun, 5 Mar 2006 03:43:50 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Giorgos Keramidas In-Reply-To: <20060305032121.GA41875@flame.pc> Message-ID: <20060305033756.F26563@fledge.watson.org> References: <200602021002.k12A2u0u067172@repoman.freebsd.org> <43E2A089.7020202@FreeBSD.org> <20060305032121.GA41875@flame.pc> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Tom Rhodes , Doug Barton , cvs-all@FreeBSD.org, src-committers@FreeBSD.org, cvs-src@FreeBSD.org Subject: Re: cvs commit: src/etc/rc.d Makefile auditd X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 03:39:06 -0000 On Sun, 5 Mar 2006, Giorgos Keramidas wrote: >> I have a couple concerns about this. First the more general, I'm not sure >> that /etc/security is a reasonable place for your config files. That's a >> very general name, and the audit stuff is a very specific project. That >> said, I'm not sure that we need yet another directory under /etc, but I'm >> curious about what others think about this issue. > > Should we also add a $FreeBSD$ id line to these scripts to ease merging any > local changes with mergemaster? By scripts, I assume you mean files generally, since only one file in /etc/security is actually a script. Right now, those files are on the vendor branch in contrib/openbsm/etc, since they are distributed as part of OpenBSM. I think merging $FreeBSD$ strings into the OpenBSM distribution probably doesn't make sense. So it comes down to how and whether we want to maintain local modifications (such as adding $FreeBSD$). My hope has been to avoid requiring any FreeBSD src changes to files in OpenBSM, given that I am the vendor, and can loop changes back, but obviously $FreeBSD$ is a bit of a special case. How do we normally handle this sort of thing? It looks like for OpenSSL and OpenSSH, at least, we opt to take files off the vendor branch? Robert N M Watson