From patchwork Thu Nov 7 21:41:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 70057 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3EA1327BBEA; Thu, 7 Nov 2024 21:42:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F289427BBE9 for ; Thu, 7 Nov 2024 21:42:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9AGe-0007Gz-RK; Thu, 07 Nov 2024 16:42:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9AGV-0007Fq-Pf for guix-patches@gnu.org; Thu, 07 Nov 2024 16:42:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9AGR-0001vl-VP for guix-patches@gnu.org; Thu, 07 Nov 2024 16:42:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=K6piZ1J+o0oOJ4Ls30FmQisn0afhVUYLP48JVBSxicU=; b=MjG07sWEiiSS6Pr20r35tIKC18EsGpibSN+EWm2fwld9MM4M6WkzrPrmYY12OQiftVq3FHURnmSgq9D5EanGXSiRKBN/eGiXIz9CeqwexlyQMmdeVvUvh2QNjmsJVNcGJI28ZPLelDKJr2o1YrotmIywQswrImECXzte4J6j+9E1ICMiXkdXQ1eUuk1cRGceX5iMEZaPAP0mIIa+4X0M8nR9HcUlOazs+jayMhpVDL1SvfSb2loD2emMg06gndk3Gl46/RsPVkKvp2V5E4P4gZJmlAyGoJpLKM4e0U1cTD7sJGYLwVw5oRK8Vab7/9iTOWcEttKUFwYMfNU0pG+LAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t9AGR-0005mC-Pe for guix-patches@gnu.org; Thu, 07 Nov 2024 16:42:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74248] [PATCH 3/3] gnu: xorg-server-xwayland: Update to 24.1.4 [security fixes]. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Nov 2024 21:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74248 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74248@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 74248-submit@debbugs.gnu.org id=B74248.173101571022130 (code B ref 74248); Thu, 07 Nov 2024 21:42:03 +0000 Received: (at 74248) by debbugs.gnu.org; 7 Nov 2024 21:41:50 +0000 Received: from localhost ([127.0.0.1]:49836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9AGD-0005kq-SI for submit@debbugs.gnu.org; Thu, 07 Nov 2024 16:41:50 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:31813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9AGB-0005kL-Mz for 74248@debbugs.gnu.org; Thu, 07 Nov 2024 16:41:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1731015701; x=1731274901; bh=K6piZ1J+o0oOJ4Ls30FmQisn0afhVUYLP48JVBSxicU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=GZ/d49nvHnQzTITFytq14BGEB7R6Dlz6nV87OXIf29wogQobmwWdWKes3UeDc4cSW OI6DKKHbma0R8LY2G07YVSLvwArZw9Ikeqi073DuGFR2ndhs82ex6zMvrfcu9gmteq V0pMy/AJieaiec10xfwG94l60VaDhocyJOJL2+hMkXRCuS4I8r08OyvUqBIAL3fp0c TY0CY/MiNEKL4KsuIpVc0ljkkPfg7nGYHjzvCx1Sf/spJXMpRyXYWvuPRbasfFo12z t+/N0slyK0sq9D4ERnAly4nMMvb8rxgoJntOf7BGQv8KL3ISOEf4dQnSb9ZA4rG3Ef xf2iMaAW10cbQ== Date: Thu, 07 Nov 2024 21:41:38 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton X-Pm-Message-ID: 89b77bf301fe59f00e88fa2b6fa1b28ad5153e74 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes CVE-2024-9632. * gnu/packages/xorg.scm (xorg-server-xwayland): Update to 24.1.4. [inputs]: Replace xorgproto with xorgproto-next. [arguments]<#:configure-flags>: Remove unsupported flag. Change-Id: Ie8542fdbbf9a49a79df2b4cd7b9a919b2f547f5f --- gnu/packages/xorg.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 97a2d8a78a..4e833abb44 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5295,7 +5295,7 @@ (define-public egl-wayland (define-public xorg-server-xwayland (package (name "xorg-server-xwayland") - (version "23.2.5") + (version "24.1.4") (source (origin (method url-fetch) @@ -5303,7 +5303,7 @@ (define-public xorg-server-xwayland "/xserver/xwayland-" version ".tar.xz")) (sha256 (base32 - "145xykwmyqkaa8zrbn5fnvnff67iral9mc5raamglnbsd3r7zv1k")))) + "1x1lmw1br3dxxfppfny1vkmk2l2vk5248i3k05smb7w1mgdphsnr")))) (inputs (list font-dejavu dbus egl-wayland @@ -5321,7 +5321,7 @@ (define-public xorg-server-xwayland wayland-protocols xkbcomp xkeyboard-config - xorgproto + xorgproto-next xtrans)) (native-inputs (cons pkg-config (if (%current-target-system) @@ -5333,8 +5333,7 @@ (define-public xorg-server-xwayland (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Dxwayland_eglstream=true" - (string-append "-Dxkb_dir=" + (list (string-append "-Dxkb_dir=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") (string-append "-Dxkb_bin_dir="