From owner-freebsd-stable@FreeBSD.ORG  Sun Dec  4 02:18:17 2011
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95F36106564A;
	Sun,  4 Dec 2011 02:18:17 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: from mail4out.barnet.com.au (mail4out.barnet.com.au [202.83.178.123])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C07E8FC0C;
	Sun,  4 Dec 2011 02:18:16 +0000 (UTC)
Received: by mail4out.barnet.com.au (Postfix, from userid 1001)
	id 343BF37B91C; Sun,  4 Dec 2011 13:01:01 +1100 (EST)
X-Viruscan-Id: <4EDAD45C0001621CFBD91E@BarNet>
Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "*.barnet.com.au", Issuer "Equifax" (verified OK))
	by mail4.barnet.com.au (Postfix) with ESMTPS id B6B0D44C964;
	Sun,  4 Dec 2011 13:01:00 +1100 (EST)
Received: from [10.204.250.203] (ppp121-44-215-64.lns20.syd7.internode.on.net
	[121.44.215.64]) (using TLSv1 with cipher AES128-SHA (128/128 bits))
	(Client did not present a certificate)
	by mail4auth.barnet.com.au (Postfix) with ESMTPSA id 53BCF37B970;
	Sun,  4 Dec 2011 13:01:00 +1100 (EST)
Mime-Version: 1.0 (Apple Message framework v1251.1)
Content-Type: text/plain; charset=iso-8859-1
From: Edwin Groothuis <edwin@mavetju.org>
In-Reply-To: <4EDABADD.9000009@FreeBSD.org>
Date: Sun, 4 Dec 2011 13:00:58 +1100
Content-Transfer-Encoding: quoted-printable
Message-Id: <F341DFBF-7377-4F86-979A-BE2AEEF3D4DA@mavetju.org>
References: <jbdf06$294$1@lorvorc.mips.inka.de>
	<CADe0-4kwFWkNCkYLac8ZayzxNi09XCK1mF6dxGgT0DH0vCav+g@mail.gmail.com>
	<4EDABADD.9000009@FreeBSD.org>
To: Doug Barton <dougb@FreeBSD.org>
X-Mailer: Apple Mail (2.1251.1)
Cc: edwin@FreeBSD.org, freebsd-stable@freebsd.org,
	Christian Weisgerber <naddy@mips.inka.de>, Max Khon <fjoe@samodelkin.net>
Subject: Re: 7-STABLE: mergemaster tzsetup question
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 04 Dec 2011 02:18:17 -0000

On 04/12/2011, at 11:12 , Doug Barton wrote:
> On 12/3/2011 8:14 AM, Max Khon wrote:
>> Christian,
>>=20
>> On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber
>> <naddy@mips.inka.de> wrote:
>>=20
>>> Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented
>>> with
>>>=20
>>> *** There is no /var/db/zoneinfo file to update /etc/localtime.
>>>   You should run tzsetup
>>>=20
>>> Running tzsetup(8) does however not create /var/db/zoneinfo, so
>>> mergemaster will prompt the next time, too.  I guess I can just
>>> ignore it, but it seems weird that mergemaster would keep nagging
>>> about this.
>>>=20
>>> Where is /var/db/zoneinfo supposed to come from?
>>>=20
>>> I also notice that mergemaster can issue tzsetup arguments -C and
>>> -r, but tzsetup doesn't support those.
>>=20
>> tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems =
that
>> mergemaster was merged to RELENG_7 but appropiate version of tzsetup
>> was not.
>=20
> Well that's embarrassing. :)
>=20
> Edwin, what are the chances that you could MFC your changes to =
tzsetup?

If you still have a machine running 7.x (which I don't have anymore), =
then go for it and do your damage :-)

Edwin=