From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 22:59:18 +0000 (+0000)
Subject: merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'
X-Git-Tag: Release-2010-05/1~7653^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62adfb2470ab84c106ad6fe4e169620f1477beb0;p=openembedded.git

Merge ... '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'
     and 'cb1970d64a9cdb9559e137f509557905fbc174b5'
---

62adfb2470ab84c106ad6fe4e169620f1477beb0
diff --cc packages/busybox/busybox_1.9.1.bb
index 237f6a6dac,1626b1c6d2..3f8184fcc0
--- a/packages/busybox/busybox_1.9.1.bb
+++ b/packages/busybox/busybox_1.9.1.bb
@@@ -2,6 -2,9 +2,10 @@@ require busybox.in
  PR = "r2"
  
  SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+            http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
+            file://udhcpscript.patch;patch=1 \
+            file://adduser-longops.patch;patch=1 \
++           file://sort-z-nul.patch;patch=1;status=upstream \
             file://busybox-cron \
             file://busybox-httpd \
             file://busybox-udhcpd \