Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected installing ImageMagick on cifuzz #8658

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

radarhere
Copy link
Member

cifuzz is currently failing - https://github.com/python-pillow/Pillow/actions/runs/12588880904/job/35087652239#step:4:6114

#8 198.9 make[1]: convert: Command not found

This is because I forgot to consider it in #8655

@radarhere radarhere added the Linux label Jan 2, 2025
@hugovk
Copy link
Member

hugovk commented Jan 3, 2025

Looks like it's still missing here:

#9 197.5 convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif
#9 197.5 make[1]: convert: Command not found

https://github.com/python-pillow/Pillow/actions/runs/12590203712/job/35112307789?pr=8658#step:4:6135

@radarhere
Copy link
Member Author

It's because cifuzz just runs on main - https://github.com/google/oss-fuzz/blob/master/projects/pillow/Dockerfile

If I test one of our old vulnerabilities on oss-fuzz, you can see the convert problem - https://github.com/radarhere/oss-fuzz/actions/runs/12605648048/job/35134631013#step:7:6363

But once I switch to this branch, it goes away - https://github.com/radarhere/oss-fuzz/actions/runs/12605648847

@hugovk hugovk merged commit ef223f5 into python-pillow:main Jan 4, 2025
24 of 25 checks passed
@radarhere radarhere deleted the giflib branch January 4, 2025 06:25
@radarhere
Copy link
Member Author

cifuzz is passing again - https://github.com/python-pillow/Pillow/actions/runs/12608232411

DavidKorczynski pushed a commit to google/oss-fuzz that referenced this pull request Jan 4, 2025
https://github.com/google/oss-fuzz/blob/2ef5c1fd8bb77f86866069ddf063e9b0efcc7256/projects/pillow/Dockerfile#L32-L33

These lines can be removed. Pillow no longer needs to suppress errors
when calling yum.

They would have been there originally because
- multibuild called `yum_install` for installing
[zlib](https://github.com/multi-build/multibuild/blob/42d761728d141d8462cd9943f4329f12fe62b155/library_builders.sh#L144)
and
[`cmake`](https://github.com/multi-build/multibuild/blob/42d761728d141d8462cd9943f4329f12fe62b155/library_builders.sh#L217),
but python-pillow/pillow-wheels#204 and
python-pillow/Pillow#8593 mean that those are
used anymore.
- Pillow called `yum` to remove zlib-devel, but that is no longer the
case after python-pillow/Pillow#8658

cc @hugovk

Co-authored-by: Andrew Murray <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants