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

diff --git a/contrib/ntp/tests/libntp/g_decodenetnum.cpp b/contrib/ntp/tests/libntp/g_decodenetnum.cpp
deleted file mode 100644
index 0596428..0000000
--- a/contrib/ntp/tests/libntp/g_decodenetnum.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "g_sockaddrtest.h"
-
-class decodenetnumTest : public sockaddrtest {
-};
-
-TEST_F(decodenetnumTest, IPv4AddressOnly) {
-	const char *str = "192.0.2.1";
-	sockaddr_u actual;
-
-	sockaddr_u expected;
-	expected.sa4.sin_family = AF_INET;
-	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
-	SET_PORT(&expected, NTP_PORT);
-
-	ASSERT_TRUE(decodenetnum(str, &actual));
-	EXPECT_TRUE(IsEqual(expected, actual));
-}
-
-TEST_F(decodenetnumTest, IPv4AddressWithPort) {
-	const char *str = "192.0.2.2:2000";
-	sockaddr_u actual;
-
-	sockaddr_u expected;
-	expected.sa4.sin_family = AF_INET;
-	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.2");
-	SET_PORT(&expected, 2000);
-
-	ASSERT_TRUE(decodenetnum(str, &actual));
-	EXPECT_TRUE(IsEqual(expected, actual));
-}
-
-TEST_F(decodenetnumTest, IPv6AddressOnly) {
-	const struct in6_addr address = {
-		0x20, 0x01, 0x0d, 0xb8,
-        0x85, 0xa3, 0x08, 0xd3, 
-        0x13, 0x19, 0x8a, 0x2e,
-        0x03, 0x70, 0x73, 0x34
-	};
-
-	const char *str = "2001:0db8:85a3:08d3:1319:8a2e:0370:7334";
-	sockaddr_u actual;
-
-	sockaddr_u expected;
-	expected.sa6.sin6_family = AF_INET6;
-	expected.sa6.sin6_addr = address;
-	SET_PORT(&expected, NTP_PORT);
-
-	ASSERT_TRUE(decodenetnum(str, &actual));
-	EXPECT_TRUE(IsEqual(expected, actual));
-}
-
-TEST_F(decodenetnumTest, IPv6AddressWithPort) {
-	const struct in6_addr address = {
-		0x20, 0x01, 0x0d, 0xb8,
-        0x85, 0xa3, 0x08, 0xd3, 
-        0x13, 0x19, 0x8a, 0x2e,
-        0x03, 0x70, 0x73, 0x34
-	};
-
-	const char *str = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334]:3000";
-	sockaddr_u actual;
-
-	sockaddr_u expected;
-	expected.sa6.sin6_family = AF_INET6;
-	expected.sa6.sin6_addr = address;
-	SET_PORT(&expected, 3000);
-
-	ASSERT_TRUE(decodenetnum(str, &actual));
-	EXPECT_TRUE(IsEqual(expected, actual));
-}
-
-TEST_F(decodenetnumTest, IllegalAddress) {
-	const char *str = "192.0.2.270:2000";
-	sockaddr_u actual;
-
-	ASSERT_FALSE(decodenetnum(str, &actual));
-}
-
-TEST_F(decodenetnumTest, IllegalCharInPort) {
-	/* An illegal port does not make the decodenetnum fail, but instead
-	 * makes it use the standard port.
-	 */
-	const char *str = "192.0.2.1:a700";
-	sockaddr_u actual;
-
-	sockaddr_u expected;
-	expected.sa4.sin_family = AF_INET;
-	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
-	SET_PORT(&expected, NTP_PORT);
-
-	ASSERT_TRUE(decodenetnum(str, &actual));
-	EXPECT_TRUE(IsEqual(expected, actual));
-}