From owner-freebsd-questions@freebsd.org  Thu Jun 23 15:11:31 2016
Return-Path: <owner-freebsd-questions@freebsd.org>
Delivered-To: freebsd-questions@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FAF0B727DC
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Thu, 23 Jun 2016 15:11:31 +0000 (UTC) (envelope-from sec@42.org)
Received: from ice.42.org (v6.42.org [IPv6:2001:608:9::1])
 by mx1.freebsd.org (Postfix) with ESMTP id DBA782042
 for <freebsd-questions@freebsd.org>; Thu, 23 Jun 2016 15:11:30 +0000 (UTC)
 (envelope-from sec@42.org)
Received: by ice.42.org (Postfix, from userid 1000)
 id C44A43EA4; Thu, 23 Jun 2016 17:11:28 +0200 (CEST)
Date: Thu, 23 Jun 2016 17:11:28 +0200
From: Stefan `Sec` Zehl <sec@42.org>
To: freebsd-questions@freebsd.org
Subject: freebsd-update && locally modified files
Message-ID: <20160623151128.GA25400@ice.42.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I-love-doing-this: really
X-Modeline: vim:set ts=8 sw=4 smarttab tw=72 si noic notitle:
Accept-Languages: de, en
X-URL: http://sec.42.org/
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2016 15:11:31 -0000

Hi,

I've been a user of freebsd-update for some time, and it works basically
fine, but since quite some time it annoys me with this message:

| The following files are affected by updates, but no changes have
| been downloaded because the files have been modified locally:
| /etc/mail/freebsd.cf
| /etc/mail/freebsd.submit.cf
| /etc/mail/sendmail.cf
| /etc/mail/submit.cf
| /var/db/mergemaster.mtree

How do I get these files back in a state that freebsd-update doesn't
complain about?

I don't care about loosing changes. But even extensive googling has not
helped me find an answer on how to restore those files to their
"original" state that freebsd-update wants them to be in.

The obvious solution of deleting them and letting freebsd-update install
run did not restore those files.

Please help.

CU,
    Sec
-- 
``oh no! the gronkulator is broken!''