diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-date.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-date.patch new file mode 100644 index 0000000000..6380d8781e --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.22.1-date.patch @@ -0,0 +1,30 @@ +--- busybox-1.22.1/libbb/time.c ++++ busybox-1.22.1-date/libbb/time.c +@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char + /* else end != NUL and we error out */ + } + } else +- /* yyyy-mm-dd HH */ +- if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, ++ if (strchr(date_str, '-') ++ /* Why strchr('-') check? ++ * sscanf below will trash ptm->tm_year, this breaks ++ * if parse_str is "10101010" (iow, "MMddhhmm" form) ++ * because we destroy year. Do these sscanf ++ * only if we saw a dash in parse_str. ++ */ ++ /* yyyy-mm-dd HH */ ++ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, + &ptm->tm_mon, &ptm->tm_mday, + &ptm->tm_hour, + &end) >= 4 +- /* yyyy-mm-dd */ +- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, ++ /* yyyy-mm-dd */ ++ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, + &ptm->tm_mon, &ptm->tm_mday, + &end) >= 3 ++ ) + ) { + ptm->tm_year -= 1900; /* Adjust years */ + ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch new file mode 100644 index 0000000000..dbd76c5749 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch @@ -0,0 +1,19 @@ +--- busybox-1.22.1/networking/libiproute/iplink.c ++++ busybox-1.22.1-iplink/networking/libiproute/iplink.c +@@ -31,6 +31,16 @@ + #ifndef IFLA_LINKINFO + # define IFLA_LINKINFO 18 + # define IFLA_INFO_KIND 1 ++# define IFLA_INFO_DATA 2 ++#endif ++ ++#ifndef IFLA_VLAN_MAX ++# define IFLA_VLAN_ID 1 ++# define IFLA_VLAN_FLAGS 2 ++struct ifla_vlan_flags { ++ uint32_t flags; ++ uint32_t mask; ++}; + #endif + + /* taken from linux/sockios.h */ diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch new file mode 100644 index 0000000000..1ddb4834bd --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch @@ -0,0 +1,15 @@ +--- busybox-1.22.1/networking/nc_bloaty.c ++++ busybox-1.22.1-nc/networking/nc_bloaty.c +@@ -175,9 +175,9 @@ enum { + OPT_w = (1 << 5), + OPT_l = (1 << 6) * ENABLE_NC_SERVER, + OPT_k = (1 << 7) * ENABLE_NC_SERVER, +- OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, +- OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, +- OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, ++ OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, ++ OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, ++ OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + }; + + #define o_nflag (option_mask32 & OPT_n)