bin/182545: re-enable support for MEINBERG clocks in base ntpd

[Joerg Pulz]

>Number:         182545
>Category:       bin
>Synopsis:       re-enable support for MEINBERG clocks in base ntpd
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 01 13:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Joerg Pulz
>Release:        FreeBSD 10.0-ALPHA2 amd64 r255700
>Organization:
Technische Universitaet Muenchen / FRM II
>Environment:
System: FreeBSD localhost 10.0-ALPHA2 FreeBSD 10.0-ALPHA2 #0 r255700


	
>Description:
	Somehow support for clocks produced by Meinberg GmbH was dropped
	during the last vendor import in r182008.
	Support for these clocks was added on my request bin/78207 in r147554.

	Attached is a patch to re-enable support for these clocks.
>How-To-Repeat:
	
>Fix:

	

--- usr.sbin_ntp.patch begins here ---
Index: usr.sbin/ntp/config.h
===================================================================
--- usr.sbin/ntp/config.h	(revision 255700)
+++ usr.sbin/ntp/config.h	(working copy)
@@ -84,7 +84,7 @@
 #define CLOCK_LOCAL 1
 
 /* Meinberg clocks */
-/* #undef CLOCK_MEINBERG */
+#define CLOCK_MEINBERG 1
 
 /* Magnavox MX4200 GPS receiver */
 /* #undef CLOCK_MX4200 */
Index: usr.sbin/ntp/libparse/Makefile
===================================================================
--- usr.sbin/ntp/libparse/Makefile	(revision 255700)
+++ usr.sbin/ntp/libparse/Makefile	(working copy)
@@ -9,7 +9,7 @@
 	clk_rawdcf.c	clk_rcc8000.c	clk_schmid.c	clk_trimtaip.c \
 	clk_trimtsip.c	clk_varitext.c	clk_wharton.c	data_mbg.c \
 	info_trimble.c	parse.c		parse_conf.c	trim_info.c \
-	binio.c gpstolfp.c
+	binio.c gpstolfp.c ieee754io.c mfp_mul.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
--- usr.sbin_ntp.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: