The fix committed to bionic applies cleanly to focal:
ubuntu-imagemagick % git checkout origin/applied/ubuntu/focal-security
Previous HEAD position was 9d9d88c18 8:6.9.7.4+dfsg-16ubuntu6.15 (patches applied)
HEAD is now at d5cfbaeb8 8:6.9.10.23+dfsg-2.1ubuntu11.4 (patches applied)
ubuntu-imagemagick % git cherry-pick ff63fb0005ef2b9a35ca0811fcf391824586d0dc
Auto-merging coders/png.c
[detached HEAD 0d1b05180] [PATCH] possible DoS @ stdin (OCE-2022-70); possible arbitrary file
Author: Marc Deslauriers <email address hidden>
Date: Thu Feb 9 12:11:42 2023 -0500
1 file changed, 13 insertions(+), 2 deletions(-)
ubuntu-imagemagick % git checkout origin/applied/ubuntu/jammy
Previous HEAD position was d5cfbaeb8 8:6.9.10.23+dfsg-2.1ubuntu11.4 (patches applied)
HEAD is now at bc5d3ac18 8:6.9.11.60+dfsg-1.3build2 (patches applied)
The fix committed to bionic applies cleanly to focal:
ubuntu-imagemagick % git checkout origin/ applied/ ubuntu/ focal-security 4+dfsg- 16ubuntu6. 15 (patches applied) 23+dfsg- 2.1ubuntu11. 4 (patches applied)
Previous HEAD position was 9d9d88c18 8:6.9.7.
HEAD is now at d5cfbaeb8 8:6.9.10.
ubuntu-imagemagick % git cherry-pick ff63fb0005ef2b9 a35ca0811fcf391 824586d0dc
Auto-merging coders/png.c
[detached HEAD 0d1b05180] [PATCH] possible DoS @ stdin (OCE-2022-70); possible arbitrary file
Author: Marc Deslauriers <email address hidden>
Date: Thu Feb 9 12:11:42 2023 -0500
1 file changed, 13 insertions(+), 2 deletions(-)
For jammy, the upstream commit (https:/ /github. com/ImageMagick /ImageMagick6/ commit/ d77c01e560e9731 77feed4915ffd7d d1a45fd763) applies almost verbatim; the preprocessor conditionals from upstream ("#if 0 /* security risk -- disable for now */") around the removed block in magick/property.c are not in jammy, so that gets rejected:
ubuntu-imagemagick % git checkout origin/ applied/ ubuntu/ jammy 23+dfsg- 2.1ubuntu11. 4 (patches applied) 60+dfsg- 1.3build2 (patches applied)
Previous HEAD position was d5cfbaeb8 8:6.9.10.
HEAD is now at bc5d3ac18 8:6.9.11.
ubuntu-imagemagick % curl -s https:/ /github. com/ImageMagick /ImageMagick6/ commit/ d77c01e560e9731 77feed4915ffd7d d1a45fd763. patch | patch -p1 property. c.rej'
patching file 'magick/property.c'
Reversed (or previously applied) patch detected! Assume -R? [y] n
Apply anyway? [n] y
1 out of 1 hunks failed--saving rejects to 'magick/
patching file 'wand/mogrify.c'