Apply post 1.13.1 patches, bump to 1.13.21_13_2

2 files changed, 7 insertions, 1 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index bd7a177e0..732fbb147 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -779,6 +779,8 @@ ForkJob(const char *user, CronLine *line, int mailFd,
                         xmove_fd(mailFd, mail_filename ? 1 : 0);
                         dup2(1, 2);
                 }
+                /* crond 3.0pl1-100 puts tasks in separate process groups */
+                bb_setpgrp();
                 execlp(prog, prog, cmd, arg, NULL);
                 crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg);
                 if (mail_filename) {
@@ -914,6 +916,8 @@ static void RunJob(const char *user, CronLine *line)
                 if (DebugOpt) {
                         crondlog(LVL5 "child running %s", DEFAULT_SHELL);
                 }
+                /* crond 3.0pl1-100 puts tasks in separate process groups */
+                bb_setpgrp();
                 execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
                 crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user,
                                  DEFAULT_SHELL, "-c", line->cl_Shell);
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 6d4efa943..ff2bc3bce 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -19,7 +19,9 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
 #define pointer   (G.pointer   )
 #define base      (G.base      )
 #define stack     (G.stack     )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+        base = 10; \
+} while (0)
 
 
 static void push(double a)