-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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
libtiff: Add patch to fix missing Lerc
in libtiff-4.pc
#320105
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code LGTM; thank you for the thorough work! Some caveats/questions:
- The patch hasn't been accepted upstream yet. It might be prudent to wait for that to happen before adding it.
- Which situation does this fix in nixpkgs? Is Lerc in nixpkgs' libtiff already not working? (If so, which commit broke it?) Another way to think about it is: would it be possible to add a test for this to demonstrate what the patch fixes?
- Does this remove the need for
lerc
inbuildInputs
? Is it equivalent? Complementary? Or just not related to that line? - We'll probably want a "TODO" comment marking this for
git revert
once the upstream patch is in the latest release of libtiff.
This was accidentally closed by nh2/static-haskell-nix@4c9cf63 with my commit message
Looks like Github is way too agressive, parsing that as Reopening. |
7f937d0
to
762abd8
Compare
Maybe for a while, yes. It's quite certainly correct to do this, as I believe the only reason it isn't in their autoconf build system is that either they forgot it, or because in contrast to CMake, autoconf cannot check for the version number in which
This fixes In normal
Unrelated to that line;
Done. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. Thanks for this fix @nh2
Release notes: https://libtiff.gitlab.io/libtiff/releases/v4.7.0.html Fixed CVEs: * CVE-2023-52356 https://gitlab.com/libtiff/libtiff/-/issues/622 * CVE-2024-7006 https://gitlab.com/libtiff/libtiff/-/issues/624 This update incorporates the `lerc` dependency declaration, therefore we drop the corresponding patch, c.f. https://gitlab.com/libtiff/libtiff/-/merge_requests/633 NixOS#320105
Description of changes
Found in static-haskell-nix. This should help
pkgsStatic
equally.Upstream PR is: https://gitlab.com/libtiff/libtiff/-/merge_requests/633
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.
@NixOS/geospatial