--- a/components/ntp/Makefile Sun Mar 26 13:26:42 2017 -0700
+++ b/components/ntp/Makefile Mon Mar 27 14:27:31 2017 -0700
@@ -27,7 +27,7 @@
COMPONENT_NAME= ntp
COMPONENT_VERSION= 4.2.8
-COMPONENT_PATCH_VERSION= 9
+COMPONENT_PATCH_VERSION= 10
COMPONENT_RC_VERSION= 1
HUMAN_VERSION= $(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
@@ -35,7 +35,7 @@
COMPONENT_SRC_NAME= ntp
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE_HASH= \
- sha256:b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72
+ sha256:ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f
COMPONENT_ARCHIVE_URL= http://archive.ntp.org/ntp4/ntp-4.2/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= service/ntp
COMPONENT_ANITYA_ID= 9025
--- a/components/ntp/patches/10-etcfix.patch Sun Mar 26 13:26:42 2017 -0700
+++ b/components/ntp/patches/10-etcfix.patch Mon Mar 27 14:27:31 2017 -0700
@@ -15,17 +15,25 @@
# else /* SYS_WINNT */
# define CONFIG_FILE "%windir%\\system32\\drivers\\etc\\ntp.conf"
# define ALT_CONFIG_FILE "%windir%\\ntp.conf"
---- libntp/audio.c.orig Thu May 14 06:34:41 2009
-+++ libntp/audio.c Thu May 14 06:15:12 2009
-@@ -53,7 +53,7 @@
- static struct audio_device device; /* audio device ident */
- #endif /* HAVE_SYS_AUDIOIO_H */
- #ifdef PCM_STYLE_SOUND
--# define INIT_FILE "/etc/ntp.audio"
-+# define INIT_FILE "/etc/inet/ntp.audio"
- int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
- int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
- int devmask = 0;
+*** 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 @@
--- a/components/ntp/test/results-64.master Sun Mar 26 13:26:42 2017 -0700
+++ b/components/ntp/test/results-64.master Mon Mar 27 14:27:31 2017 -0700
@@ -144,9 +144,9 @@
OK
PASS test-packetProcessing (exit status: 0)
-========================================
+=========================================
sntp : tests/test-suite.log
-========================================
+=========================================
# TOTAL: 9
# PASS: 9
@@ -176,9 +176,9 @@
OK
PASS test-utilities (exit status: 0)
-================================================
+=================================================
ntp : tests/bug-2803/test-suite.log
-================================================
+=================================================
# TOTAL: 1
# PASS: 1
@@ -694,9 +694,9 @@
OK
PASS test-strtolfp (exit status: 0)
-==============================================
+===============================================
ntp : tests/libntp/test-suite.log
-==============================================
+===============================================
# TOTAL: 39
# PASS: 39
@@ -1448,9 +1448,9 @@
OK
PASS test-rc_cmdlength (exit status: 0)
-============================================
+=============================================
ntp : tests/ntpd/test-suite.log
-============================================
+=============================================
# TOTAL: 4
# PASS: 4
@@ -1474,9 +1474,9 @@
OK
PASS test-ntpq (exit status: 0)
-============================================
+=============================================
ntp : tests/ntpq/test-suite.log
-============================================
+=============================================
# TOTAL: 1
# PASS: 1
@@ -1488,9 +1488,9 @@
.. contents:: :depth: 2
-===============================================
+================================================
ntp : tests/sandbox/test-suite.log
-===============================================
+================================================
# TOTAL: 2
# PASS: 2
@@ -1502,9 +1502,9 @@
.. contents:: :depth: 2
-================================================
+=================================================
ntp : tests/sec-2853/test-suite.log
-================================================
+=================================================
# TOTAL: 1
# PASS: 1
@@ -2861,8 +2861,7 @@
/* Should we align with the NIST lockclock scheme? */
/* #undef LOCKCLOCK */
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
/* Does the target support multicast IP? */
@@ -2914,9 +2913,6 @@
/* Should we NOT read /dev/kmem? */
#define NOKMEM 1
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
/* Should we avoid #warning on option name collisions? */
/* #undef NO_OPTION_NAME_WARNINGS */