From 2e3a1450518e4647b97884c20ac4c49c5b998f2a Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 14 Apr 2022 19:35:54 +0200 Subject: [PATCH 1/4] evolution-data-server: 3.42.3 -> 3.42.4 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 048fe600797b..9250af2da444 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.3"; + version = "3.42.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; + sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI="; }; patches = [ From c7dca70738112b46227c01b293b476ed15b99249 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 14 Apr 2022 19:38:57 +0200 Subject: [PATCH 2/4] evolution: 3.42.1 -> 3.42.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 34b25c17a254..9aac3db3594c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.1"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU="; + sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU="; }; nativeBuildInputs = [ From 9c860d2f527fbfd3f46bf56b45aed8348e7615c8 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 14 Apr 2022 19:41:26 +0200 Subject: [PATCH 3/4] evolution-ews: 3.42.1 -> 3.42.4 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 432544c60c6c..28a20e518a79 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.1"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0="; + sha256 = "gpIW4GBXT0GCtV7Q8EfdEeK56gCACi+PJ/jbwQkVQbk="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From ac1191a866bf974d7e246cc7bb0b9c7e80d7cd7a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 22 Mar 2022 22:49:31 +0000 Subject: [PATCH 4/4] pjsip: add patch for CVE-2022-24764 (cherry picked from commit e7e3e939a8e9d71e9ec32bc7f3165a311c0a3821) --- pkgs/applications/networking/pjsip/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 8b0fad83b960..888081374090 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-24764.patch"; + url = "https://github.com/pjsip/pjproject/commit/560a1346f87aabe126509bb24930106dea292b00.patch"; + sha256 = "1fy78v3clm0gby7qcq3ny6f7d7f4qnn01lkqq67bf2s85k2phisg"; + }) ]; buildInputs = [ openssl libsamplerate ]