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, 64 deletions

diff --git a/contrib/ntp/tests/libntp/g_vi64ops.cpp b/contrib/ntp/tests/libntp/g_vi64ops.cpp
deleted file mode 100644
index 29f7932..0000000
--- a/contrib/ntp/tests/libntp/g_vi64ops.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "g_libntptest.h"
-
-extern "C" {
-#include "vint64ops.h"
-}
-
-class vi64Test : public libntptest {
-public:
-	::testing::AssertionResult IsEqual(const vint64 &expected, const vint64 &actual) {
-		if (0 == memcmp(&expected, &actual, sizeof(vint64))) {
-			return ::testing::AssertionSuccess();
-		} else {
-			return ::testing::AssertionFailure()
-			    << "expected: "
-			    << std::hex << expected.D_s.hi << '.'
-			    << std::hex << expected.D_s.lo
-			    << " but was "
-			    << std::hex << actual.D_s.hi << '.'
-			    << std::hex << actual.D_s.lo;
-		}
-	}
-};
-
-// ----------------------------------------------------------------------
-// test number parser
-TEST_F(vi64Test, ParseVUI64_pos) {
-	vint64 act, exp;
-	const char *sp;
-	char       *ep;
-
-	sp         = "1234x";
-	exp.D_s.hi = 0;
-	exp.D_s.lo = 1234;
-	act        = strtouv64(sp, &ep, 0);
-	EXPECT_TRUE(IsEqual(exp, act));
-	EXPECT_EQ(*ep, 'x');
-}
-
-TEST_F(vi64Test, ParseVUI64_neg) {
-	vint64 act, exp;
-	const char *sp;
-	char       *ep;
-
-	sp         = "-1234x";
-	exp.D_s.hi = ~0;
-	exp.D_s.lo = -1234;
-	act        = strtouv64(sp, &ep, 0);
-	EXPECT_TRUE(IsEqual(exp, act));
-	EXPECT_EQ(*ep, 'x');
-}
-
-TEST_F(vi64Test, ParseVUI64_case) {
-	vint64 act, exp;
-	const char *sp;
-	char       *ep;
-
-	sp         = "0123456789AbCdEf";
-	exp.D_s.hi = 0x01234567;
-	exp.D_s.lo = 0x89ABCDEF;
-	act        = strtouv64(sp, &ep, 16);
-	EXPECT_TRUE(IsEqual(exp, act));
-	EXPECT_EQ(*ep, '\0');
-}
-