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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1467
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     1
This patch does the customization for the Solaris way
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     2
of installing things. There is a method for doing this
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     3
with the configure scripts, but these last few file
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     4
paths have not been converted. When they are, this patch
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     5
can go away.
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     6
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     7
--- 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
     8
+++ 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
     9
@@ -10,7 +10,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    10
  */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    11
 #ifndef CONFIG_FILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    12
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    13
-#  define	CONFIG_FILE "/etc/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    14
+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    15
 # else /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    16
 #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    17
 #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    18
--- 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
    19
+++ 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
    20
@@ -53,7 +53,7 @@
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    21
 static struct audio_device device; /* audio device ident */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    22
 #endif /* HAVE_SYS_AUDIOIO_H */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    23
 #ifdef PCM_STYLE_SOUND
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    24
-# define INIT_FILE "/etc/ntp.audio"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    25
+# define INIT_FILE "/etc/inet/ntp.audio"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    26
 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
    27
 int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    28
 int devmask = 0;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    29
--- 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
    30
+++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
1467
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    31
@@ -179,7 +179,7 @@
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    32
 
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    33
 #ifndef KEYFILE
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    34
 # ifndef SYS_WINNT
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    35
-#define KEYFILE 	"/etc/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    36
+#define KEYFILE 	"/etc/inet/ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    37
 # else
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    38
 #define KEYFILE 	"%windir%\\ntp.keys"
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    39
 # endif /* SYS_WINNT */
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    40
--- 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
    41
+++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
1467
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    42
@@ -1210,7 +1210,7 @@
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    43
 
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    44
 	FILE	*fd;
1467
f14b6c5766ca 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    45
 	char	*cp, *cc, *ca, line[100], units[2], device[64], **cpp;
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    46
-	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    47
+	char	*dirs[] = { "/etc/inet", "/etc", 0 };
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    48
 	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
    49
 	double	f1, f2, f3;
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    50