| 1 |
vapier 14/02/02 08:17:37 |
| 2 |
|
| 3 |
Added: busybox-1.22.1-date.patch |
| 4 |
busybox-1.22.1-iplink.patch |
| 5 |
busybox-1.22.1-ash.patch |
| 6 |
Log: |
| 7 |
Add various fixes from upstream. |
| 8 |
|
| 9 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sys-apps/busybox/files/busybox-1.22.1-date.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-date.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-date.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: busybox-1.22.1-date.patch |
| 18 |
=================================================================== |
| 19 |
--- busybox-1.22.1/libbb/time.c |
| 20 |
+++ busybox-1.22.1-date/libbb/time.c |
| 21 |
@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char |
| 22 |
/* else end != NUL and we error out */ |
| 23 |
} |
| 24 |
} else |
| 25 |
- /* yyyy-mm-dd HH */ |
| 26 |
- if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, |
| 27 |
+ if (strchr(date_str, '-') |
| 28 |
+ /* Why strchr('-') check? |
| 29 |
+ * sscanf below will trash ptm->tm_year, this breaks |
| 30 |
+ * if parse_str is "10101010" (iow, "MMddhhmm" form) |
| 31 |
+ * because we destroy year. Do these sscanf |
| 32 |
+ * only if we saw a dash in parse_str. |
| 33 |
+ */ |
| 34 |
+ /* yyyy-mm-dd HH */ |
| 35 |
+ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, |
| 36 |
&ptm->tm_mon, &ptm->tm_mday, |
| 37 |
&ptm->tm_hour, |
| 38 |
&end) >= 4 |
| 39 |
- /* yyyy-mm-dd */ |
| 40 |
- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, |
| 41 |
+ /* yyyy-mm-dd */ |
| 42 |
+ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, |
| 43 |
&ptm->tm_mon, &ptm->tm_mday, |
| 44 |
&end) >= 3 |
| 45 |
+ ) |
| 46 |
) { |
| 47 |
ptm->tm_year -= 1900; /* Adjust years */ |
| 48 |
ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 sys-apps/busybox/files/busybox-1.22.1-iplink.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-iplink.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-iplink.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: busybox-1.22.1-iplink.patch |
| 58 |
=================================================================== |
| 59 |
--- busybox-1.22.1/networking/libiproute/iplink.c |
| 60 |
+++ busybox-1.22.1-iplink/networking/libiproute/iplink.c |
| 61 |
@@ -31,6 +31,16 @@ |
| 62 |
#ifndef IFLA_LINKINFO |
| 63 |
# define IFLA_LINKINFO 18 |
| 64 |
# define IFLA_INFO_KIND 1 |
| 65 |
+# define IFLA_INFO_DATA 2 |
| 66 |
+#endif |
| 67 |
+ |
| 68 |
+#ifndef IFLA_VLAN_MAX |
| 69 |
+# define IFLA_VLAN_ID 1 |
| 70 |
+# define IFLA_VLAN_FLAGS 2 |
| 71 |
+struct ifla_vlan_flags { |
| 72 |
+ uint32_t flags; |
| 73 |
+ uint32_t mask; |
| 74 |
+}; |
| 75 |
#endif |
| 76 |
|
| 77 |
/* taken from linux/sockios.h */ |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 sys-apps/busybox/files/busybox-1.22.1-ash.patch |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-ash.patch?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/files/busybox-1.22.1-ash.patch?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: busybox-1.22.1-ash.patch |
| 87 |
=================================================================== |
| 88 |
--- busybox-1.22.1/shell/ash.c |
| 89 |
+++ busybox-1.22.1-ash/shell/ash.c |
| 90 |
@@ -13014,7 +13014,7 @@ init(void) |
| 91 |
setvar2("PPID", utoa(getppid())); |
| 92 |
#if ENABLE_ASH_BASH_COMPAT |
| 93 |
p = lookupvar("SHLVL"); |
| 94 |
- setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1)); |
| 95 |
+ setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT); |
| 96 |
#endif |
| 97 |
p = lookupvar("PWD"); |
| 98 |
if (p) { |
Archives