From 84a940056470c81cf80777ea87ee408ecfe48cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Aug 2024 15:58:37 +0200 Subject: [PATCH 1/5] postgresql_12: 12.19 -> 12.20 https://www.postgresql.org/support/security/CVE-2024-7348/ Fixes CVE-2024-7348 --- pkgs/servers/sql/postgresql/12.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index 74098e91f2eb..42e8ef960d42 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "12.19"; - hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s="; + version = "12.20"; + hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk="; } diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 907646dc722b..61ffe38d8999 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -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) From e9fbb584eaba9bf296f45ee80d6b6d084ce2564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Aug 2024 15:59:21 +0200 Subject: [PATCH 2/5] postgresql_13: 13.15 -> 13.16 https://www.postgresql.org/support/security/CVE-2024-7348/ Fixes CVE-2024-7348 --- pkgs/servers/sql/postgresql/13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 6347ad157216..ad55c9a55805 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "13.15"; - hash = "sha256-Qu3UFURtM7jCQr520a0FdTGyJksuhpOTObcHXG5OySU="; + version = "13.16"; + hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; From 592b5577edf1545e59e8fba7f9785a0fcc8e99c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Aug 2024 15:59:57 +0200 Subject: [PATCH 3/5] postgresql_14: 14.12 -> 14.13 https://www.postgresql.org/support/security/CVE-2024-7348/ Fixes CVE-2024-7348 --- pkgs/servers/sql/postgresql/14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index 1b4827bcb732..91341a3bd1f7 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "14.12"; - hash = "sha256-YRjQj53cwb2Dzyt8x007WDvc7C835iRaisADuPqoCSM="; + version = "14.13"; + hash = "sha256-Wao8S0lasmqexp860KAijFHw/m+s82NN+tTRGX1hOlY="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From 47ed51b9598738225295a6e1a1b07dfa4605ce42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Aug 2024 16:00:54 +0200 Subject: [PATCH 4/5] postgresql_15: 15.7 -> 15.8 https://www.postgresql.org/support/security/CVE-2024-7348/ Fixes CVE-2024-7348 --- pkgs/servers/sql/postgresql/15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index a9bde7fd0e67..63f4928401ac 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "15.7"; - hash = "sha256-pG/klIWrY4Xjnau7tlT10wSSBvds1pXiJCaHKVIJmPc="; + version = "15.8"; + hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o="; } From 632c9dd1c1876c311547ba4feea2cf7b90c57406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Aug 2024 16:01:15 +0200 Subject: [PATCH 5/5] postgresql_16: 16.3 -> 16.4 https://www.postgresql.org/support/security/CVE-2024-7348/ Fixes CVE-2024-7348 --- pkgs/servers/sql/postgresql/16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index c964fc5800c8..569ef4b9e08b 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "16.3"; - hash = "sha256-Mxlj1dPcTK9CFqBJ+kC2bWvLjHMGFYWUEblRh2TmBYU="; + version = "16.4"; + hash = "sha256-lxdm1kWqc+k7nvTjvkQgG09FtUdwlbBJElQD+fM4bW8="; }