zookeeper: 3.6.2 -> 3.6.3

Fixes CVE-2020-25649, CVE-2021-21295, CVE-2021-28165 and CVE-2021-21409.

https://zookeeper.apache.org/doc/r3.6.3/releasenotes.html
This commit is contained in:
Thomas Gerbet 2021-04-24 12:07:34 +02:00
parent 2c07196584
commit 8495758f16
2 changed files with 7 additions and 5 deletions

View File

@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
sha512 = "16994067d460a1b6af6a71f3458c64ee32629e876a1ff6646d57be62f1a5adab57462af84074ecaded4186dd3fde035ee24cd9d578b8e5044073eb05f4ab9c3e"; sha512 = "90643aa0ae1b9bf1f5e137dfbcee7e3c53db15e5038d7e406e4a1c345d6a0531bf7afa2b03f99d419ebd0fe892f127a7abfe582f786034ba823e53a0a9246bfb";
}; };
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config
jre jre
]; ];
buildInputs = [ buildInputs = [
openssl openssl
pkg-config
zookeeper zookeeper
]; ];

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: { lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zookeeper"; pname = "zookeeper";
version = "3.6.2"; version = "3.6.3";
src = fetchurl { src = fetchurl {
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199"; sha512 = "3f7b1b7d9cf5647d52ad0076c922e108fa956e986b5624667c493cf6d8ff09d3ca88f623c79a799fe49c72e868cb3c9d0f77cb69608de74a183b2cbad10bc827";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
phases = ["unpackPhase" "installPhase"]; phases = ["unpackPhase" "installPhase"];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out mkdir -p $out
cp -R conf docs lib $out cp -R conf docs lib $out
# Without this, zkCli.sh tries creating a log file in the Nix store. # Without this, zkCli.sh tries creating a log file in the Nix store.
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
--prefix PATH : "${bash}/bin" --prefix PATH : "${bash}/bin"
done done
chmod -x $out/bin/zkEnv.sh chmod -x $out/bin/zkEnv.sh
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {