From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 24 Nov 2009 22:17:35 +0000 (+0000)
Subject: backport r18528
X-Git-Tag: 8.09.2~1
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=de7c084c8ae321c86c9967f01b8fa8a2ee5a3fe5;p=openwrt%2Fsvn-archive%2Fopenwrt.git

backport r18528

SVN-Revision: 18529
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index ad18b2002c..203c00cf73 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.11.2
-PKG_RELEASE:=2.1
+PKG_RELEASE:=2.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
diff --git a/package/busybox/patches/500-ping6_crash.patch b/package/busybox/patches/500-ping6_crash.patch
new file mode 100644
index 0000000000..8412a18ac1
--- /dev/null
+++ b/package/busybox/patches/500-ping6_crash.patch
@@ -0,0 +1,12 @@
+Index: busybox-1.15.2/networking/ping.c
+===================================================================
+--- busybox-1.15.2.orig/networking/ping.c	2009-11-24 22:57:29.000000000 +0100
++++ busybox-1.15.2/networking/ping.c	2009-11-24 22:58:58.000000000 +0100
+@@ -769,6 +769,7 @@
+ int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int ping6_main(int argc UNUSED_PARAM, char **argv)
+ {
++	argv[-1] = argv[0];
+ 	argv[0] = (char*)"-6";
+ 	return ping_main(0 /* argc+1 - but it's unused anyway */,
+ 			argv - 1);