diff options
| author | Damien Diederen <dd@crosstwine.com> | 2023-10-19 11:40:11 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sarah@qtr.dk> | 2023-10-19 15:41:13 +0200 |
| commit | 0b84d75ef80309b6e10e32e01c7b63724f13932a (patch) | |
| tree | 956df55836a6a1059484dbd5f9f6c5b57f564eaa | |
| parent | Merge pull request #262004 from DeterminateSystems/colemickens/nix_2_13_6 (diff) | |
| download | nixpkgs-0b84d75ef80309b6e10e32e01c7b63724f13932a.tar.gz | |
zookeeper: 3.7.1 -> 3.7.2
Security release for CVE-2023-44981:
https://zookeeper.apache.org/security.html#CVE-2023-44981
Also fixes CVE-2021-37533, CVE-2022-2048, CVE-2022-41915,
CVE-2022-42003, CVE-2022-42004, CVE-2023-36479, CVE-2023-40167,
CVE-2023-41900, CVE-2023-43642, and CVE-2023-4586 in bundled
dependencies.
Release notes:
https://zookeeper.apache.org/doc/r3.7.2/releasenotes.html
(cherry picked from commit b9206dd74679fc0d957bea8b8a7f1e12ad6fc119)
| -rw-r--r-- | pkgs/development/libraries/zookeeper_mt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/zookeeper/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 6a52f6a41d53..ce539d9eb1c0 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - sha512 = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg=="; + hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA=="; }; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index c8ef0cb68d41..fc35f4c01520 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: let - # Latest supported LTS JDK for Zookeeper 3.6: - # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware + # Latest supported LTS JDK for Zookeeper 3.7: + # https://zookeeper.apache.org/doc/r3.7.2/zookeeperAdmin.html#sc_requiredSoftware jre = jdk11_headless; in stdenv.mkDerivation rec { pname = "zookeeper"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; - sha512 = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ=="; + hash = "sha512-avv8GvyLk3AoG9mGLzfbscuV7FS7LtQ3GDGqXA8Iz+53UFC9V85fwINuYa8n7tnwB29UuYmX3Q4VFZGWBW5S6g=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5ba00a744d5..b0cce7d95a4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26434,9 +26434,7 @@ with pkgs; zookeeper = callPackage ../servers/zookeeper { }; - zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { - openssl = openssl_1_1; - }; + zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; |