From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 23 May 2009 03:49:43 +0000 (+0000)
Subject: [packages] ntpd: update to v4.2.4p7
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=9d5b101c497525f11b45fcf6807e8bd8f4e8cd3a

[packages] ntpd: update to v4.2.4p7


SVN-Revision: 16010
---

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 0063289ed1..bfe516f511 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
-PKG_VERSION:=4.2.4p6
-PKG_RELEASE:=3
+PKG_VERSION:=4.2.4p7
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
-PKG_MD5SUM:=1961c2c12b66b9046d5df37d0a41b181
+PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
+PKG_MD5SUM:=8c19ff62ed4f7d64f8e2aa59cb11f364
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libelf
diff --git a/net/ntpd/patches/100-ntpd_nmea.patch b/net/ntpd/patches/100-ntpd_nmea.patch
index 38c8fba3e8..d2b7a5be63 100644
--- a/net/ntpd/patches/100-ntpd_nmea.patch
+++ b/net/ntpd/patches/100-ntpd_nmea.patch
@@ -1,7 +1,6 @@
-diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock_nmea.c
---- ntp-4.2.2p4.orig/ntpd/refclock_nmea.c	2006-06-06 22:16:53.000000000 +0200
-+++ ntp-4.2.2p4.mash/ntpd/refclock_nmea.c	2006-12-13 16:22:26.000000000 +0100
-@@ -16,6 +16,7 @@
+--- a/ntpd/refclock_nmea.c
++++ b/ntpd/refclock_nmea.c
+@@ -11,6 +11,7 @@
  
  #include <stdio.h>
  #include <ctype.h>
@@ -9,7 +8,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  
  #include "ntpd.h"
  #include "ntp_io.h"
-@@ -72,6 +72,7 @@
+@@ -72,6 +73,7 @@ extern int async_write(int, const void *
  #define RANGEGATE	500000	/* range gate (ns) */
  
  #define LENNMEA		75	/* min timecode length */
@@ -17,7 +16,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  
  /*
   * Tables to compute the ddd of year form icky dd/mm timecode. Viva la
-@@ -92,6 +93,7 @@ struct nmeaunit {
+@@ -92,6 +94,7 @@ struct nmeaunit {
  	pps_params_t pps_params; /* pps parameters */
  	pps_info_t pps_info;	/* last pps data */
  	pps_handle_t handle;	/* pps handlebars */
@@ -25,7 +24,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  #endif /* HAVE_PPSAPI */
  };
  
-@@ -140,7 +142,12 @@ nmea_start(
+@@ -140,7 +143,12 @@ nmea_start(
  	register struct nmeaunit *up;
  	struct refclockproc *pp;
  	int fd;
@@ -38,7 +37,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  
  	/*
  	 * Open serial port. Use CLK line discipline, if available.
-@@ -225,18 +232,42 @@ nmea_start(
+@@ -225,18 +233,42 @@ nmea_start(
  	memcpy((char *)&pp->refid, REFID, 4);
  	up->pollcnt = 2;
  	gps_send(pp->io.fd,"$PMOTG,RMC,0000*1D\r\n", peer);
@@ -82,7 +81,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  	return(nmea_ppsapi(peer, 0, 0));
  #else
  	return (1);
-@@ -258,8 +289,10 @@ nmea_shutdown(
+@@ -258,8 +290,10 @@ nmea_shutdown(
  	pp = peer->procptr;
  	up = (struct nmeaunit *)pp->unitptr;
  #ifdef HAVE_PPSAPI
@@ -94,7 +93,7 @@ diff -Naurp ntp-4.2.2p4.orig/ntpd/refclock_nmea.c ntp-4.2.2p4.mash/ntpd/refclock
  #endif /* HAVE_PPSAPI */
  	io_closeclock(&pp->io);
  	free(up);
-@@ -367,7 +400,7 @@ nmea_pps(
+@@ -367,7 +401,7 @@ nmea_pps(
  	/*
  	 * Convert the timespec nanoseconds field to ntp l_fp units.
  	 */