Update 4.2.6p5 --> 4.2.8

Security:	VUXML: 4033d826-87dd-11e4-9079-3c970e169bc2
Security:	http://www.kb.cert.org/vuls/id/852879
Security:	CVE-2014-9293
Security	CVE-2014-9294
Security	CVE-2014-9295
Security	CVE-2014-9296

4 files changed, 28 insertions, 52 deletions

diff --git a/net/ntp/files/patch-include__ntp_net.h b/net/ntp/files/patch-include__ntp_net.h
new file mode 100644
index 000000000000..e431baf24eb2
--- /dev/null
+++ b/net/ntp/files/patch-include__ntp_net.h
@@ -0,0 +1,28 @@
+--- include/ntp_net.h.orig	2014-12-19 03:56:52.000000000 -0800
++++ include/ntp_net.h	2014-12-19 16:21:51.050264459 -0800
+@@ -5,6 +5,11 @@
+ #ifndef NTP_NET_H
+ #define NTP_NET_H
+ 
++/* XXX obtained from /usr/include/netinet6/in6.h */
++#define s6_addr8  __u6_addr.__u6_addr8
++#define s6_addr16 __u6_addr.__u6_addr16
++#define s6_addr32 __u6_addr.__u6_addr32
++
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+@@ -29,6 +34,13 @@
+ 	struct sockaddr		sa;
+ 	struct sockaddr_in	sa4;
+ 	struct sockaddr_in6	sa6;
++/* XXX obtained from /usr/include/netinet6/in6.h */
++	union {
++		uint8_t         __u6_addr8[16];
++		uint16_t        __u6_addr16[8];
++		uint32_t        __u6_addr32[4];
++	} __u6_addr;                    /* 128-bit IP6 address */
++
+ } sockaddr_u;
+ 
+ /*
diff --git a/net/ntp/files/patch-ntpd-ntp_io.c b/net/ntp/files/patch-ntpd-ntp_io.c
deleted file mode 100644
index cdf1eada580f..000000000000
--- a/net/ntp/files/patch-ntpd-ntp_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ntpd/ntp_io.c.orig	2010-06-03 20:24:51.000000000 -0700
-+++ ntpd/ntp_io.c	2010-06-03 20:27:36.000000000 -0700
-@@ -1414,12 +1414,18 @@
- 	sockaddr_u *psau
- 	)
- {
-+	unsigned char zerobuf[8];
-+
- 	if (IS_IPV4(psau) && !NSRCADR(psau))
- 		return 1;
- 
- #ifdef INCLUDE_IPV6_SUPPORT
- 	if (IS_IPV6(psau) && S_ADDR6_EQ(psau, &in6addr_any))
- 		return 1;
-+	bzero(zerobuf, sizeof(zerobuf));
-+	// If the host portion is all 0, then assume it's a router's anycast address.
-+	if (IS_IPV6(psau) && memcmp((char*)(&((struct sockaddr_in6*)psau)->sin6_addr) + 8, zerobuf, 8) == 0)
-+		return 1;
- #endif
- 
- 	return 0;
diff --git a/net/ntp/files/patch-ntpd-ntp_request.c b/net/ntp/files/patch-ntpd-ntp_request.c
deleted file mode 100644
index 5ecaf67993ad..000000000000
--- a/net/ntp/files/patch-ntpd-ntp_request.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ntpd/ntp_request.c.orig	2011-11-30 18:55:17.000000000 -0800
-+++ ntpd/ntp_request.c	2014-10-06 17:07:02.570303970 -0700
-@@ -1956,7 +1956,6 @@
- 	    printf("wants monitor 0 list\n");
- #endif
- 	if (!mon_enabled) {
--		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- 		return;
- 	}
- 	im = (struct info_monitor *)prepare_pkt(srcadr, inter, inpkt,
-@@ -2002,7 +2001,6 @@
- 	extern int mon_enabled;
- 
- 	if (!mon_enabled) {
--		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- 		return;
- 	}
- 	im = (struct info_monitor_1 *)prepare_pkt(srcadr, inter, inpkt,
diff --git a/net/ntp/files/patch-ntpd-ntpd.c b/net/ntp/files/patch-ntpd-ntpd.c
deleted file mode 100644
index 2b1614ffe6c6..000000000000
--- a/net/ntp/files/patch-ntpd-ntpd.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ntpd/ntpd.c.orig	2011-12-24 15:27:15.000000000 -0800
-+++ ntpd/ntpd.c	2014-10-06 17:04:57.760219124 -0700
-@@ -853,8 +853,8 @@
- 	init_proto();		/* Call at high priority */
- 	init_io();
- 	init_loopfilter();
--	mon_start(MON_ON);	/* monitor on by default now	  */
--				/* turn off in config if unwanted */
-+	mon_start(MON_OFF);	/* monitor off by default now	  */
-+				/* turn on in config if wanted */
- 
- 	/*
- 	 * Get the configuration.  This is done in a separate module