Upgrade NTP to 4.2.8p4.

Security:	FreeBSD-SA-15:25.ntp
Security:	CVE-2015-7871
Security:	CVE-2015-7855
Security:	CVE-2015-7854
Security:	CVE-2015-7853
Security:	CVE-2015-7852
Security:	CVE-2015-7851
Security:	CVE-2015-7850
Security:	CVE-2015-7849
Security:	CVE-2015-7848
Security:	CVE-2015-7701
Security:	CVE-2015-7703
Security:	CVE-2015-7704, CVE-2015-7705
Security:	CVE-2015-7691, CVE-2015-7692, CVE-2015-7702

1 files changed, 0 insertions, 52 deletions

diff --git a/contrib/ntp/tests/libntp/g_refnumtoa.cpp b/contrib/ntp/tests/libntp/g_refnumtoa.cpp
deleted file mode 100644
index 91648aa..0000000
--- a/contrib/ntp/tests/libntp/g_refnumtoa.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "g_libntptest.h"
-
-#include "ntp_net.h"
-#include "ntp_refclock.h"
-
-#include <sstream>
-
-class refnumtoaTest : public libntptest {
-protected:
-	/* Might need to be updated if a new refclock gets this id. */
-	static const int UNUSED_REFCLOCK_ID = 250;
-};
-
-#ifdef REFCLOCK		/* clockname() is useless otherwise */
-TEST_F(refnumtoaTest, LocalClock) {
-	/* We test with a refclock address of type LOCALCLOCK.
-	 * with id 8
-	 */
-	u_int32 addr = REFCLOCK_ADDR;
-	addr |= REFCLK_LOCALCLOCK << 8;
-	addr |= 0x8;
-
-	sockaddr_u address;
-	address.sa4.sin_family = AF_INET;
-	address.sa4.sin_addr.s_addr = htonl(addr);
-
-	std::ostringstream expected;
-	expected << clockname(REFCLK_LOCALCLOCK)
-			 << "(8)";
-
-	EXPECT_STREQ(expected.str().c_str(), refnumtoa(&address));
-}
-#endif	/* REFCLOCK */
-
-#ifdef REFCLOCK		/* refnumtoa() is useless otherwise */
-TEST_F(refnumtoaTest, UnknownId) {
-	/* We test with a currently unused refclock ID */
-	u_int32 addr = REFCLOCK_ADDR;
-	addr |= UNUSED_REFCLOCK_ID << 8;
-	addr |= 0x4;
-
-	sockaddr_u address;
-	address.sa4.sin_family = AF_INET;
-	address.sa4.sin_addr.s_addr = htonl(addr);
-
-	std::ostringstream expected;
-	expected << "REFCLK(" << UNUSED_REFCLOCK_ID
-			 << ",4)";
-
-	EXPECT_STREQ(expected.str().c_str(), refnumtoa(&address));
-}
-#endif	/* REFCLOCK */