Skip to content

Commit

Permalink
busybox: refresh patches to apply cleanly on 1.31.1
Browse files Browse the repository at this point in the history
* Fixes:
ERROR: busybox-1.31.1-r0 do_patch: Fuzz detected:

Applying patch 0002-date-add-support-for-options-U-and-S.patch
patching file coreutils/date.c
Hunk #1 succeeded at 99 (offset -1 lines).
Hunk #2 succeeded at 141 (offset -1 lines).
Hunk webosose#3 succeeded at 149 (offset -1 lines).
Hunk webosose#4 succeeded at 195 (offset -1 lines).
Hunk webosose#5 succeeded at 272 with fuzz 1 (offset -1 lines).
Hunk webosose#7 succeeded at 347 (offset 1 line).

The context lines in the patches can be updated with devtool:

    devtool modify busybox
    devtool finish --force-patch-refresh busybox <layer_path>

Don't forget to review changes done by devtool!

ERROR: busybox-1.31.1-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
  • Loading branch information
shr-project committed Feb 15, 2020
1 parent ef59d87 commit 205fba6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
From 0cd0c2db378f419157cd4f57d7c947d8ff37dd52 Mon Sep 17 00:00:00 2001
From 18db0c47c704ba17668a61da475ad4323f918214 Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Mon, 6 Nov 2017 17:22:45 +0000
Subject: [PATCH] Add tzset applet

Signed-off-by: Martin Jansa <[email protected]>

---
coreutils/tzset.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
coreutils/tzset.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 coreutils/tzset.c

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
From d969ace32a396b1c6f395c56ba3c815126b74c3a Mon Sep 17 00:00:00 2001
From 710118cc132143faabb5155ceae6ef1a38363285 Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Mon, 6 Nov 2017 17:24:12 +0000
Subject: [PATCH] date: add support for options -U and -S

Signed-off-by: Martin Jansa <[email protected]>

---
coreutils/date.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/coreutils/date.c b/coreutils/date.c
index 9cbc730..2b86098 100644
index 77a7d13..ffb46ce 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -100,10 +100,13 @@
@@ -99,10 +99,13 @@
//usage: "Display time (using +FMT), or set time\n"
//usage: IF_NOT_LONG_OPTS(
//usage: "\n [-s] TIME Set time to TIME"
Expand All @@ -26,7 +27,7 @@ index 9cbc730..2b86098 100644
//usage: "\n -u,--utc Work in UTC (don't convert to local time)"
//usage: "\n -R,--rfc-2822 Output RFC-2822 compliant date string"
//usage: )
@@ -139,9 +142,7 @@
@@ -138,9 +141,7 @@

#include "libbb.h"
#include "common_bufsiz.h"
Expand All @@ -37,7 +38,7 @@ index 9cbc730..2b86098 100644

enum {
OPT_RFC2822 = (1 << 0), /* R */
@@ -149,8 +150,10 @@ enum {
@@ -148,8 +149,10 @@ enum {
OPT_UTC = (1 << 2), /* u */
OPT_DATE = (1 << 3), /* d */
OPT_REFERENCE = (1 << 4), /* r */
Expand All @@ -50,7 +51,7 @@ index 9cbc730..2b86098 100644
};

#if ENABLE_LONG_OPTS
@@ -193,7 +196,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
@@ -192,7 +195,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
char *isofmt_arg = NULL;

opt = getopt32long(argv, "^"
Expand All @@ -59,7 +60,7 @@ index 9cbc730..2b86098 100644
IF_FEATURE_DATE_ISOFMT("I::D:")
"\0"
"d--s:s--d"
@@ -270,6 +273,14 @@ int date_main(int argc UNUSED_PARAM, char **argv)
@@ -269,6 +272,14 @@ int date_main(int argc UNUSED_PARAM, char **argv)
* drop a mail to project mailing list please
*/
#endif
Expand All @@ -73,7 +74,7 @@ index 9cbc730..2b86098 100644
+ return EXIT_SUCCESS;
} else {
#if ENABLE_FEATURE_DATE_NANO
/* libc has incredibly messy way of doing this,
clock_gettime(CLOCK_REALTIME, &ts);
@@ -292,6 +303,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_HINT)) {
if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
Expand All @@ -84,7 +85,7 @@ index 9cbc730..2b86098 100644
} else {
parse_datestr(date_str, &tm_time);
}
@@ -332,6 +346,8 @@ int date_main(int argc UNUSED_PARAM, char **argv)
@@ -333,6 +347,8 @@ int date_main(int argc UNUSED_PARAM, char **argv)
strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
goto format_utc;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
From f588379e3465c56083fa91174044eea429334105 Mon Sep 17 00:00:00 2001
From 781fc27dfd515b4233322bad3669dde5a1409f4d Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Mon, 6 Nov 2017 17:24:53 +0000
Subject: [PATCH] libedit: check for null before passing cmdedit_prompt to
fputs

Signed-off-by: Martin Jansa <[email protected]>

---
libbb/lineedit.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1d5fef5..70328e2 100644
index fbabc6c..c47bddc 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -445,7 +445,9 @@ static void beep(void)
@@ -452,7 +452,9 @@ static void beep(void)
*/
static void put_prompt_custom(bool is_full)
{
Expand Down

0 comments on commit 205fba6

Please sign in to comment.