From 0971994c4ab070dffad460ae8a396548fd3c981f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Aug 2022 03:31:13 +0200 Subject: [PATCH 1/6] =?UTF-8?q?webkitgtk:=202.36.7=20=E2=86=92=202.37.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/07/12/webkitgtk2.37.1-released.html Changelog-Reviewed-By: Jan Tojnar (cherry picked from commit f5d6f8b560f7a8b929d6856917e99ff1518568f0) --- pkgs/development/libraries/webkitgtk/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index a8190ffb3928..ea51207e0e49 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -5,6 +5,7 @@ , perl , python3 , ruby +, gi-docgen , bison , gperf , cmake @@ -67,15 +68,15 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.7"; + version = "2.37.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; separateDebugInfo = stdenv.isLinux; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-DCYM8rMvBIHQF2cN/tG2HlVJZ80GcZVgbJ+etf5zF0M="; + sha256 = "sha256-xTMmsXUfjG2j2y9L+pHBgBdViT4ofQ4fbAc0RYnUpqc="; }; patches = lib.optionals stdenv.isLinux [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { pkg-config python3 ruby + gi-docgen glib # for gdbus-codegen ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner @@ -221,6 +223,11 @@ stdenv.mkDerivation rec { sed 43i'#include ' -i Source/WTF/wtf/RandomDevice.cpp ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { From 154b185b3caa49ac4fdd9b3c65147c0ef8e6a3fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Sep 2022 00:32:56 +0200 Subject: [PATCH 2/6] =?UTF-8?q?webkitgtk:=202.37.1=20=E2=86=92=202.37.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/08/19/webkitgtk2.37.90-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.37.1...webkitgtk-2.37.90 Changelog-Reviewed-By: Jan Tojnar (cherry picked from commit ccc127b3dae7a632bacb4b212cd8a7eeeaef0ee8) --- pkgs/development/libraries/webkitgtk/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ea51207e0e49..f45c31c451f8 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -13,7 +13,6 @@ , pkg-config , gettext , gobject-introspection -, libnotify , gnutls , libgcrypt , libgpg-error @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.37.1"; + version = "2.37.90"; outputs = [ "out" "dev" "devdoc" ]; @@ -76,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-xTMmsXUfjG2j2y9L+pHBgBdViT4ofQ4fbAc0RYnUpqc="; + sha256 = "sha256-5VRyTvUnhJ02+3VNQrDNs5/0pscRhhtU25h0DV3mD5E="; }; patches = lib.optionals stdenv.isLinux [ @@ -138,7 +137,6 @@ stdenv.mkDerivation rec { libidn libintl lcms2 - libnotify libpthreadstubs libtasn1 libwebp From 2f32fb8daab8a62d14528b03db3b024f2a7ec3ec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Sep 2022 14:49:28 +0200 Subject: [PATCH 3/6] webkitgtk: Display ABI version in name To make it easier to distinguish which versions are in the closure. (cherry picked from commit 57e596a8651417107220c320bf39fec37d4066f1) --- pkgs/development/libraries/webkitgtk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index f45c31c451f8..074843a1d2ec 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -65,16 +65,17 @@ , systemdSupport ? stdenv.isLinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; version = "2.37.90"; + name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; separateDebugInfo = stdenv.isLinux; src = fetchurl { - url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; + url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; sha256 = "sha256-5VRyTvUnhJ02+3VNQrDNs5/0pscRhhtU25h0DV3mD5E="; }; @@ -162,7 +163,7 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" { } '' + runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ @@ -236,4 +237,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; broken = stdenv.isDarwin; }; -} +}) From 8c4ec7ac05aaecba29c43d5618ab6486c45002c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 19 Sep 2022 16:08:25 +0200 Subject: [PATCH 4/6] =?UTF-8?q?webkitgtk:=202.37.90=20=E2=86=92=202.38.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.37.90...webkitgtk-2.38.0 https://webkitgtk.org/security/WSA-2022-0009.html Fixes: CVE-2022-32886 CVE-2022-32891 CVE-2022-32912 Changelog-Reviewed-By: Jan Tojnar (cherry picked from commit 225103487a8f2ba013584d689844cca3e80ecc0b) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 074843a1d2ec..aca136f9017c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.37.90"; + version = "2.38.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-5VRyTvUnhJ02+3VNQrDNs5/0pscRhhtU25h0DV3mD5E="; + sha256 = "sha256-+c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70="; }; patches = lib.optionals stdenv.isLinux [ From df6651b7cd07c4d41e394b372cd5461459d86485 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 23:01:07 +0200 Subject: [PATCH 5/6] =?UTF-8?q?webkitgtk:=202.38.0=20=E2=86=92=202.38.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.38.0...webkitgtk-2.38.1 Changelog-Reviewed-By: Jan Tojnar (cherry picked from commit 4e8b341ade3675e3049ae38d084fe18be76d56e8) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index aca136f9017c..c0c1c7c6cd05 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.0"; + version = "2.38.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-+c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70="; + sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; }; patches = lib.optionals stdenv.isLinux [ From 113d70c1032c2d9c41df481651a2fc4a5a50f03f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 13:39:28 +0100 Subject: [PATCH 6/6] webkitgtk: 2.38.1 -> 2.38.2 https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/security/WSA-2022-0010.html Fixes: CVE-2022-32888, CVE-2022-32923, CVE-2022-42799, CVE-2022-42823 CVE-2022-42824 (cherry picked from commit 12c069cd35b7aeec713207be0c1190cb8a68190c) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index c0c1c7c6cd05..13cf7187ef95 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.1"; + version = "2.38.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; + hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4="; }; patches = lib.optionals stdenv.isLinux [