add more busybox patches

This commit is contained in:
Stephan Raue 2009-05-01 19:26:02 +02:00
parent 26cf70b8da
commit 6350bcb04e
7 changed files with 41 additions and 1 deletions

View File

@ -1 +1 @@
http://eu.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.30-rc3.tar.bz2
http://eu.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.30-rc4.tar.bz2

View File

@ -0,0 +1,14 @@
--- busybox-1.14.0/libbb/pw_encrypt_des.c Tue Apr 14 01:43:00 2009
+++ busybox-1.14.0-des/libbb/pw_encrypt_des.c Fri May 1 03:40:16 2009
@@ -778,8 +778,10 @@
to64_msb_first(output + 2, (r0 >> 8));
/* bits 7..0 of r0 and 31..16 of r1 */
to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
- /* (bits 15..0 of r1 + 00) and NUL byte */
+ /* bits 15..0 of r1 and two zero bits (plus extra zero byte) */
to64_msb_first(output + 10, (r1 << 8));
+ /* extra zero byte is encoded as '.', fixing it */
+ output[13] = '\0';
#endif
return output;

View File

@ -0,0 +1,12 @@
--- busybox-1.14.0/networking/udhcp/leases.c Tue Apr 14 01:42:51 2009
+++ busybox-1.14.0-dhcp_hostname/networking/udhcp/leases.c Tue Apr 21 02:41:22 2009
@@ -63,7 +63,8 @@
if (oldest) {
oldest->hostname[0] = '\0';
if (hostname) {
- hostname_length = hostname[-1]; /* look at option size byte */
+ /* option size byte, + 1 for NUL */
+ hostname_length = hostname[-1] + 1;
if (hostname_length > sizeof(oldest->hostname))
hostname_length = sizeof(oldest->hostname);
hostname = (uint8_t*) safe_strncpy((char*)oldest->hostname, (char*)hostname, hostname_length);

View File

@ -0,0 +1,14 @@
--- busybox-1.14.0/util-linux/mdev.c Tue Apr 14 23:23:04 2009
+++ busybox-1.14.0-mdev/util-linux/mdev.c Fri May 1 03:04:28 2009
@@ -524,7 +524,10 @@
make_device(temp, 1);
}
else if (strcmp(action, "add") == 0) {
- make_device(temp, 0);
+ /* N.B. make_device() mangles the device path, so save it */
+ char *s = xstrdup(temp);
+ make_device(s, 0);
+ free(s);
if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
if (fw)
load_firmware(fw, temp);