aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/250-date-k-flag.patch
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-03-27 20:06:38 +0300
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-03 23:26:45 +0200
commitd674422a814a4458af35e79587129a161b50a1ff (patch)
tree1613b1df5b3a61d93286607349b9b4b123d6faf2 /package/utils/busybox/patches/250-date-k-flag.patch
parenta74fd570a23f2226afcf63f92f22bcb9df37beee (diff)
downloadupstream-d674422a814a4458af35e79587129a161b50a1ff.tar.gz
upstream-d674422a814a4458af35e79587129a161b50a1ff.tar.bz2
upstream-d674422a814a4458af35e79587129a161b50a1ff.zip
busybox: update to 1.28.2
Update busybox to 1.28.2, refresh patches and default config. * modify 230-add_nslookup_lede.patch as opt_complementary was removed Also move nslookup_longopts variable declaration to be inside the same conditional as the function itself. * modify 250-date-k-flag.patch to match upstream (opt_complementary) * remove 600-cve-2017-16544.patch that is upstreamed Notes about config changes: * Some applet-specific LONG_OPTIONS config options were removed * Config help text indentation changed, caused lots of text formatting changes for convert_menuconfig.pl * convert_defaults.pl moved lots of defaults around, summary of actual changes below New applets/features: --------------------- ARCH HEXEDIT MINIPS NETCAT NUKE RESUME RUN_INIT SETFATTR New options: ------------ FEATURE_CATN FEATURE_CROND_SPECIAL_TIMES FEATURE_LIBBUSYBOX_STATIC FEATURE_SETPRIV_CAPABILITIES FEATURE_SETPRIV_CAPABILITY_NAMES FEATURE_SETPRIV_DUMP FEATURE_SH_READ_FRAC FEATURE_SWAPONOFF_LABEL FEATURE_VOLUMEID_MINIX FEATURE_XARGS_SUPPORT_ARGS_FILE FEATURE_XARGS_SUPPORT_PARALLEL HUSH_GETOPTS HUSH_READONLY HUSH_TIMES Removed: -------- FEATURE_HAVE_RPC MSH Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'package/utils/busybox/patches/250-date-k-flag.patch')
-rw-r--r--package/utils/busybox/patches/250-date-k-flag.patch31
1 files changed, 16 insertions, 15 deletions
diff --git a/package/utils/busybox/patches/250-date-k-flag.patch b/package/utils/busybox/patches/250-date-k-flag.patch
index 476440f62a..3a85312e2f 100644
--- a/package/utils/busybox/patches/250-date-k-flag.patch
+++ b/package/utils/busybox/patches/250-date-k-flag.patch
@@ -1,6 +1,6 @@
--- a/coreutils/date.c
+++ b/coreutils/date.c
-@@ -122,6 +122,7 @@
+@@ -123,6 +123,7 @@
//usage: IF_FEATURE_DATE_ISOFMT(
//usage: "\n -D FMT Use FMT for -d TIME conversion"
//usage: )
@@ -8,7 +8,7 @@
//usage: "\n"
//usage: "\nRecognized TIME formats:"
//usage: "\n hh:mm[:ss]"
-@@ -138,9 +139,8 @@
+@@ -139,9 +140,8 @@
#include "libbb.h"
#include "common_bufsiz.h"
@@ -20,7 +20,7 @@
enum {
OPT_RFC2822 = (1 << 0), /* R */
-@@ -148,8 +148,9 @@ enum {
+@@ -149,8 +149,9 @@ enum {
OPT_UTC = (1 << 2), /* u */
OPT_DATE = (1 << 3), /* d */
OPT_REFERENCE = (1 << 4), /* r */
@@ -31,8 +31,8 @@
+ OPT_HINT = (1 << 7) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
};
- static void maybe_set_utc(int opt)
-@@ -167,12 +168,15 @@ static const char date_longopts[] ALIGN1
+ #if ENABLE_LONG_OPTS
+@@ -162,6 +163,7 @@ static const char date_longopts[] ALIGN1
/* "universal\0" No_argument "u" */
"date\0" Required_argument "d"
"reference\0" Required_argument "r"
@@ -40,6 +40,7 @@
;
#endif
+@@ -181,6 +183,8 @@ static void maybe_set_utc(int opt)
int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int date_main(int argc UNUSED_PARAM, char **argv)
{
@@ -48,16 +49,16 @@
struct timespec ts;
struct tm tm_time;
char buf_fmt_dt2str[64];
-@@ -187,7 +191,7 @@ int date_main(int argc UNUSED_PARAM, cha
- opt_complementary = "d--s:s--d"
- IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
- IF_LONG_OPTS(applet_long_options = date_longopts;)
-- opt = getopt32(argv, "Rs:ud:r:"
-+ opt = getopt32(argv, "Rs:ud:r:k"
- IF_FEATURE_DATE_ISOFMT("I::D:"),
- &date_str, &date_str, &filename
- IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
-@@ -244,6 +248,31 @@ int date_main(int argc UNUSED_PARAM, cha
+@@ -193,7 +197,7 @@ int date_main(int argc UNUSED_PARAM, cha
+ char *isofmt_arg = NULL;
+
+ opt = getopt32long(argv, "^"
+- "Rs:ud:r:"
++ "Rs:ud:r:k"
+ IF_FEATURE_DATE_ISOFMT("I::D:")
+ "\0"
+ "d--s:s--d"
+@@ -256,6 +260,31 @@ int date_main(int argc UNUSED_PARAM, cha
if (*argv)
bb_show_usage();