summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-06-26 06:50:59 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-06-26 06:50:59 +0000
commit87ac3fcaa4f0bf9bba0cbe0957c5b4feaf7e85e2 (patch)
tree55377fd9c8bd851b9e769ab105b98be848d27055 /package
parentd624e8c0b4111c207a5fd307151e833ede98ea3e (diff)
buxybox: bump 1.10.x version
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Config.in2
-rw-r--r--package/busybox/busybox-1.10.3-tcpudp.patch10
-rw-r--r--package/busybox/busybox-1.10.3-udhcpc.patch11
3 files changed, 1 insertions, 22 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 1c54e845f..8a99703f0 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -50,7 +50,7 @@ config BR2_BUSYBOX_VERSION
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
- default "1.10.3" if BR2_BUSYBOX_VERSION_1_10_X
+ default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
diff --git a/package/busybox/busybox-1.10.3-tcpudp.patch b/package/busybox/busybox-1.10.3-tcpudp.patch
deleted file mode 100644
index f46669397..000000000
--- a/package/busybox/busybox-1.10.3-tcpudp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.10.3/networking/tcpudp.c Sat Apr 19 06:03:13 2008
-+++ busybox-1.10.3-tcpudp/networking/tcpudp.c Fri Jun 13 11:38:54 2008
-@@ -31,6 +31,7 @@
-
- #include "libbb.h"
- /* Wants <limits.h> etc, thus included after libbb.h: */
-+#include <linux/types.h> /* for __be32 etc */
- #include <linux/netfilter_ipv4.h>
-
- // TODO: move into this file:
diff --git a/package/busybox/busybox-1.10.3-udhcpc.patch b/package/busybox/busybox-1.10.3-udhcpc.patch
deleted file mode 100644
index fce5f048c..000000000
--- a/package/busybox/busybox-1.10.3-udhcpc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.10.3/networking/udhcp/clientsocket.c Sat Apr 19 06:03:13 2008
-+++ busybox-1.10.3-udhcpc/networking/udhcp/clientsocket.c Fri Jun 20 16:48:32 2008
-@@ -76,7 +76,7 @@
- BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
- BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, SERVER_AND_CLIENT_PORTS, 0, 1), /* L3, L4 */
- /* returns */
-- BPF_STMT(BPF_RET|BPF_K, (~(uint32_t)0) ), /* L3: pass */
-+ BPF_STMT(BPF_RET|BPF_K, 0x0fffffff), /* L3: pass */
- BPF_STMT(BPF_RET|BPF_K, 0), /* L4: reject */
- };
- static const struct sock_fprog filter_prog = {