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

Jump to bottom

[20.09] postgresql: 9.5.23 -> 9.5.24, 9.6.19 -> 9.6.20, 10.14 -> 10.15, 11.9 -> 11.10, 12.4 -> 12.5 #108495

Merged
merged 5 commits into from Jan 7, 2021
Merged

[20.09] postgresql: 9.5.23 -> 9.5.24, 9.6.19 -> 9.6.20, 10.14 -> 10.15, 11.9 -> 11.10, 12.4 -> 12.5 #108495

merged 5 commits into from Jan 7, 2021

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jan 5, 2021 •
edited

Motivation for this change

Backport of #104234 as those releases fix the following vulnerabilities:

Also fixes #106229, fixes #106230.

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.

@Ma27 Ma27 requested review from marsam and roberth January 5, 2021 16:53
@Ma27
Copy link
Member Author

Ma27 commented Jan 5, 2021

cc @NixOS/backports

@ofborg ofborg bot requested review from danbst and globin January 5, 2021 17:09
@Ma27
Copy link
Member Author

Ma27 commented Jan 5, 2021

  • It seems as @marsam removed during the update to postgresql-10.15 the stabilize-timetz-dst.patch patch from @roberth . Not sure why though.
  • We should look for more issues from vulnix regarding the affected CVEs
  • Will re-base this against staging-20.09.

@Ma27 Ma27 changed the base branch from release-20.09 to staging-20.09 January 5, 2021 18:49
@roberth
Copy link
Member

roberth commented Jan 5, 2021

That patch stabilize-timetz-dst.patch fixed tests that didn't work in the current DST season. So if the build passes, which is the case, that can only be because the test patch was included in these releases.

I'll mark this a draft to avoid notification spam because of the rebase. Please mark as ready for review when done.

@roberth roberth marked this pull request as draft January 5, 2021 20:02
@roberth roberth marked this pull request as ready for review January 5, 2021 20:03
@Ma27
Copy link
Member Author

Ma27 commented Jan 5, 2021

@roberth whoops, I should've checked that, sorry for that!
In fact, I already did the rebase to staging-20.09: the diff was rather tiny right now, so a force-push was sufficient.

@Ma27
Copy link
Member Author

Ma27 commented Jan 6, 2021

cc @vcunat @FRidh anything else tbd to get this mreged? :)

@roberth
Copy link
Member

roberth commented Jan 6, 2021 •
edited

@GrahamcOfBorg eval

it got stuck somehow

UPDATE: tests have succeeded, if you scroll down and see the succeeding ones, ignore the pendig ones.

@roberth
Copy link
Member

roberth commented Jan 6, 2021

Unless something significant is in the changelogs, I don't see much reason to wait, considering these are minor releases and the tests pass (I think?).

marsam
marsam approved these changes Jan 6, 2021
View reviewed changes
Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
I removed stabilize-timetz-dst.patch because it was already included in the release postgres/postgres@4a071af

@Ma27
Copy link
Member Author

Ma27 commented Jan 6, 2021

I don't see much reason to wait, considering these are minor releases and the tests pass (I think?).

@roberth agreed: especially since those bumps fix a security issue.

@Ma27 Ma27 merged commit 9a779ca into NixOS:staging-20.09 Jan 7, 2021
@Ma27 Ma27 deleted the backport-postgresql branch January 7, 2021 10:53
This was referenced Jan 7, 2021
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marsam marsam marsam approved these changes

@roberth roberth Awaiting requested review from roberth

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@danbst danbst Awaiting requested review from danbst

@globin globin Awaiting requested review from globin

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @roberth @marsam