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

[24.05] ffmpeg_7: 7.0 -> 7.0.1, ffmpeg, ffmpeg_5: add patches for several CVEs #319380

Merged

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Jun 12, 2024

Description of changes

Backport of #318912 and #316998

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

jopejoe1 and others added 4 commits June 12, 2024 21:23
(cherry picked from commit 00d7d60)
this prevents us from easily including non-fetchpatch'ed
patches

(cherry picked from commit 53ca425)
@ofborg ofborg bot requested review from arthsmn, jopejoe1, justinas and Atemu June 12, 2024 22:13
@risicle risicle marked this pull request as ready for review June 13, 2024 21:59
@vcunat vcunat merged commit 4146720 into NixOS:staging-next-24.05 Jun 14, 2024
32 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants