25753005 Upgrade NTP to version 4.2.8p10 s11u3-sru
authorBrian Utterback <brian.utterback@oracle.com>
Mon, 27 Mar 2017 14:39:40 -0700
branchs11u3-sru
changeset 7873 7e3686e70bb8
parent 7872 aa4e61b4b594
child 7874 97b612ab3f39
25753005 Upgrade NTP to version 4.2.8p10 25742867 problem in SERVICE/NTP
components/ntp/Makefile
components/ntp/patches/10-etcfix.patch
--- a/components/ntp/Makefile	Thu Mar 23 16:36:09 2017 +0000
+++ b/components/ntp/Makefile	Mon Mar 27 14:39:40 2017 -0700
@@ -27,7 +27,7 @@
 
 COMPONENT_NAME=		ntp
 COMPONENT_VERSION=	4.2.8
-COMPONENT_PATCH_VERSION=	9
+COMPONENT_PATCH_VERSION=	10
 COMPONENT_RC_VERSION=	1
 HUMAN_VERSION=		$(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
@@ -36,7 +36,7 @@
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	 \
-    sha256:b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72
+    sha256:ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f
 COMPONENT_ARCHIVE_URL=	http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB= service/ntp
 
--- a/components/ntp/patches/10-etcfix.patch	Thu Mar 23 16:36:09 2017 +0000
+++ b/components/ntp/patches/10-etcfix.patch	Mon Mar 27 14:39:40 2017 -0700
@@ -15,17 +15,25 @@
  # else /* SYS_WINNT */
  #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
  #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
---- libntp/audio.c.orig	Thu May 14 06:34:41 2009
-+++ libntp/audio.c	Thu May 14 06:15:12 2009
[email protected]@ -53,7 +53,7 @@
- static struct audio_device device; /* audio device ident */
- #endif /* HAVE_SYS_AUDIOIO_H */
- #ifdef PCM_STYLE_SOUND
--# define INIT_FILE "/etc/ntp.audio"
-+# define INIT_FILE "/etc/inet/ntp.audio"
- int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
- int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
- int devmask = 0;
+*** libntp/audio.c
+--- libntp/audio.c
+*************** typedef int ioctl_arg_T;
+*** 66,72 ****
+  static struct audio_device device; /* audio device ident */
+  #endif /* HAVE_SYS_AUDIOIO_H */
+  #ifdef PCM_STYLE_SOUND
+! # define INIT_FILE "/etc/ntp.audio"
+  
+  static ioctl_arg_T agc		= SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
+  static ioctl_arg_T audiomonitor	= SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
+--- 66,72 ----
+  static struct audio_device device; /* audio device ident */
+  #endif /* HAVE_SYS_AUDIOIO_H */
+  #ifdef PCM_STYLE_SOUND
+! # define INIT_FILE "/etc/inet/ntp.audio"
+  
+  static ioctl_arg_T agc		= SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
+  static ioctl_arg_T audiomonitor	= SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
 --- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
 +++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
 @@ -179,7 +179,7 @@