From owner-svn-src-vendor@FreeBSD.ORG  Wed Jun 29 13:06:42 2011
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2FC41065672;
	Wed, 29 Jun 2011 13:06:42 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C2F4B8FC08;
	Wed, 29 Jun 2011 13:06:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5TD6gVP098582;
	Wed, 29 Jun 2011 13:06:42 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5TD6gKo098580;
	Wed, 29 Jun 2011 13:06:42 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201106291306.p5TD6gKo098580@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 29 Jun 2011 13:06:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223669 - vendor/ntp/dist
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	<svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, 
	<mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
	<mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2011 13:06:42 -0000

Author: bz
Date: Wed Jun 29 13:06:42 2011
New Revision: 223669
URL: http://svn.freebsd.org/changeset/base/223669

Log:
  Record the two ntp bugfixes that can be dropped when updating to
  later versions of ntp.
  
  Discussed with:	roberto

Modified:
  vendor/ntp/dist/FREEBSD-upgrade

Modified: vendor/ntp/dist/FREEBSD-upgrade
==============================================================================
--- vendor/ntp/dist/FREEBSD-upgrade	Wed Jun 29 13:03:05 2011	(r223668)
+++ vendor/ntp/dist/FREEBSD-upgrade	Wed Jun 29 13:06:42 2011	(r223669)
@@ -55,3 +55,10 @@ bin/92839 for details.
 A patch to fix IPV6_MULTICAST_LOOP was committed to head as r222444 and
 filed as http://bugs.ntp.org/show_bug.cgi?id=1936.  Check if still needed
 or re-apply on update.
+
+A patch to fix badhost sendto() logging was committed to head as r223626.
+The patch is not applicable to later upstream versions.
+
+A patch to fix various problems in case of fqdn resolving fails on
+startup was committed to head as r223667.  The patch is not applicable
+to later upstream versions.