From owner-svn-src-all@freebsd.org  Fri Jul 24 22:08:58 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 DF3D19AACDC;
 Fri, 24 Jul 2015 22:08:58 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B59C91CCF;
 Fri, 24 Jul 2015 22:08:58 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OM8w1n056691;
 Fri, 24 Jul 2015 22:08:58 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OM8w1l056689;
 Fri, 24 Jul 2015 22:08:58 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201507242208.t6OM8w1l056689@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 24 Jul 2015 22:08:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r285861 - in releng/10.2/usr.sbin/ntp: . ntpd
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2015 22:08:59 -0000

Author: delphij
Date: Fri Jul 24 22:08:57 2015
New Revision: 285861
URL: https://svnweb.freebsd.org/changeset/base/285861

Log:
  MFS r285856:
  
  MFC r285701:
  
  Use fixed date/time (the time choosen was the time the import was done
  on -HEAD) in libntp so we can make reproducible build.
  
  PR:		bin/201661
  Differential Revision:	https://reviews.freebsd.org/D3122
  
  While I'm there also remove libmd from linkage as reported in bin/201738
  
  PR:		bin/201738
  Submitted by:	John Marshall
  Approved by:	re (gjb)

Modified:
  releng/10.2/usr.sbin/ntp/config.h
  releng/10.2/usr.sbin/ntp/ntpd/Makefile
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/usr.sbin/ntp/config.h
==============================================================================
--- releng/10.2/usr.sbin/ntp/config.h	Fri Jul 24 22:00:44 2015	(r285860)
+++ releng/10.2/usr.sbin/ntp/config.h	Fri Jul 24 22:08:57 2015	(r285861)
@@ -1785,3 +1785,8 @@ typedef union mpinfou {
 	# endif
 	#endif	/* !defined(_KERNEL) && !defined(PARSESTREAM) */
 	
+/*
+ * FreeBSD specific: Explicitly specify date/time for reproducible build.
+ */
+#define	MKREPRO_DATE "Jul 04 2015"
+#define	MKREPRO_TIME "15:42:16"

Modified: releng/10.2/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- releng/10.2/usr.sbin/ntp/ntpd/Makefile	Fri Jul 24 22:00:44 2015	(r285860)
+++ releng/10.2/usr.sbin/ntp/ntpd/Makefile	Fri Jul 24 22:08:57 2015	(r285861)
@@ -27,8 +27,8 @@ SRCS=	cmd_args.c ntp_config.c ntp_contro
 	refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \
 	refclock_zyfer.c version.c
 
-DPADD=	${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} ${LIBPTHREAD}
-LDADD=	${LIBPARSE} ${LIBNTP} -lm -lmd ${LIBOPTS} -lpthread
+DPADD=	${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBPTHREAD}
+LDADD=	${LIBPARSE} ${LIBNTP} -lm ${LIBOPTS} -lpthread
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
 	-I${.CURDIR}/../../../contrib/ntp/include \