From b9d3b942721587ea6fe3936fb5aa998fb072ddc6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 28 May 2022 00:26:28 +0200 Subject: [PATCH 1/6] wiki-js: 2.5.282 -> 2.5.283 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.283 (cherry picked from commit 9b11851ccfa28bcdf35c81700c786b5ea1f0d252) --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 6da2e3b3d036..75ee013971de 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.282"; + version = "2.5.283"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-cXNO8ChZ2FGAmTmcQDqnZrJpFynmdoocqFy59VCy1RE="; + sha256 = "sha256-dQ1FWZ+WysdsRkbNapKm1psZx35biKrRvTfNklC89e8="; }; sourceRoot = "."; From 81ab93f8d4a45de8eef4dd55a72c03d2ce54e38c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 17 May 2022 19:37:17 +0200 Subject: [PATCH 2/6] vim: 8.2.4816 -> 8.2.4874 fixes: - 7.8 https://nvd.nist.gov/vuln/detail/CVE-2022-1619 - 7.5 https://nvd.nist.gov/vuln/detail/CVE-2022-1620 - 7.8 https://nvd.nist.gov/vuln/detail/CVE-2022-1621 - 7.8 https://nvd.nist.gov/vuln/detail/CVE-2022-1629 (cherry picked from commit 6c822e25b66f78d5051d101d366c81b663946b72) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8c5058658495..f55c04654415 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4816"; + version = "8.2.4874"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; + sha256 = "sha256-0uVOIkm+hRJG0aU9kqFoWB78WdwyqDI34vhA6VQLglc="; }; enableParallelBuilding = true; From b6075839b415977b546bc07e43cce3c84f03734f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 18 May 2022 08:59:41 +0200 Subject: [PATCH 3/6] vim: 8.2.4874 -> 8.2.4975 (cherry picked from commit 2e4c67b555e0a8261f797b804c28c1063e675833) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index f55c04654415..551fd9ec2b09 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4874"; + version = "8.2.4975"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-0uVOIkm+hRJG0aU9kqFoWB78WdwyqDI34vhA6VQLglc="; + sha256 = "sha256-KkaW1WSX5OB03Dx6xTdbLFMpM7phbXyMpiufYKzAx0k="; }; enableParallelBuilding = true; From d89b15a9dd81317a2cd103cab31c96afed79f929 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 27 May 2022 14:56:30 +0200 Subject: [PATCH 4/6] zlog: fixes CVE-2021-43521 (cherry picked from commit a0a5f90ef209f058ee19d7cb5693faec2bfe56a4) --- pkgs/development/libraries/zlog/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index b115cf7b675b..3da11bec32d8 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "1.2.15"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-43521.patch"; + url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch"; + sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { From 73af32cc73c34b93e0f01b9d56349bc28748d2dc Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Thu, 26 May 2022 10:30:50 -0400 Subject: [PATCH 5/6] open-vm-tools: 12.0.0 -> 12.0.5 (cherry picked from commit e3548876c046c2cc27bb274e0d68ada85ac10aa8) --- .../virtualization/open-vm-tools/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 6018608a3f16..0188093a77dd 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.0.0"; + version = "12.0.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; + sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -25,21 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow - # Will be fixed in the release after 12.0.0 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; - sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am From 742a1ff5b291cf47bebdaaebd20664561e9d66a9 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 29 May 2022 08:35:40 -0400 Subject: [PATCH 6/6] remove unused fetchpatch (cherry picked from commit 8daaf8e398f356513147fec989e6222ea842fd8b) --- pkgs/applications/virtualization/open-vm-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 0188093a77dd..79dad692e988 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which