Merge ~bryce/ubuntu/+source/bash:ubuntu/cosmic-devel into ubuntu/+source/bash:ubuntu/cosmic-devel

Proposed by Bryce Harrington
Status: Merged
Approved by: Andreas Hasenack
Approved revision: a02cca6ea0ef358cb75b35721ad83040eaba28b6
Merge reported by: Bryce Harrington
Merged at revision: a02cca6ea0ef358cb75b35721ad83040eaba28b6
Proposed branch: ~bryce/ubuntu/+source/bash:ubuntu/cosmic-devel
Merge into: ubuntu/+source/bash:ubuntu/cosmic-devel
Diff against target: 174 lines (+152/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/bash44-020.diff (+144/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+368573@code.staging.launchpad.net

Description of the change

Backport of an upstream fix to a cpu hang when waiting on background tasks.

PPA available for testing is at
https://launchpad.net/~bryce/+archive/ubuntu/bash-sru-19-010-1

I was not able to reproduce the hang myself, but apparently it can take days or weeks to reproduce. However, the fix was taken upstream and looks clearly correct to me. I'm confident given enough run time it would reproduce. It may be difficult to positively test for the bug's absence however.

I'm assuming that the target branch for this should be ubuntu/cosmic-devel; I couldn't find documentation to this effect however it seems to be what others are targeting to. Let me know if it's wrong.

I'm unclear if any tags are needed for SRU bugs but am gathering that none are. Again, let me know if otherwise.

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Just the upload tag is needed, and that will be handled at that time. Regarding the target branch, for SRUs ubuntu/<release>-devel is correct :)

Reviewing now.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I'd just suggest a different branch name next time, as there is a cosmic-devel already, and it's too generic :) But it works for the purposes of the fix, of course.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I see you changed the upstream patch to the unified format, just like others have done in the past (bash44-019 for example).

I compared the context diff (upstream) and unified diff (as being added here) and they are equal.

Usually when we change the upstream patch, we also take the opportunity to remove "noise", like the git index markers ("index fc96603..2684632 100644") and the --show-c-func bit ("@@ -812,8 +812,22 @@ bgp_add (pid, status)") <-- "bgp_add (pid, status)". This is inline with the recommendation at https://wiki.debian.org/UsingQuilt#Using_.quiltrc_configuration_file. But in this case, you didn't really change the patch in terms of code, just in terms of format. So our rule has been that it can stay as it, but it's the first time we came across a format change :)

If you want to change it, since the patch applied cleanly, I think just a sequence of "quilt push -a; quilt refresh bash44-020.diff" would do it, if you have that quiltrc config file.

I would just like to ask you to add a few DEP3 headers, that can be done below the description. Something like this:

--- a/debian/patches/bash44-020.diff
+++ b/debian/patches/bash44-020.diff
@@ -15,6 +15,10 @@ processes, it is possible for the hash table bash uses to store exit
 statuses from asynchronous processes to develop loops. This patch fixes
 the loop causes and adds code to detect any future loops.

+Origin: upstream, https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-020
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1822776
+Last-Update: 2019-06-10
+
 diff --git a/jobs.c b/jobs.c
 index fc96603..2684632 100644
 --- a/jobs.c

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Ops, missed one bit in d/changelog, no need to use -proposed. See comment inline.

Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks for the review Andreas, I've updated the branch with the suggested changes.

I'll use the "sru.1822776-bionic" format for branch names going forward, I'd intended to use that here but got my parameters confused I guess.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I'm gonna push the upload tag for a02cca6ea0ef358cb75b35721ad83040eaba28b6, and you dput:

$ git push pkg upload/4.4.18-2ubuntu3.1
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 2 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 2.73 KiB | 558.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/bash
 * [new tag] upload/4.4.18-2ubuntu3.1 -> upload/4.4.18-2ubuntu3.1

Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks, pushed via dput.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches