Hello community, here is the log from the commit of package dash for openSUSE:Factory checked in at 2020-11-23 16:36:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dash (Old) and /work/SRC/openSUSE:Factory/.dash.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dash" Mon Nov 23 16:36:42 2020 rev:23 rq:849514 version:0.5.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/dash/dash.changes 2020-10-23 12:19:41.648570835 +0200 +++ /work/SRC/openSUSE:Factory/.dash.new.5913/dash.changes 2020-11-23 18:40:59.116777088 +0100 @@ -1,0 +2,5 @@ +Thu Nov 19 22:34:02 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- add check-nflag-in-evaltree.patch (bsc#1178978) + +------------------------------------------------------------------- @@ -4 +9 @@ -- update to 0.5.11.2: +- update to 0.5.11.2 (bsc#1177691): @@ -5,0 +11 @@ +- add LICENSE file New: ---- check-nflag-in-evaltree.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dash.spec ++++++ --- /var/tmp/diff_new_pack.wX3d5a/_old 2020-11-23 18:40:59.572777563 +0100 +++ /var/tmp/diff_new_pack.wX3d5a/_new 2020-11-23 18:40:59.576777567 +0100 @@ -25,6 +25,8 @@ Group: System/Shells URL: http://gondor.apana.org.au/~herbert/dash/ Source: http://gondor.apana.org.au/~herbert/dash/files/dash-%{version}.tar.gz +# PATCH-FIX-UPSTREAM: https://git.kernel.org/pub/scm/utils/dash/dash.git/commit/?id=29d6f2148f10213de4e904d515e792d2cf8c968e +Patch1: check-nflag-in-evaltree.patch BuildRequires: libedit-devel %description @@ -33,6 +35,7 @@ %prep %setup -q +%autopatch -p1 %build %global optflags %{optflags} -fcommon @@ -49,6 +52,7 @@ ln -s %{_bindir}/dash %{buildroot}/bin/dash %files +%license COPYING %doc ChangeLog %{_bindir}/dash /bin/dash ++++++ check-nflag-in-evaltree.patch ++++++ From 29d6f2148f10213de4e904d515e792d2cf8c968e Mon Sep 17 00:00:00 2001 From: Herbert Xu <herb...@gondor.apana.org.au> Date: Thu, 4 Jun 2020 21:53:55 +1000 Subject: eval: Check nflag in evaltree instead of cmdloop This patch moves the nflag check from cmdloop into evaltree. This is so that nflag will be in force even if we enter the shell via a path other than cmdloop, e.g., through sh -c. Reported-by: Joey Hess <i...@joeyh.name> Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au> --- src/eval.c | 3 +++ src/main.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/eval.c b/src/eval.c index d10be38..9476fbb 100644 --- a/src/eval.c +++ b/src/eval.c @@ -213,6 +213,9 @@ evaltree(union node *n, int flags) setstackmark(&smark); + if (nflag) + goto out; + if (n == NULL) { TRACE(("evaltree(NULL) called\n")); goto out; diff --git a/src/main.c b/src/main.c index 7a28534..5c49fdc 100644 --- a/src/main.c +++ b/src/main.c @@ -233,7 +233,7 @@ cmdloop(int top) out2str("\nUse \"exit\" to leave shell.\n"); } numeof++; - } else if (nflag == 0) { + } else { int i; job_warning = (job_warning == 2) ? 1 : 0; -- cgit 1.2.3-1.el7 _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
