ntp upgrade (including security fixes)

deleted file mode 100644
index ddcb044..0000000
@@ -1,112 +0,0 @@
-ntp: fix CVE-2013-5211
-
-Upstream-status: Backport
-
-The monlist feature in ntp_request.c in ntpd in NTP before
-4.2.7p26 allows remote attackers to cause a denial of service
-(traffic amplification) via forged (1) REQ_MON_GETLIST or
-(2) REQ_MON_GETLIST_1 requests, as exploited in the wild
-in December 2013.
-
-Signed-off-by: Zhang Xiao <[email protected]>
-
---- a/ntpd/ntp_request.c
-+++ b/ntpd/ntp_request.c
-@@ -1912,44 +1912,11 @@ mon_getlist_0(
- 	struct req_pkt *inpkt
- 	)
- {
--	register struct info_monitor *im;
--	register struct mon_data *md;
--	extern struct mon_data mon_mru_list;
--	extern int mon_enabled;
--
- #ifdef DEBUG
- 	if (debug > 2)
- 	    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,
--	    v6sizeof(struct info_monitor));
--	for (md = mon_mru_list.mru_next; md != &mon_mru_list && im != 0;
--	     md = md->mru_next) {
--		im->lasttime = htonl((u_int32)((current_time -
--		    md->firsttime) / md->count));
--		im->firsttime = htonl((u_int32)(current_time - md->lasttime));
--		im->restr = htonl((u_int32)md->flags);
--		im->count = htonl((u_int32)(md->count));
--		if (IS_IPV6(&md->rmtadr)) {
--			if (!client_v6_capable)
--				continue;
--			im->addr6 = SOCK_ADDR6(&md->rmtadr);
--			im->v6_flag = 1;
--		} else {
--			im->addr = NSRCADR(&md->rmtadr);
--			if (client_v6_capable)
--				im->v6_flag = 0;
--		}
--		im->port = md->rmtport;
--		im->mode = md->mode;
--		im->version = md->version;
--		im = (struct info_monitor *)more_pkt();
--	}
--	flush_pkt();
-+	req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- }
- 
- /*
-@@ -1962,50 +1929,7 @@ mon_getlist_1(
- 	struct req_pkt *inpkt
- 	)
- {
--	register struct info_monitor_1 *im;
--	register struct mon_data *md;
--	extern struct mon_data mon_mru_list;
--	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,
--	    v6sizeof(struct info_monitor_1));
--	for (md = mon_mru_list.mru_next; md != &mon_mru_list && im != 0;
--	     md = md->mru_next) {
--		im->lasttime = htonl((u_int32)((current_time -
--		    md->firsttime) / md->count));
--		im->firsttime = htonl((u_int32)(current_time - md->lasttime));
--		im->restr = htonl((u_int32)md->flags);
--		im->count = htonl((u_int32)md->count);
--		if (IS_IPV6(&md->rmtadr)) {
--			if (!client_v6_capable)
--				continue;
--			im->addr6 = SOCK_ADDR6(&md->rmtadr);
--			im->v6_flag = 1;
--			im->daddr6 = SOCK_ADDR6(&md->interface->sin);
--		} else {
--			im->addr = NSRCADR(&md->rmtadr);
--			if (client_v6_capable)
--				im->v6_flag = 0;
--			if (MDF_BCAST == md->cast_flags)
--				im->daddr = NSRCADR(&md->interface->bcast);
--			else if (md->cast_flags) {
--				im->daddr = NSRCADR(&md->interface->sin);
--				if (!im->daddr)
--					im->daddr = NSRCADR(&md->interface->bcast);
--			} else
--				im->daddr = 4;
--		}
--		im->flags = htonl(md->cast_flags);
--		im->port = md->rmtport;
--		im->mode = md->mode;
--		im->version = md->version;
--		im = (struct info_monitor_1 *)more_pkt();
--	}
--	flush_pkt();
-+	req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- }
- 
- /*

59 lines not on this page · raw message

deleted file mode 100644
index 9ef9de9..0000000
@@ -1,32 +0,0 @@
-Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
-===================================================================
---- ntp-4.2.2p3/util/tickadj.c	2004-02-25 06:58:33.000000000 +0100
-+++ ntp-4.2.2p3/util/tickadj.c	2007-07-07 01:00:54.000000000 +0200
-@@ -21,7 +21,8 @@
- # include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
--#ifdef HAVE___ADJTIMEX		/* Linux */
-+/* proper handling here has been moved to upstream ntp bugzilla */
-+#ifdef linux
- 
- #include <sys/timex.h>
- struct timex txc;
-@@ -91,7 +92,7 @@
- 	}
- 
- 	if (!errflg) {
--		if (__adjtimex(&txc) < 0)
-+		if (adjtimex(&txc) < 0)
- 			perror("adjtimex");
- 		else if (!quiet)
- 			printf("tick     = %ld\ntick_adj = %d\n",
-@@ -146,7 +147,7 @@
- #endif
- 	}
-     
--	if (__adjtimex(&txc) < 0)
-+	if (adjtimex(&txc) < 0)
- 	{
- 		perror("adjtimex");
- 	}

similarity index 100%
rename from meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
rename to meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch

168 lines not on this page · raw message

similarity index 100%
rename from meta-networking/recipes-support/ntp/files/ntp.conf
rename to meta-networking/recipes-support/ntp/ntp/ntp.conf

similarity index 100%
rename from meta-networking/recipes-support/ntp/files/ntpd
rename to meta-networking/recipes-support/ntp/ntp/ntpd

similarity index 100%
rename from meta-networking/recipes-support/ntp/files/ntpdate
rename to meta-networking/recipes-support/ntp/ntp/ntpdate

similarity index 100%
rename from meta-networking/recipes-support/ntp/files/ntpdate.default
rename to meta-networking/recipes-support/ntp/ntp/ntpdate.default

deleted file mode 100644
index 588a1b0..0000000
@@ -1,6 +0,0 @@
-require ntp.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
-SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"

88 lines not on this page · raw message