Skip to content

postgresql: 12.18 -> 12.19, 13.14 -> 13.15, 14.11 -> 14.12, 15.6 -> 15.7, 16.2 -> 16.3, fix CVE-2024-4317 for 14+ #310580

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

Merged
Ma27 merged 6 commits into from
May 12, 2024
Merged

postgresql: 12.18 -> 12.19, 13.14 -> 13.15, 14.11 -> 14.12, 15.6 -> 15.7, 16.2 -> 16.3, fix CVE-2024-4317 for 14+ #310580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c69eb60
postgresql_12: 12.18 -> 12.19
Ma27 May 11, 2024
3b6b7fd
postgresql_13: 13.14 -> 13.15
Ma27 May 10, 2024
90fdcc6
postgresql_14: 14.11 -> 14.12, fix CVE-2024-4317
Ma27 May 10, 2024
1f657f2
postgresql_15: 15.6 -> 15.7, fix CVE-2024-4317
Ma27 May 10, 2024
0616f7a
postgresql_16: 16.2 -> 16.3, fix CVE-2024-4317
Ma27 May 10, 2024
3ad254b
postgresql: drop obsolete musl checkPhase fix
Ma27 May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/12.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./generic.nix {
version = "12.18";
hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
version = "12.19";
hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s=";
}
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/13.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "13.14";
hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
version = "13.15";
hash = "sha256-Qu3UFURtM7jCQr520a0FdTGyJksuhpOTObcHXG5OySU=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/14.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "14.11";
hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
version = "14.12";
hash = "sha256-YRjQj53cwb2Dzyt8x007WDvc7C835iRaisADuPqoCSM=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./generic.nix {
version = "15.6";
hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
version = "15.7";
hash = "sha256-pG/klIWrY4Xjnau7tlT10wSSBvds1pXiJCaHKVIJmPc=";
}
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/16.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./generic.nix {
version = "16.2";
hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
version = "16.3";
hash = "sha256-Mxlj1dPcTK9CFqBJ+kC2bWvLjHMGFYWUEblRh2TmBYU=";
}
12 changes: 0 additions & 12 deletions pkgs/servers/sql/postgresql/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,6 @@ let
# autodetection doesn't seem to able to find this, but it's there.
checkTarget = "check";

# TODO: Remove after the next set of minor releases on May 9th 2024
preCheck =
# On musl, comment skip the following tests, because they break due to
# ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so)
# See also here:
# https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442
if stdenv'.hostPlatform.isMusl then ''
substituteInPlace src/test/regress/parallel_schedule \
--replace "subscription" "" \
--replace "object_address" ""
'' else null;

disallowedReferences = [ stdenv'.cc ];

passthru = let
Expand Down