From owner-cvs-src@FreeBSD.ORG Sun Mar 5 04:03:29 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 D332E16A423; Sun, 5 Mar 2006 04:03:27 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02D4F43D45; Sun, 5 Mar 2006 04:03:26 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from flame.pc (patr530-a009.otenet.gr [212.205.215.9]) (authenticated bits=128) by igloo.linux.gr (8.13.5/8.13.5/Debian-3) with ESMTP id k25436dQ010995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 5 Mar 2006 06:03:11 +0200 Received: from flame.pc (flame [127.0.0.1]) by flame.pc (8.13.4/8.13.4) with ESMTP id k2542KpX042210; Sun, 5 Mar 2006 06:02:20 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by flame.pc (8.13.4/8.13.4/Submit) id k2542KbG042209; Sun, 5 Mar 2006 06:02:20 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Date: Sun, 5 Mar 2006 06:02:19 +0200 From: Giorgos Keramidas To: Robert Watson Message-ID: <20060305040219.GA42186@flame.pc> References: <200602021002.k12A2u0u067172@repoman.freebsd.org> <43E2A089.7020202@FreeBSD.org> <20060305032121.GA41875@flame.pc> <20060305033756.F26563@fledge.watson.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060305033756.F26563@fledge.watson.org> X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (score=-3.334, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.86, BAYES_00 -2.60, DNS_FROM_RFC_ABUSE 0.20) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr 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 04:03:29 -0000 On 2006-03-05 03:43, Robert Watson wrote: >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. Err, yes. "files" would be more correct. > 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? I'd prefer taking them off the vendor branch, to make managing local changes much easier with mergemaster, but if this creates too much work when merging back and forth, I can understand if they remain without a $FreeBSD$ id.