From 9c6f7712a246d1c1aae7279de9684897dc015542 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:19:55 +0200 Subject: [PATCH 1/6] mariadb: sha256 -> hash --- pkgs/servers/sql/mariadb/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 71b638b9ab8c..2e11bbbf032f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -31,7 +31,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds src = fetchurl { url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; - inherit (packageSettings) sha256; + inherit (packageSettings) hash; }; nativeBuildInputs = [ cmake pkg-config ] @@ -239,26 +239,26 @@ in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 version = "10.4.25"; - sha256 = "1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 version = "10.5.16"; - sha256 = "19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 version = "10.6.8"; - sha256 = "0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 version = "10.7.4"; - sha256 = "0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 version = "10.8.3"; - sha256 = "14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; }; } From 7ea9e62df1ffe2d59de1d0ea271620cd44bd641e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:20:37 +0200 Subject: [PATCH 2/6] mariadb_104: 10.4.25 -> 10.4.26 https://mariadb.com/kb/en/mariadb-10426-release-notes/ Fixes: - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2e11bbbf032f..63522457761a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -238,8 +238,8 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.25"; - hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + version = "10.4.26"; + hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 From aeb72f7668c480ff4d90f7119d6343011c8d5b2e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:22:59 +0200 Subject: [PATCH 3/6] mariadb_105: 10.5.16 -> 10.5.17 https://mariadb.com/kb/en/mariadb-10517-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63522457761a..c0036f9d7759 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -243,8 +243,8 @@ in { }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.16"; - hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + version = "10.5.17"; + hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 From c7aba71f1ce2df31b26f9eeef9d470e90b4b72f8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:23:59 +0200 Subject: [PATCH 4/6] mariadb_106: 10.6.8 -> 10.6.9 https://mariadb.com/kb/en/mariadb-1069-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c0036f9d7759..c2c52abdbc24 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -248,8 +248,8 @@ in { }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.8"; - hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + version = "10.6.9"; + hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 From 4131e59c77428ca97ece087d8b709f40fc0dad0a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:25:57 +0200 Subject: [PATCH 5/6] mariadb_107: 10.7.4 -> 10.7.5 https://mariadb.com/kb/en/mariadb-1075-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c2c52abdbc24..47a7f2ded045 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,9 +252,9 @@ in { hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { - # Supported until 2023-02 - version = "10.7.4"; - hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + # Supported until 2023-02. TODO: remove ahead of 22.11 release. + version = "10.7.5"; + hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 From e710cd5106ed3d890f9cfa7ba21c36635eea0e49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:26:18 +0200 Subject: [PATCH 6/6] mariadb_108: 10.8.3 -> 10.8.4 https://mariadb.com/kb/en/mariadb-1084-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 47a7f2ded045..706188b40305 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -258,7 +258,7 @@ in { }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.3"; - hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + version = "10.8.4"; + hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; }; }