svn commit: r285856 - in stable/10/usr.sbin/ntp: . ntpd

[Xin LI]

Author: delphij
Date: Fri Jul 24 19:51:51 2015
New Revision: 285856
URL: https://svnweb.freebsd.org/changeset/base/285856

Log:
  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

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

Modified: stable/10/usr.sbin/ntp/config.h
==============================================================================
--- stable/10/usr.sbin/ntp/config.h	Fri Jul 24 19:50:55 2015	(r285855)
+++ stable/10/usr.sbin/ntp/config.h	Fri Jul 24 19:51:51 2015	(r285856)
@@ -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: stable/10/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- stable/10/usr.sbin/ntp/ntpd/Makefile	Fri Jul 24 19:50:55 2015	(r285855)
+++ stable/10/usr.sbin/ntp/ntpd/Makefile	Fri Jul 24 19:51:51 2015	(r285856)
@@ -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 \