aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-24 22:13:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-24 22:13:19 +0000
commit2937618dd9af7f6d0ff616288463f3da39f7291b (patch)
tree236db412d2bb3f9a5fa74275e010c7822a3169e4
parent9f15eecf641874f1e52726f09a247df59615c561 (diff)
downloadupstream-2937618dd9af7f6d0ff616288463f3da39f7291b.tar.gz
upstream-2937618dd9af7f6d0ff616288463f3da39f7291b.tar.bz2
upstream-2937618dd9af7f6d0ff616288463f3da39f7291b.zip
prevent busybox's ping6 from crashing (#4604)
SVN-Revision: 18528
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/patches/500-ping6_crash.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 75bb315cc6..508c3e99ad 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.14.4
-PKG_RELEASE:=1
+PKG_RELEASE:=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);