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

diff --git a/contrib/ntp/tests/libntp/g_calyearstart.cpp b/contrib/ntp/tests/libntp/g_calyearstart.cpp
deleted file mode 100644
index 59859be..0000000
--- a/contrib/ntp/tests/libntp/g_calyearstart.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "g_libntptest.h"
-
-class calyearstartTest : public libntptest {
-protected:
-	virtual void SetUp();
-	virtual void TearDown();
-};
-
-void calyearstartTest::SetUp()
-{
-    ntpcal_set_timefunc(timefunc);
-    settime(1970, 1, 1, 0, 0, 0);
-}
-
-void calyearstartTest::TearDown()
-{
-    ntpcal_set_timefunc(NULL);
-}
-
-
-TEST_F(calyearstartTest, NoWrapInDateRange) {
-	const u_int32 input = 3486372600UL; // 2010-06-24 12:50:00.
-	const u_int32 expected = 3471292800UL; // 2010-01-01 00:00:00
-
-	EXPECT_EQ(expected, calyearstart(input, &nowtime));
-	EXPECT_EQ(expected, calyearstart(input, NULL));
-}
-
-TEST_F(calyearstartTest, NoWrapInDateRangeLeapYear) {
-	const u_int32 input = 3549528000UL; // 2012-06-24 12:00:00
-	const u_int32 expected = 3534364800UL; // 2012-01-01 00:00:00
-
-	EXPECT_EQ(expected, calyearstart(input, &nowtime));
-	EXPECT_EQ(expected, calyearstart(input, NULL));
-}
-
-TEST_F(calyearstartTest, WrapInDateRange) {
-	const u_int32 input = 19904UL; // 2036-02-07 12:00:00
-	const u_int32 expected = 4291747200UL; // 2036-01-01 00:00:00
-
-	EXPECT_EQ(expected, calyearstart(input, &nowtime));
-	EXPECT_EQ(expected, calyearstart(input, NULL));
-}