From owner-freebsd-bugs@FreeBSD.ORG  Wed May 17 17:40:28 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E0F0B16AC42
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 17 May 2006 17:40:28 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E2A3F43D5D
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 17 May 2006 17:40:19 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4HHeJbR010122
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 17 May 2006 17:40:19 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4HHeJoa010121;
	Wed, 17 May 2006 17:40:19 GMT (envelope-from gnats)
Resent-Date: Wed, 17 May 2006 17:40:19 GMT
Resent-Message-Id: <200605171740.k4HHeJoa010121@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Stephen Hurd <shurd@sasktel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB3F216A8D8
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed, 17 May 2006 17:31:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 73EB743D5A
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed, 17 May 2006 17:31:32 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k4HHVWNb009344
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 May 2006 17:31:32 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k4HHVW9K009343;
	Wed, 17 May 2006 17:31:32 GMT (envelope-from nobody)
Message-Id: <200605171731.k4HHVW9K009343@www.freebsd.org>
Date: Wed, 17 May 2006 17:31:32 GMT
From: Stephen Hurd <shurd@sasktel.net>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-2.3
Cc: 
Subject: misc/97407: mergemaster(8) doesn't handle /usr/share/misc/termcap
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 May 2006 17:40:33 -0000


>Number:         97407
>Category:       misc
>Synopsis:       mergemaster(8) doesn't handle /usr/share/misc/termcap
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 17 17:40:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Stephen Hurd
>Release:        6.1-RELEASE
>Organization:
>Environment:
FreeBSD server.hurd.local 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Wed May 10 03:22:33 CST 2006     admin@server.hurd.local:/usr/obj/usr/src/sys/SERVER  i386

>Description:
After a source upgrade from 6.0 to 6.1, my custom termcap entries were lost.  It didn't occur to me that termcap wasn't *really* in /etc, so mergemaster doesn't handle it.  Definatly violated POLA for me.
>How-To-Repeat:
Modify your termcap... install world.
>Fix:
Modify mergemaster to handle /usr/share/misc/termcap
>Release-Note:
>Audit-Trail:
>Unformatted: