|
| 1 | +diff -aur busybox-1.19.2.orig//include/libbb.h busybox-1.19.2//include/libbb.h |
| 2 | +--- busybox-1.19.2.orig//include/libbb.h 2011-09-16 01:12:38.000000000 +0000 |
| 3 | ++++ busybox-1.19.2//include/libbb.h 2011-09-16 01:13:21.000000000 +0000 |
| 4 | +@@ -37,6 +37,7 @@ |
| 5 | + #include <sys/mman.h> |
| 6 | + #include <sys/socket.h> |
| 7 | + #include <sys/stat.h> |
| 8 | ++#include <sys/sysinfo.h> |
| 9 | + #include <sys/time.h> |
| 10 | + #include <sys/types.h> |
| 11 | + #ifndef major |
| 12 | +Only in busybox-1.19.2//include: libbb.h.orig |
| 13 | +diff -aur busybox-1.19.2.orig//include/platform.h busybox-1.19.2//include/platform.h |
| 14 | +--- busybox-1.19.2.orig//include/platform.h 2011-09-16 01:12:38.000000000 +0000 |
| 15 | ++++ busybox-1.19.2//include/platform.h 2011-09-16 01:13:21.000000000 +0000 |
| 16 | +@@ -443,6 +443,13 @@ |
| 17 | + # undef HAVE_NET_ETHERNET_H |
| 18 | + #endif |
| 19 | + |
| 20 | ++#if defined(__musl__) |
| 21 | ++# undef HAVE_SETBIT |
| 22 | ++# include <stddef.h> |
| 23 | ++# include <termios.h> |
| 24 | ++# include <sys/ioctl.h> |
| 25 | ++#endif |
| 26 | ++ |
| 27 | + /* |
| 28 | + * Now, define prototypes for all the functions defined in platform.c |
| 29 | + * These must come after all the HAVE_* macros are defined (or not) |
| 30 | +Only in busybox-1.19.2//include: platform.h.orig |
| 31 | +diff -aur busybox-1.19.2.orig//miscutils/man.c busybox-1.19.2//miscutils/man.c |
| 32 | +--- busybox-1.19.2.orig//miscutils/man.c 2011-09-16 01:12:38.000000000 +0000 |
| 33 | ++++ busybox-1.19.2//miscutils/man.c 2011-09-16 01:13:21.000000000 +0000 |
| 34 | +@@ -116,7 +116,7 @@ |
| 35 | + /* "2>&1" is added so that nroff errors are shown in pager too. |
| 36 | + * Otherwise it may show just empty screen */ |
| 37 | + cmd = xasprintf( |
| 38 | +- man ? "gtbl | nroff -Tlatin1 -mandoc 2>&1 | %s" |
| 39 | ++ man ? "nroff -Tutf -man 2>&1 | %s" |
| 40 | + : "%s", |
| 41 | + pager); |
| 42 | + system(cmd); |
| 43 | +Only in busybox-1.19.2//miscutils: man.c.orig |
| 44 | +diff -aur busybox-1.19.2.orig//networking/ifconfig.c busybox-1.19.2//networking/ifconfig.c |
| 45 | +--- busybox-1.19.2.orig//networking/ifconfig.c 2011-09-16 01:12:38.000000000 +0000 |
| 46 | ++++ busybox-1.19.2//networking/ifconfig.c 2011-09-16 01:13:21.000000000 +0000 |
| 47 | +@@ -56,7 +56,7 @@ |
| 48 | + #endif |
| 49 | + |
| 50 | + #if ENABLE_FEATURE_IFCONFIG_SLIP |
| 51 | +-# include <net/if_slip.h> |
| 52 | ++# include <linux/if_slip.h> |
| 53 | + #endif |
| 54 | + |
| 55 | + /* I don't know if this is needed for busybox or not. Anyone? */ |
| 56 | +Only in busybox-1.19.2//networking: ifconfig.c.orig |
| 57 | +diff -aur busybox-1.19.2.orig//networking/libiproute/iplink.c busybox-1.19.2//networking/libiproute/iplink.c |
| 58 | +--- busybox-1.19.2.orig//networking/libiproute/iplink.c 2011-09-16 01:12:38.000000000 +0000 |
| 59 | ++++ busybox-1.19.2//networking/libiproute/iplink.c 2011-09-16 01:13:21.000000000 +0000 |
| 60 | +@@ -5,7 +5,6 @@ |
| 61 | + * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| 62 | + */ |
| 63 | + #include <net/if.h> |
| 64 | +-#include <net/if_packet.h> |
| 65 | + #include <netpacket/packet.h> |
| 66 | + #include <netinet/if_ether.h> |
| 67 | + |
| 68 | +Only in busybox-1.19.2//networking/libiproute: iplink.c.orig |
| 69 | +diff -aur busybox-1.19.2.orig//networking/tcpudp.c busybox-1.19.2//networking/tcpudp.c |
| 70 | +--- busybox-1.19.2.orig//networking/tcpudp.c 2011-09-16 01:12:38.000000000 +0000 |
| 71 | ++++ busybox-1.19.2//networking/tcpudp.c 2011-09-16 01:13:21.000000000 +0000 |
| 72 | +@@ -71,7 +71,7 @@ |
| 73 | + /* Wants <limits.h> etc, thus included after libbb.h: */ |
| 74 | + #ifdef __linux__ |
| 75 | + #include <linux/types.h> /* for __be32 etc */ |
| 76 | +-#include <linux/netfilter_ipv4.h> |
| 77 | ++//#include <linux/netfilter_ipv4.h> |
| 78 | + #endif |
| 79 | + |
| 80 | + // TODO: move into this file: |
| 81 | +diff -aur busybox-1.19.2.orig//util-linux/fdisk.c busybox-1.19.2//util-linux/fdisk.c |
| 82 | +--- busybox-1.19.2.orig//util-linux/fdisk.c 2011-09-16 01:12:38.000000000 +0000 |
| 83 | ++++ busybox-1.19.2//util-linux/fdisk.c 2011-09-16 01:13:21.000000000 +0000 |
| 84 | +@@ -550,7 +550,7 @@ |
| 85 | + { |
| 86 | + #if ENABLE_FDISK_SUPPORT_LARGE_DISKS |
| 87 | + off64_t off = (off64_t)secno * sector_size; |
| 88 | +- if (lseek64(dev_fd, off, SEEK_SET) == (off64_t) -1) |
| 89 | ++ if (lseek(dev_fd, off, SEEK_SET) == (off64_t) -1) |
| 90 | + fdisk_fatal(unable_to_seek); |
| 91 | + #else |
| 92 | + uint64_t off = (uint64_t)secno * sector_size; |
| 93 | +Only in busybox-1.19.2//util-linux: fdisk.c.orig |
| 94 | +Make -p count "path components" not slashes, so broken /blah//thing paths work. |
| 95 | + |
| 96 | +diff --git a/editors/patch.c b/editors/patch.c |
| 97 | +index 1f2a49b..b1f51cf 100644 |
| 98 | +--- a/editors/patch.c |
| 99 | ++++ b/editors/patch.c |
| 100 | +@@ -482,11 +482,11 @@ int patch_main(int argc UNUSED_PARAM, char **argv) |
| 101 | + |
| 102 | + // handle -p path truncation. |
| 103 | + for (i=0, s = name; *s;) { |
| 104 | ++ char *temp = name; |
| 105 | ++ |
| 106 | + if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break; |
| 107 | +- if (*(s++)=='/') { |
| 108 | +- name = s; |
| 109 | +- i++; |
| 110 | +- } |
| 111 | ++ while (*(s++)=='/') name = s; |
| 112 | ++ if (temp != name) i++; |
| 113 | + } |
| 114 | + |
| 115 | + if (empty) { |
0 commit comments