diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-19 10:11:34 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-19 10:11:34 +0000 |
| commit | 3afbe1669f179d9c3535a9b85167837bb16a82d2 (patch) | |
| tree | c855cdffb5b1e8ecddf4ee01e26fb282941346b6 /package/busybox/patches/911-date-k-flag.patch | |
| parent | 60dde219d42e576f0d9b7cd14f7becda9172b692 (diff) | |
| download | upstream-3afbe1669f179d9c3535a9b85167837bb16a82d2.tar.gz upstream-3afbe1669f179d9c3535a9b85167837bb16a82d2.tar.bz2 upstream-3afbe1669f179d9c3535a9b85167837bb16a82d2.zip | |
busybox: add an upstream ntpd fix (#12841)
SVN-Revision: 35239
Diffstat (limited to 'package/busybox/patches/911-date-k-flag.patch')
| -rw-r--r-- | package/busybox/patches/911-date-k-flag.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/package/busybox/patches/911-date-k-flag.patch b/package/busybox/patches/911-date-k-flag.patch index 71f2af5c9b..c55ee23369 100644 --- a/package/busybox/patches/911-date-k-flag.patch +++ b/package/busybox/patches/911-date-k-flag.patch @@ -1,6 +1,5 @@ -diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c ---- busybox-1.19.4/coreutils/date.c 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4.new/coreutils/date.c 2012-11-23 16:48:21.945200539 +0100 +--- a/coreutils/date.c ++++ b/coreutils/date.c @@ -123,6 +123,7 @@ //usage: IF_FEATURE_DATE_ISOFMT( //usage: "\n -D FMT Use FMT for -d TIME conversion" @@ -17,7 +16,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c #if ENABLE_FEATURE_DATE_NANO # include <sys/syscall.h> #endif -@@ -145,8 +147,9 @@ +@@ -145,8 +147,9 @@ enum { OPT_UTC = (1 << 2), /* u */ OPT_DATE = (1 << 3), /* d */ OPT_REFERENCE = (1 << 4), /* r */ @@ -29,7 +28,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c }; static void maybe_set_utc(int opt) -@@ -164,12 +167,15 @@ +@@ -164,12 +167,15 @@ static const char date_longopts[] ALIGN1 /* "universal\0" No_argument "u" */ "date\0" Required_argument "d" "reference\0" Required_argument "r" @@ -45,7 +44,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c struct timespec ts; struct tm tm_time; char buf_fmt_dt2str[64]; -@@ -184,7 +190,7 @@ +@@ -184,7 +190,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;) @@ -54,7 +53,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c IF_FEATURE_DATE_ISOFMT("I::D:"), &date_str, &date_str, &filename IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)); -@@ -241,6 +247,31 @@ +@@ -241,6 +247,31 @@ int date_main(int argc UNUSED_PARAM, cha if (*argv) bb_show_usage(); |