AA: busybox: merge r35239
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 19 Jan 2013 10:19:40 +0000 (10:19 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 19 Jan 2013 10:19:40 +0000 (10:19 +0000)
SVN-Revision: 35241

package/busybox/Makefile
package/busybox/patches/004-upstream-percent_decode_in_place.patch
package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
package/busybox/patches/611-upstream_ntpd_version_fix.patch [new file with mode: 0644]

index 177a42ff33fd62f90d35ba6c7b20141c36bd856d..af2dcdae7c90f784484eeec1096a07347a72816b 100644 (file)
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.19.4
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
index d94ee479000157f95442889a1d9cfc645d8088d5..bef4a90790e10e41a46cd6b609461a84a03fe577 100644 (file)
@@ -222,7 +222,7 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
                h->host = sp + 1;
        }
  
-@@ -661,12 +666,6 @@ static void download_one_url(const char
+@@ -661,12 +666,6 @@ static void download_one_url(const char 
  
  #if ENABLE_FEATURE_WGET_AUTHENTICATION
                if (target.user) {
index 94d5f34a16c1e27d35152ebdd0b45f5b0ceb67de..532fcee0fb51f9a926f06c34fa1aeb96715244c1 100644 (file)
@@ -1,5 +1,5 @@
---- busybox-1.19.4/networking/udhcp/common.c
-+++ busybox-1.19.4-udhcp/networking/udhcp/common.c
+--- a/networking/udhcp/common.c
++++ b/networking/udhcp/common.c
 @@ -29,16 +29,16 @@ const struct dhcp_optflag dhcp_optflags[
  //    { OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */
  //    { OPTION_IP | OPTION_LIST                 , 0x08 }, /* DHCP_COOKIE_SERVER */
@@ -56,8 +56,8 @@
  #if ENABLE_FEATURE_UDHCP_RFC3397
                case OPTION_DNS_STRING:
  #endif
---- busybox-1.19.4/networking/udhcp/common.h
-+++ busybox-1.19.4-udhcp/networking/udhcp/common.h
+--- a/networking/udhcp/common.h
++++ b/networking/udhcp/common.h
 @@ -80,6 +80,9 @@ enum {
        OPTION_IP = 1,
        OPTION_IP_PAIR,
@@ -68,8 +68,8 @@
  //    OPTION_BOOLEAN,
        OPTION_U8,
        OPTION_U16,
---- busybox-1.19.4/networking/udhcp/dhcpc.c
-+++ busybox-1.19.4-udhcp/networking/udhcp/dhcpc.c
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
 @@ -101,6 +101,7 @@ static const uint8_t len_of_option_as_st
        [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
        [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
diff --git a/package/busybox/patches/611-upstream_ntpd_version_fix.patch b/package/busybox/patches/611-upstream_ntpd_version_fix.patch
new file mode 100644 (file)
index 0000000..7bcb847
--- /dev/null
@@ -0,0 +1,29 @@
+From b7841cf7b919b16d1bd4619154bf7cb4c22b4ccd Mon Sep 17 00:00:00 2001
+From: Paul Marks <paul@pmarks.net>
+Date: Mon, 14 Jan 2013 01:39:10 +0000
+Subject: ntpd: fix incorrect m_status field in outgoing packets. Closes 5120
+
+When using busybox ntpd with an NTPv3 client and NTPv4 server (or vice
+versa), the version numbers can be incorrectly ORed together, yielding
+the bogus value of "NTPv7".  This makes ntpd unusable with clients
+such as Chrony and Windows "Internet Time".
+
+This patch avoids the version mangling, by copying only the Leap
+Indicator bits from the server's status field.
+
+Signed-off-by: Paul Marks <paul@pmarks.net>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+(limited to 'networking/ntpd.c')
+
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -1794,7 +1794,7 @@ recv_and_process_client_pkt(void /*int f
+       /* Build a reply packet */
+       memset(&msg, 0, sizeof(msg));
+-      msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;
++      msg.m_status = G.stratum < MAXSTRAT ? (G.ntp_status & LI_MASK) : LI_ALARM;
+       msg.m_status |= (query_status & VERSION_MASK);
+       msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
+                        MODE_SERVER : MODE_SYM_PAS;