From Joerg.Pulz@frm2.tum.de  Tue Oct  1 13:30:26 2013
Return-Path: <Joerg.Pulz@frm2.tum.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 7B3BB55F;
	Tue,  1 Oct 2013 13:30:26 +0000 (UTC)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id DDDAE2B3A;
	Tue,  1 Oct 2013 13:30:25 +0000 (UTC)
Received: from mailhost.frm2.tum.de (localhost [127.0.0.1])
	by mailhost.frm2.tum.de (8.14.4/8.14.4) with ESMTP id r91DTTql065800;
	Tue, 1 Oct 2013 15:29:29 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10])
	by mailhost.frm2.tum.de (8.14.4/8.14.4) with ESMTP id r91DTOFI065794
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Tue, 1 Oct 2013 15:29:24 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (localhost [127.0.0.1])
	by hades.admin.frm2 (8.14.7/8.14.3) with ESMTP id r91DTNlw068736;
	Tue, 1 Oct 2013 15:29:24 +0200 (CEST)
	(envelope-from jpulz@hades.admin.frm2)
Received: (from jpulz@localhost)
	by hades.admin.frm2 (8.14.7/8.14.7/Submit) id r91DTNJ5068735;
	Tue, 1 Oct 2013 15:29:23 +0200 (CEST)
	(envelope-from jpulz)
Message-Id: <201310011329.r91DTNJ5068735@hades.admin.frm2>
Date: Tue, 1 Oct 2013 15:29:23 +0200 (CEST)
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Reply-To: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: roberto@freebsd.org
Subject: re-enable support for MEINBERG clocks in base ntpd
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 01 13:40:00 UTC 2013
>Closed-Date:    Wed Oct 02 21:48:17 UTC 2013
>Last-Modified:  Wed Oct  2 21:50:00 UTC 2013
>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:
State-Changed-From-To: open->closed 
State-Changed-By: roberto 
State-Changed-When: Wed Oct 2 21:47:47 UTC 2013 
State-Changed-Why:  
Patch applied, sorry for the mishap. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182545 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/182545: commit references a PR
Date: Wed,  2 Oct 2013 21:47:33 +0000 (UTC)

 Author: roberto
 Date: Wed Oct  2 21:47:25 2013
 New Revision: 256009
 URL: http://svnweb.freebsd.org/changeset/base/256009
 
 Log:
   Meinberg clocks support was inadvertently removed during the last vendor
   import.  Add it back.
   
   PR:		bin/182545
   Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
   Approved by:	re (delphij)
   MFC after:	1 week
 
 Modified:
   head/usr.sbin/ntp/config.h
   head/usr.sbin/ntp/libparse/Makefile
 
 Modified: head/usr.sbin/ntp/config.h
 ==============================================================================
 --- head/usr.sbin/ntp/config.h	Wed Oct  2 20:44:36 2013	(r256008)
 +++ head/usr.sbin/ntp/config.h	Wed Oct  2 21:47:25 2013	(r256009)
 @@ -84,7 +84,7 @@
  #define CLOCK_LOCAL 1
  
  /* Meinberg clocks */
 -/* #undef CLOCK_MEINBERG */
 +#define CLOCK_MEINBERG 1
  
  /* Magnavox MX4200 GPS receiver */
  /* #undef CLOCK_MX4200 */
 
 Modified: head/usr.sbin/ntp/libparse/Makefile
 ==============================================================================
 --- head/usr.sbin/ntp/libparse/Makefile	Wed Oct  2 20:44:36 2013	(r256008)
 +++ head/usr.sbin/ntp/libparse/Makefile	Wed Oct  2 21:47:25 2013	(r256009)
 @@ -9,7 +9,7 @@ SRCS=	clk_computime.c	clk_dcf7000.c	clk_
  	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}/../
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
