busybox: additional 1.17.3 fixes
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 29 Oct 2010 11:32:02 +0000 (13:32 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 29 Oct 2010 11:32:02 +0000 (13:32 +0200)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch [new file with mode: 0644]
package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch [new file with mode: 0644]

diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch
new file mode 100644 (file)
index 0000000..b135c14
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c
+--- busybox-1.17.3/networking/dnsd.c   2010-10-09 21:57:14.000000000 +0200
++++ busybox-1.17.3-dnsd/networking/dnsd.c      2010-10-29 00:37:43.066043841 +0200
+@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent
+       query_len = strlen(query_string) + 1;
+       /* may be unaligned! */
+       unaligned_type_class = (void *)(query_string + query_len);
+-      query_len += sizeof(unaligned_type_class);
++      query_len += sizeof(*unaligned_type_class);
+       /* where to append answer block */
+       answb = (void *)(unaligned_type_class + 1);
diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch
new file mode 100644 (file)
index 0000000..dc3b02e
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c
+--- busybox-1.17.3/libbb/unicode.c     2010-10-09 21:58:13.000000000 +0200
++++ busybox-1.17.3-unicode/libbb/unicode.c     2010-10-29 00:48:36.951494079 +0200
+@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p
+                       }
+               }
+               if (stats)
+-                      stats->byte_count = stats->unicode_count = (d - dst);
++                      stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
+               return dst;
+       }