components/ntp/patches/10-etcfix.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 10 Feb 2016 11:54:12 -0800
changeset 5434 9f55c805ce9d
parent 3839 dece34b8bbeb
child 7804 d4f2d5f40cf9
permissions -rw-r--r--
PSARC/2013/188 Clang/LLVM 15777690 clang/llvm compiler infrastructure in Solaris 21851513 severe memory corruption in the LLVM command-line parsing module 22031298 toxic bugs in LLVM ilist/plist end up eliminating entire MachineBasicBlocks 22065707 LLVM SPARC assembler generator emits wrong ELF Section flags 22346218 LLVM's assembler printer on SPARC needs a lot of work 21870061 partial template specializations in CommandLine.h are buggy 21874261 the Google Test Harness doesn't know how to count threads in Solaris 21697459 memory corruption in LLVM IR Code Generator 21341968 llc on SPARC should not need to be passed -march=sparc or -march=sparcv9 21870103 TableGen makes incorrect assumptions about anonymous namespace instantiation 21870087 naming convention for the InputFile key is inconsistent across LLVM utilities 21870099 128 bytes for a filesystem path is definitely not enough 21870067 lli makes incorrect assumptions about anonymous namespace instantiation order 21870065 llc makes incorrect assumptions about anonymous namespace instantiation order 21870283 llvm::sys::Process::GetArgumentVector should overload for std::vector 21874221 clang C++ does not properly initialize the C++ Standard Library's iostreams
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 */
3839
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    40
--- ntpd/refclock_oncore.c
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    41
+++ ntpd/refclock_oncore.c
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    42
@@ -1211,7 +1211,7 @@ oncore_read_config(
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;
3839
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    45
 	char	*cc, *ca, line[100], units[2], device[64];
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    46
-	const char	*dirs[] = { "/etc/ntp", "/etc", 0 };
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    47
+	const char	*dirs[] = { "/etc/inet/ntp", "/etc/inet", 0 };
dece34b8bbeb 20472041 problem in SERVICE/NTP
Brian Utterback <brian.utterback@oracle.com>
parents: 1467
diff changeset
    48
 	const char *cp, **cpp;
172
093198acf7d4 7018272 Move NTP to userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    49
 	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
    50
 	double	f1, f2, f3;