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.

Sign up for GitHub

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

Jump to bottom

[staging-20.09] openldap: 2.4.51 -> 2.4.56 #104189

Merged
merged 1 commit into from Dec 1, 2020
Merged

[staging-20.09] openldap: 2.4.51 -> 2.4.56 #104189

merged 1 commit into from Dec 1, 2020

Conversation

mweinelt
Copy link
Member

Motivation for this change

Backport #104064

Drop patch for what became CVE-2020-25692, it was fixed in 2.4.55.

Fixes: CVE-2020-25709, CVE-2020-25710
(cherry picked from commit abbe621)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mweinelt
openldap: 2.4.51 -> 2.4.56
0597482 
Drop patch for what became CVE-2020-25692, it was fixed in 2.4.55.

Fixes: CVE-2020-25709, CVE-2020-25710
(cherry picked from commit abbe621)
@FRidh
Copy link
Member

FRidh commented Nov 18, 2020

cherry-pick -x reference is incorrect

@mweinelt
Copy link
Member Author

mweinelt commented Nov 18, 2020 •
edited

Ah, so do I need to wait for staging to be merged into master, before picking it? Because I think I picked the staging commit.

@mweinelt
Copy link
Member Author

@FRidh I'm pretty confident the reference is correct. Please recheck.

@mweinelt mweinelt requested a review from Mic92 November 30, 2020 15:10
@mweinelt mweinelt merged commit 26b4165 into NixOS:staging-20.09 Dec 1, 2020
@mweinelt mweinelt deleted the 20.09/openldap branch December 1, 2020 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mweinelt @FRidh