Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ntp/patches/etcfix.patch
author Brian Utterback <Brian.Utterback@Oracle.COM>
Fri, 08 Apr 2011 05:28:01 -0700
changeset 172 093198acf7d4
permissions -rw-r--r--
7018272 Move NTP to userland 7034365 NTP html docs is missing tickadj, has duplicate of Interleave Modes instead.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     1
 
--- sntp/header.h.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     2
 
+++ sntp/header.h	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -19,10 +19,10 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     4
 
 #define MAX_SOCKETS        10          /* Maximum number of addresses */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     5
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     6
 
 #ifndef LOCKNAME
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     7
 
-#    define LOCKNAME "/etc/sntp.pid"  /* Stores the pid */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     8
 
+#    define LOCKNAME "/var/run/sntp.pid"  /* Stores the pid */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     9
 
 #endif
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    10
 
 #ifndef SAVENAME
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    11
 
-#    define SAVENAME "/etc/sntp.state" /* Stores the recovery state */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    12
 
+#    define SAVENAME "/var/ntp/sntp.state" /* Stores the recovery state */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    13
 
 #endif
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    14
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    15
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    16
 
--- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    17
 
+++ include/ntp_config.h	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    18
 
@@ -10,7 +10,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    19
 
  */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    20
 
 #ifndef CONFIG_FILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    21
 
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    22
 
-#  define	CONFIG_FILE "/etc/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    23
 
+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    24
 
 # else /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    25
 
 #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    26
 
 #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    27
 
--- libntp/audio.c.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    28
 
+++ libntp/audio.c	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    29
 
@@ -53,7 +53,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    30
 
 static struct audio_device device; /* audio device ident */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    31
 
 #endif /* HAVE_SYS_AUDIOIO_H */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    32
 
 #ifdef PCM_STYLE_SOUND
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    33
 
-# define INIT_FILE "/etc/ntp.audio"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    34
 
+# define INIT_FILE "/etc/inet/ntp.audio"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    35
 
 int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    36
 
 int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    37
 
 int devmask = 0;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    38
 
--- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    39
 
+++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    40
 
@@ -192,7 +192,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    41
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    42
 
 #ifndef KEYFILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    43
 
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    44
 
-#define KEYFILE 	"/etc/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    45
 
+#define KEYFILE 	"/etc/inet/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    46
 
 # else
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    47
 
 #define KEYFILE 	"%windir%\\ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    48
 
 # endif /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    49
 
--- ntpdate/ntptimeset.c.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    50
 
+++ ntpdate/ntptimeset.c	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    51
 
@@ -270,7 +270,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    52
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    53
 
 #ifndef KEYFILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    54
 
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    55
 
-#define KEYFILE 	"/etc/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    56
 
+#define KEYFILE 	"/etc/inet/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    57
 
 # else
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    58
 
 #define KEYFILE 	"%windir%\\ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    59
 
 # endif /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    60
 
--- ntpdate/ntptime_config.c.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    61
 
+++ ntpdate/ntptime_config.c	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    62
 
@@ -37,7 +37,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    63
 
  */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    64
 
 #ifndef CONFIG_FILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    65
 
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    66
 
-#  define	CONFIG_FILE "/etc/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    67
 
+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    68
 
 # else /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    69
 
 #  define	CONFIG_FILE 	"%windir%\\ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    70
 
 #  define	ALT_CONFIG_FILE "%windir%\\ntp.ini"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    71
 
--- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    72
 
+++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    73
 
@@ -1188,7 +1188,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    74
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    75
 
 	FILE	*fd;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    76
 
 	char	*cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    77
 
-	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    78
 
+	char	*dirs[] = { "/etc/inet", "/etc", 0 };
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    79
 
 	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    80
 
 	double	f1, f2, f3;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    81
upstream/oracle/userland-gate