20472041 problem in SERVICE/NTP
authorBrian Utterback <brian.utterback@oracle.com>
Fri, 20 Feb 2015 11:48:36 -0800
changeset 3839 dece34b8bbeb
parent 3838 43d6e6bfc498
child 3840 39959a8e7a76
20472041 problem in SERVICE/NTP
components/ntp/Makefile
components/ntp/patches/10-etcfix.patch
components/ntp/patches/92-in6.patch
--- a/components/ntp/Makefile	Fri Feb 20 10:46:39 2015 -0800
+++ b/components/ntp/Makefile	Fri Feb 20 11:48:36 2015 -0800
@@ -27,15 +27,17 @@
 
 COMPONENT_NAME=		ntp
 COMPONENT_VERSION=	4.2.8
-HUMAN_VERSION=		$(COMPONENT_VERSION)
-IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION)
+COMPONENT_PATCH_VERSION=	1
+COMPONENT_RC_VERSION=	1
+HUMAN_VERSION=		$(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
+IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
 COMPONENT_PROJECT_URL=	http://www.ntp.org/
 COMPONENT_SRC_NAME=	ntp
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	 \
-    sha256:2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee
-COMPONENT_ARCHIVE_URL=	http://archive.ntp.org/ntp4/$(COMPONENT_ARCHIVE)
+    sha256:948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88
+COMPONENT_ARCHIVE_URL=	http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB= service/ntp
 
 TPNO=			20866
--- a/components/ntp/patches/10-etcfix.patch	Fri Feb 20 10:46:39 2015 -0800
+++ b/components/ntp/patches/10-etcfix.patch	Fri Feb 20 11:48:36 2015 -0800
@@ -37,14 +37,14 @@
  # else
  #define KEYFILE 	"%windir%\\ntp.keys"
  # endif /* SYS_WINNT */
---- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
-+++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
[email protected]@ -1210,7 +1210,7 @@
+--- ntpd/refclock_oncore.c
++++ ntpd/refclock_oncore.c
[email protected]@ -1211,7 +1211,7 @@ oncore_read_config(
  
  	FILE	*fd;
- 	char	*cp, *cc, *ca, line[100], units[2], device[64], **cpp;
--	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
-+	char	*dirs[] = { "/etc/inet", "/etc", 0 };
+ 	char	*cc, *ca, line[100], units[2], device[64];
+-	const char	*dirs[] = { "/etc/ntp", "/etc", 0 };
++	const char	*dirs[] = { "/etc/inet/ntp", "/etc/inet", 0 };
+ 	const char *cp, **cpp;
  	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
  	double	f1, f2, f3;
- 
--- a/components/ntp/patches/92-in6.patch	Fri Feb 20 10:46:39 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-The bug for this issue is NTP community bug 2707. This patch has been
-submitted to the community. This patch may be removed when NTP is 
-upgraded to any version that has bug 2702 fixed in it.
-
---- ntpd/ntp_io.c
-+++ ntpd/ntp_io.c
[email protected]@ -3450,19 +3450,18 @@ read_network_packet(
- 	*/
- 
- 	// temporary hack...
--#ifndef HAVE_SOLARIS_PRIVS
- 	if (AF_INET6 == itf->family) {
- 		DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
- 			stoa(&rb->recv_srcadr),
--			IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr),
-+			IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr),
- 			stoa(&itf->sin),
--			!IN6_IS_ADDR_LOOPBACK(&itf->sin)
-+			!IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
- 			));
- 	}
- 
- 	if (   AF_INET6 == itf->family
--	    && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr)
--	    && !IN6_IS_ADDR_LOOPBACK(&itf->sin)
-+	    && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr)
-+	    && !IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
- 	   ) {
- 		packets_dropped++;
- 		DPRINTF(1, ("DROPPING that packet\n"));
[email protected]@ -3470,7 +3469,6 @@ read_network_packet(
- 		return buflen;
- 	}
- 	DPRINTF(1, ("processing that packet\n"));
--#endif
- 
- 	/*
- 	 * Got one.  Mark how and when it got here,