dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

postgresql_12: 12.19 -> 12.20

Browse Source 
https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
This commit is contained in:
Sandro Jäckel 2024-08-09 15:58:37 +02:00
parent 07d1d6a204
commit 84a9400564
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/postgresql/12.nix
View File

@ -1,4 +1,4 @@
import ./generic.nix {
version = "12.19";
hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s=";
version = "12.20";
hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk=";
}

19
pkgs/servers/sql/postgresql/generic.nix
View File

@ -19,7 +19,7 @@ let
, version, hash, muslPatches ? {}
# for tests
, testers, nixosTests
, testers
# JIT
, jitSupport
@ -119,23 +119,6 @@ let
src = ./patches/locale-binary-path.patch;
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
(
if atLeast "16" then
fetchpatch {
name = "libxml2-2.13-compat.patch";
# This one is for 16 branch upstream.
url = "https://github.com/postgres/postgres/commit/f85c91a1867b45742bb28e4578ca2b4a0976383f.diff";
hash = "sha256-4YcXfo98uVuCu+ybVw3bM4x8Y0I1xfjdjBZOlhyF21w=";
}
else
fetchpatch {
name = "libxml2-2.13-compat.patch";
# This one is for 15 branch upstream, but it also applies well to all our older branches.
url = "https://github.com/postgres/postgres/commit/f68d6aabb7e2c803818185b49a3d356bdb2b2974.diff";
hash = "sha256-Nelb0mbjx0Xq9UJuVv7cs3ifCtUPP7UZraPMPGb2wyQ=";
}
)
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
map fetchurl (lib.attrValues muslPatches)