summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2007-04-05 07:04:31 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2007-04-05 07:04:31 +0000
commit27950be974ee73eebf79863e1d8bccd35cdaec45 (patch)
tree0fe78d95d44a874d646249dcd9fd5e6f87c8da9c /package/busybox
parent8ca4af140c6af66b4701f021ccd3699f3eb17bef (diff)
busybox 1.5.0 patches
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/busybox-1.5.0-hdparm.patch14
-rw-r--r--package/busybox/busybox-1.5.0-ps.patch13
2 files changed, 27 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.5.0-hdparm.patch b/package/busybox/busybox-1.5.0-hdparm.patch
new file mode 100644
index 000000000..d43aa31a7
--- /dev/null
+++ b/package/busybox/busybox-1.5.0-hdparm.patch
@@ -0,0 +1,14 @@
+--- busybox-1.5.0/miscutils/hdparm.c Thu Mar 22 22:21:34 2007
++++ busybox-1.5.0-hdparm/miscutils/hdparm.c Sat Mar 31 12:23:07 2007
+@@ -1569,9 +1569,9 @@
+ if (set_mult) {
+ print_flag(get_mult, "multcount", mult);
+ #ifdef HDIO_DRIVE_CMD
+- bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT");
++ bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT");
+ #else
+- force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT"));
++ force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT"));
+ #endif
+ }
+ if (set_readonly) {
diff --git a/package/busybox/busybox-1.5.0-ps.patch b/package/busybox/busybox-1.5.0-ps.patch
new file mode 100644
index 000000000..fcd35e2dd
--- /dev/null
+++ b/package/busybox/busybox-1.5.0-ps.patch
@@ -0,0 +1,13 @@
+--- busybox-1.5.0/procps/ps.c Thu Mar 22 22:21:37 2007
++++ busybox-1.5.0-ps/procps/ps.c Wed Mar 28 23:57:34 2007
+@@ -262,7 +262,9 @@
+ parse_o(default_o);
+ post_process();
+
+- terminal_width = INT_MAX;
++ /* Was INT_MAX, but some libc's go belly up with printf("%.*s")
++ * and such large widths */
++ terminal_width = 30000;
+ if (isatty(1)) {
+ get_terminal_width_height(1, &terminal_width, NULL);
+ terminal_width--;