From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IBwfGIfPo2AhOwAAgWs5BA (envelope-from ) for ; Tue, 18 May 2021 16:30:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iObNE4fPo2BpSwAAbx9fmQ (envelope-from ) for ; Tue, 18 May 2021 14:30:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C366413DE5 for ; Tue, 18 May 2021 16:30:30 +0200 (CEST) Received: from localhost ([::1]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj0jt-0003Yb-SG for larch@yhetil.org; Tue, 18 May 2021 10:30:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj0hW-0000Tz-Kc for guix-patches@gnu.org; Tue, 18 May 2021 10:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lj0hW-0001QZ-C6 for guix-patches@gnu.org; Tue, 18 May 2021 10:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lj0hW-0007Y3-7r for guix-patches@gnu.org; Tue, 18 May 2021 10:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48498] [PATCH] gnu: rxvt-unicode: Update to 9.26. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 May 2021 14:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48498@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162134804228961 (code B ref -1); Tue, 18 May 2021 14:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 May 2021 14:27:22 +0000 Received: from localhost ([127.0.0.1]:56839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj0gn-0007Wy-Ao for submit@debbugs.gnu.org; Tue, 18 May 2021 10:27:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:44886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj0gl-0007Wp-4u for submit@debbugs.gnu.org; Tue, 18 May 2021 10:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj0gk-0007VR-RR for guix-patches@gnu.org; Tue, 18 May 2021 10:27:14 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:50139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj0gi-0000uI-KS for guix-patches@gnu.org; Tue, 18 May 2021 10:27:14 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 0DE1C5C014D; Tue, 18 May 2021 10:27:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 18 May 2021 10:27:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=2O/22MK5ogIBihLW2uXi+07 SJudLFI+6RuyIKv+q9Q8=; b=mbY4+5L5AqFwmxvp51RbUMt2bo5VnXxUoxPCii1 v/6/CeBzko6MbaD0BBE1vG8Ex7IQuR/A4plziY2e/HZNA2UjAdq1qcD6lrdfW1jo ip+Ghiua/AFIbHOTfxtEBLQ8PuFbbH8jyQC8XF/Cj6ccJ5/tUSXqh2vJYrAYkUIb EtBU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=2O/22MK5ogIBihLW2 uXi+07SJudLFI+6RuyIKv+q9Q8=; b=X4myWU9EBLqO9vkqwWhRIc/2NCOTGec3n M1eRzbWrcEacvwaFehaM2LpbKrjud8DiMCJoJ2CSSNgdQZFxt/6fJF3npzWrNcUX N6HsLtCT8Z3tln4XZ1UmQA/ZBWG+u0cBA1X9p4c8+OtVq//ZTZexua4ZtFkBsvGT L8PLWgX24xvZaD3hKlLPdDYi2E91QBnZrWXx6qBhpVv3xmcm1UapbZ21o/8CSWOd cLZG6yjBp5bUjNC/9d1EMRte5ABtMJxkPUxts1x0m4D9Za5/7XGblPsPgO1t1L2R ExsSnvOBIAsBitKdA8E5wY0gQGr5n6k0Vcl1jvlmXNT9TBEIC1GTA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdeijedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnheptdehfeettdehuddtfedufeegteeigeekge dufefgvefhjeekgeetiefhjeegjeetnecuffhomhgrihhnpehsvggtlhhishhtshdrohhr ghdpshgthhhmohhrphdruggvnecukfhppedutddtrdduuddrudeiledruddukeenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghm uhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 18 May 2021 10:27:10 -0400 (EDT) From: Leo Famulari Date: Tue, 18 May 2021 10:27:04 -0400 Message-Id: <4c47c58c6e4040983670052f76e05a41d9b14878.1621348013.git.leo@famulari.name> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.27; envelope-from=leo@famulari.name; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621348231; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=2O/22MK5ogIBihLW2uXi+07SJudLFI+6RuyIKv+q9Q8=; b=KTzkqaVz4Hm7iRj7TUaDUBqFNzzxK4A7rQfT40UrfwjygJb9N32bTb4KZ3kzMz2lJuAPB4 9aTmURpuZpqUIXgcRB3/4lZzwIB8QsRS1XCItq133ofBvL7/f5AJUeDMBJ2ggUK9mKlYkg gxUvuZ4Jbp1xQRBEqjUb5F31iMgv3N72Uoa65RSkYbboC/lxIbJfaxQVkGNIt0K+c69tgN W1ErhGJSqf6IKqPE4i4eIpOuj1FHMacbPUW9oidhHEskRY4r73LSO0vZVfiTpfLjn7tXrV MmB4ubP8kdsZPpd/2RjwszWnz8XMiCC/fjtszkJmo9Ugdv3qAJN0ogsBQuhcbw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621348231; a=rsa-sha256; cv=none; b=XJLFFq+DLq4Vhc8O2bCJ6AsOcO8x4zhPH+9KBE7Nc/bf1Iuvy1Cati/aDQqxEBGeYRRbA3 av7fzShcgDIttfaR34C9YwCKfpdskf65iIvpbjVDojHZZQgEM8I250tFfLtGSVjxkQ/p99 CN/K1pDuJ09b5CMx2lWCeas0e7ySr3Qlw1jAplzfgtVMA6vzAmhSGmyf53IeEkWL4cGN2p IR5kibIoVzQsQw2eIuFgR8d+CKi2my0gxpY6ZTJgi03K1AiHZ47W9VcVNM8gdpW8XbgMTu 4b8NVDJhINNUAM5fcK7KKs8ue2Fm5vDM9E0I9N4hS94/KCai8LjoBSsR5epfDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=mbY4+5L5; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=X4myWU9E; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=mbY4+5L5; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=X4myWU9E; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C366413DE5 X-Spam-Score: 3.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: RT46ewqp9lu9 9.26 adds a dependendy on libxt, which propagates libx11. * gnu/packages/xdisorg.scm (rxvt-unicode): Update to 9.26. [source]: Remove obsolete patch. [inputs]: Remove libx11. Add libxt. * gnu/packages/patches/rxvt-unicode-escape-sequences.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../rxvt-unicode-escape-sequences.patch | 35 ------------------- gnu/packages/xdisorg.scm | 7 ++-- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/rxvt-unicode-escape-sequences.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1dc191092e..0e3e4eecf0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1672,7 +1672,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ - %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \ diff --git a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch b/gnu/packages/patches/rxvt-unicode-escape-sequences.patch deleted file mode 100644 index 064dd51e2d..0000000000 --- a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch prevents a code execution vector involving terminal escape -sequences when rxvt-unicode is in "secure mode". - -This change was spurred by the following conversation on the -oss-security mailing list: - -Problem description and proof of concept: -http://seclists.org/oss-sec/2017/q2/190 - -Upstream response: -http://seclists.org/oss-sec/2017/q2/291 - -Patch copied from upstream source repository: -http://cvs.schmorp.de/rxvt-unicode/src/command.C?r1=1.582&r2=1.583 - ---- rxvt-unicode/src/command.C 2016/07/14 05:33:26 1.582 -+++ rxvt-unicode/src/command.C 2017/05/18 02:43:18 1.583 -@@ -2695,7 +2695,7 @@ - /* kidnapped escape sequence: Should be 8.3.48 */ - case C1_ESA: /* ESC G */ - // used by original rxvt for rob nations own graphics mode -- if (cmd_getc () == 'Q') -+ if (cmd_getc () == 'Q' && option (Opt_insecure)) - tt_printf ("\033G0\012"); /* query graphics - no graphics */ - break; - -@@ -2914,7 +2914,7 @@ - break; - - case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ -- case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ -+ case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ - #ifdef ISO6429 - arg[0] = -arg[0]; - #else /* emulate common DEC VTs */ diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b5bacd3d97..41199237bd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1085,15 +1085,14 @@ compact configuration syntax.") (define-public rxvt-unicode (package (name "rxvt-unicode") - (version "9.22") + (version "9.26") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/rxvt-unicode/Attic/" name "-" version ".tar.bz2")) - (patches (search-patches "rxvt-unicode-escape-sequences.patch")) (sha256 (base32 - "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9")))) + "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4")))) (build-system gnu-build-system) (arguments ;; This sets the destination when installing the necessary terminal @@ -1143,7 +1142,7 @@ compact configuration syntax.") #t)))))) (inputs `(("libXft" ,libxft) - ("libX11" ,libx11))) + ("libXt" ,libxt))) (native-inputs `(("ncurses" ,ncurses) ;trigger the installation of terminfo data ("perl" ,perl) -- 2.31.1