components/ntp/patches/10-etcfix.patch
author Brian Utterback <brian.utterback@oracle.com>
Fri, 16 Aug 2013 06:35:08 -0700
changeset 1467 f14b6c5766ca
parent 172 components/ntp/patches/[email protected]
child 3839 dece34b8bbeb
permissions -rw-r--r--
15705382 SUNBT7031289 Update ntp to 4.2.7 16756358 Enable ASLR for NTP 14932716 SUNBT4031742 /etc/inet/ntp.client should include broadcastclient 15722546 SUNBT7055402 ipmp cause reachability issues for ntp4 daemon 15727250 SUNBT7064417 ntpd errors on some new system 15751447 SUNBT7106031 Solaris 11 restrict noserve doesn't work right 15785388 SUNBT7161189 ntpd starts on S 11 in a forked status with error "ntpd indicates n 15813516 SUNBT7195495 ntpd crashed with SIGFPE (Arithmetic Exception) 16090481 ntp version 4 daemon crashes in isc_interfaceiter_first() 16741686 "ntpd" v4.2.5 cannot accept/query interface names longer than 15 characters. 16978017 ntpd debug in Solaris 11.1does not write any output 17000189 NTP needs to increase its file descriptor limit. 17000601 ntpd should log a message when it exits abnormally.
This patch does the customization for the Solaris way
of installing things. There is a method for doing this
with the configure scripts, but these last few file
paths have not been converted. When they are, this patch
can go away.

--- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
+++ include/ntp_config.h	Thu May 14 06:15:12 2009
@@ -10,7 +10,7 @@
  */
 #ifndef CONFIG_FILE
 # ifndef SYS_WINNT
-#  define	CONFIG_FILE "/etc/ntp.conf"
+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
 # 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
@@ -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;
--- 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 @@
 
 #ifndef KEYFILE
 # ifndef SYS_WINNT
-#define KEYFILE 	"/etc/ntp.keys"
+#define KEYFILE 	"/etc/inet/ntp.keys"
 # 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
@@ -1210,7 +1210,7 @@
 
 	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 };
 	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
 	double	f1, f2, f3;