diff --git a/packages/linux/url b/packages/linux/url index dc2718ca3b..8915cb1dbc 100644 --- a/packages/linux/url +++ b/packages/linux/url @@ -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 diff --git a/packages/sysutils/busybox/patches/busybox-1.14.0-acpid.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-acpid.diff similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.14.0-acpid.diff rename to packages/sysutils/busybox/patches/50_busybox-1.14.0-acpid.diff diff --git a/packages/sysutils/busybox/patches/busybox-1.14.0-defconfig.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-defconfig.diff similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.14.0-defconfig.diff rename to packages/sysutils/busybox/patches/50_busybox-1.14.0-defconfig.diff diff --git a/packages/sysutils/busybox/patches/50_busybox-1.14.0-des.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-des.diff new file mode 100644 index 0000000000..efb1d7cc4f --- /dev/null +++ b/packages/sysutils/busybox/patches/50_busybox-1.14.0-des.diff @@ -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; diff --git a/packages/sysutils/busybox/patches/50_busybox-1.14.0-dhcp_hostname.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-dhcp_hostname.diff new file mode 100644 index 0000000000..79bc5eaaea --- /dev/null +++ b/packages/sysutils/busybox/patches/50_busybox-1.14.0-dhcp_hostname.diff @@ -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); diff --git a/packages/sysutils/busybox/patches/50_busybox-1.14.0-mdev.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-mdev.diff new file mode 100644 index 0000000000..1c190a41ed --- /dev/null +++ b/packages/sysutils/busybox/patches/50_busybox-1.14.0-mdev.diff @@ -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); diff --git a/packages/sysutils/busybox/patches/busybox-1.14.0-unaligned.diff b/packages/sysutils/busybox/patches/50_busybox-1.14.0-unaligned.diff similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.14.0-unaligned.diff rename to packages/sysutils/busybox/patches/50_busybox-1.14.0-unaligned.diff