components/ntp/patches/10-etcfix.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 7804 d4f2d5f40cf9
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
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
--- 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 @@
 
 #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
+++ ntpd/refclock_oncore.c
@@ -1211,7 +1211,7 @@ oncore_read_config(
 
 	FILE	*fd;
 	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;