From owner-freebsd-stable@FreeBSD.ORG  Sun Jan 27 19:19:06 2013
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1B9CF144
 for <freebsd-stable@freebsd.org>; Sun, 27 Jan 2013 19:19:06 +0000 (UTC)
 (envelope-from boland37@xs4all.nl)
Received: from smtp-vbr1.xs4all.nl (smtp-vbr1.xs4all.nl [194.109.24.21])
 by mx1.freebsd.org (Postfix) with ESMTP id 9E278189
 for <freebsd-stable@freebsd.org>; Sun, 27 Jan 2013 19:19:05 +0000 (UTC)
Received: from charlemagne.boland.org (37-251-74-118.FTTH.ispfabriek.nl
 [37.251.74.118]) (authenticated bits=0)
 by smtp-vbr1.xs4all.nl (8.13.8/8.13.8) with ESMTP id r0RJIvne044705
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
 for <freebsd-stable@freebsd.org>; Sun, 27 Jan 2013 20:18:58 +0100 (CET)
 (envelope-from boland37@xs4all.nl)
Message-ID: <51057DA1.2090408@xs4all.nl>
Date: Sun, 27 Jan 2013 20:18:57 +0100
From: Michiel Boland <boland37@xs4all.nl>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130114 Thunderbird/17.0.2
MIME-Version: 1.0
To: FreeBSD Stable <freebsd-stable@freebsd.org>
Subject: mergemaster -p / installkernel problem
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by XS4ALL Virus Scanner
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jan 2013 19:19:06 -0000

# mergemaster -p

*** Creating the temporary root environment in /var/tmp/temproot
  *** /var/tmp/temproot ready for use
  *** Creating and populating directory structure in /var/tmp/temproot



*** Beginning comparison


*** Comparison complete

*** /var/tmp/temproot is empty, deleting

# make installkernel
ERROR: Required auditdistd user is missing, see /usr/src/UPDATING.
*** [installcheck_UGID] Error code 1

Stop in /usr/src.
*** [installkernel] Error code 1

Stop in /usr/src.



Why doesn't mergemaster find the updated master.password file?

# grep FreeBSD /etc/master.passwd
# $FreeBSD: stable/9/etc/master.passwd 218047 2011-01-28 22:29:38Z pjd $
# grep FreeBSD /usr/src/etc/master.passwd
# $FreeBSD: stable/9/etc/master.passwd 243947 2012-12-06 11:52:31Z rwatson $