dpkg-source: error: diff 'openssl/debian/patches/pr12272.patch' patches files multiple times; split the diff in multiple files or merge the hunks into a single one
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
openssl (Ubuntu) |
Fix Released
|
Low
|
Matthew Ruffell | ||
Groovy |
Fix Released
|
Low
|
Matthew Ruffell | ||
Hirsute |
Fix Released
|
Low
|
Matthew Ruffell | ||
Impish |
Fix Released
|
Low
|
Matthew Ruffell |
Bug Description
[impact]
openssl doesn't build source properly because of a badly-constructed patch
[test case]
$ pull-lp-source openssl groovy
...
$ cd openssl-1.1.1f/
$ quilt pop -a
...
$ dpkg-buildpackage -d -S
dpkg-buildpackage: info: source package openssl
dpkg-buildpackage: info: source version 1.1.1f-1ubuntu4.3
dpkg-buildpackage: info: source distribution groovy-security
dpkg-buildpackage: info: source changed by Marc Deslauriers <email address hidden>
dpkg-source --before-build .
dpkg-source: warning: can't parse dependency perl:native
dpkg-source: error: diff 'openssl-
dpkg-buildpackage: error: dpkg-source --before-build . subprocess returned exit status 25
Test builds are available in the following ppa:
https:/
[regression potential]
any regression would likely cause a failed build or would affect the functionality that patch pr12272 was added for, which is adding support for Intel CET
[scope]
this is needed only for g and later
this is caused by the bad patch 'pr12272.patch' which is only included in g/h/i, so this does not apply to f or earlier
[other info]
note that if the patches are applied, this bug is bypassed; i.e. if 'quilt pop -a' is removed from the test case above, the bug doesn't reproduce. this is only a problem when the patches aren't already applied and dpkg-buildpackage needs to call dpkg-source to apply the patches.
description: | updated |
Changed in openssl (Ubuntu Groovy): | |
importance: | Undecided → Low |
Changed in openssl (Ubuntu Hirsute): | |
importance: | Undecided → Low |
Changed in openssl (Ubuntu Impish): | |
importance: | Undecided → Low |
description: | updated |
Changed in openssl (Ubuntu Groovy): | |
status: | New → In Progress |
Changed in openssl (Ubuntu Hirsute): | |
status: | New → In Progress |
Changed in openssl (Ubuntu Impish): | |
status: | New → In Progress |
Changed in openssl (Ubuntu Groovy): | |
assignee: | nobody → Matthew Ruffell (mruffell) |
Changed in openssl (Ubuntu Hirsute): | |
assignee: | nobody → Matthew Ruffell (mruffell) |
Changed in openssl (Ubuntu Impish): | |
assignee: | nobody → Matthew Ruffell (mruffell) |
description: | updated |
tags: | added: block-proposed-hirsute block-proposed-impish |
tags: | removed: block-proposed-impish |
I split 'pr12272.patch' into one file per commit, and I did a diff to ensure that there is no changes to the code:
https:/ /paste. ubuntu. com/p/zDqqXmsM8 c/
When using these split up patches "dpkg-buildpackage -d -S" completes successfully.