usr/src/cmd/ntpd/Patches/10-etcfix.patch
author Jon Tibble <meths@btinternet.com>
Fri, 17 Jan 2014 19:32:42 +0000
branchoi_151a
changeset 252 600924158051
permissions -rw-r--r--
Bump ntpd to 4.2.7p411
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
252
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     1
This patch does the customization for the Solaris way
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     2
of installing things. There is a method for doing this
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     3
with the configure scripts, but these last few file
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     4
paths have not been converted. When they are, this patch
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     5
can go away.
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     6
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     7
--- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     8
+++ include/ntp_config.h	Thu May 14 06:15:12 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     9
@@ -10,7 +10,7 @@
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    10
  */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    11
 #ifndef CONFIG_FILE
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    12
 # ifndef SYS_WINNT
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    13
-#  define	CONFIG_FILE "/etc/ntp.conf"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    14
+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    15
 # else /* SYS_WINNT */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    16
 #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    17
 #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    18
--- libntp/audio.c.orig	Thu May 14 06:34:41 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    19
+++ libntp/audio.c	Thu May 14 06:15:12 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    20
@@ -53,7 +53,7 @@
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    21
 static struct audio_device device; /* audio device ident */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    22
 #endif /* HAVE_SYS_AUDIOIO_H */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    23
 #ifdef PCM_STYLE_SOUND
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    24
-# define INIT_FILE "/etc/ntp.audio"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    25
+# define INIT_FILE "/etc/inet/ntp.audio"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    26
 int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    27
 int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    28
 int devmask = 0;
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    29
--- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    30
+++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    31
@@ -179,7 +179,7 @@
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    32
 
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    33
 #ifndef KEYFILE
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    34
 # ifndef SYS_WINNT
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    35
-#define KEYFILE 	"/etc/ntp.keys"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    36
+#define KEYFILE 	"/etc/inet/ntp.keys"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    37
 # else
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    38
 #define KEYFILE 	"%windir%\\ntp.keys"
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    39
 # endif /* SYS_WINNT */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    40
--- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    41
+++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    42
@@ -1210,7 +1210,7 @@
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    43
 
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    44
 	FILE	*fd;
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    45
 	char	*cp, *cc, *ca, line[100], units[2], device[64], **cpp;
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    46
-	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    47
+	char	*dirs[] = { "/etc/inet", "/etc", 0 };
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    48
 	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    49
 	double	f1, f2, f3;
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    50