From patchwork Sun Sep 1 07:03:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 67462 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 84B9F27BBEA; Sun, 1 Sep 2024 08:05:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 BC70327BBE2 for ; Sun, 1 Sep 2024 08:05:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1skee2-00044R-E4; Sun, 01 Sep 2024 03:05:06 -0400 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 1skee0-00044I-NW for guix-patches@gnu.org; Sun, 01 Sep 2024 03:05:04 -0400 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 1skee0-0005rW-D6 for guix-patches@gnu.org; Sun, 01 Sep 2024 03:05:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=r/rSRe6ECzhcfDSlyFjKepGFAVWaCffBt0vM9blNFTU=; b=lOY4gxWqDWNUIWcuoL8TChpIFQuFGzaia1UO6AUdGZvRGCtv6g3fYgG8lPN4GKsQaIhtNa761bNEPCotM9OJK1UZwfNr6/u7iPLkI3b8wClLKYqixvaD4wyWQxYENn6RPNpCp/UIiX0ZmWsAHhmQdycwzPAZV3JzdyddEO8kSaXOiJAZwCqCrDnudJ68kOQp04oKkD5ypLaWaeH7yV7Z+rjqwkKRHN6vlNrbbZfMfR81448ziI0uYZdZs7XhdrlSjxeLUluY0LbdOR4A1d30T9yjqtEwhvaXCD3RJiBVPBrKfd/GDa/61ekRw1S3aIp1t5+enZjFynEus1pq+tjyvA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1skeew-0005C5-Ga for guix-patches@gnu.org; Sun, 01 Sep 2024 03:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72885] [PATCH v2] gnu: screen: Update to 5.0.0 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Sep 2024 07:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72885@debbugs.gnu.org Cc: Andy Tai Received: via spool by 72885-submit@debbugs.gnu.org id=B72885.172517435019939 (code B ref 72885); Sun, 01 Sep 2024 07:06:02 +0000 Received: (at 72885) by debbugs.gnu.org; 1 Sep 2024 07:05:50 +0000 Received: from localhost ([127.0.0.1]:32978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skeej-0005BX-SC for submit@debbugs.gnu.org; Sun, 01 Sep 2024 03:05:50 -0400 Received: from mail-pg1-f180.google.com ([209.85.215.180]:48432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skeei-0005BF-F3 for 72885@debbugs.gnu.org; Sun, 01 Sep 2024 03:05:49 -0400 Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7cb3db0932cso2367636a12.1 for <72885@debbugs.gnu.org>; Sun, 01 Sep 2024 00:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725174223; x=1725779023; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=r/rSRe6ECzhcfDSlyFjKepGFAVWaCffBt0vM9blNFTU=; b=WFUdiSiYqlgybhxrrFCvdq5JOI2MrPR7zXx5L9V/PYCq538xWwTs2n/yQscYjZYatU pIRVZFA4BWhcdd6uMqFQ76o0jJyA8ISCNnS9+D0ZfiaSdKezz2/zThIjE1l/fQ49Sqhn 0R8F1yKcRMlWinL/DbhsHa9k4Q6dL1DJz+EbBu/qSDVMOdCg7Pqq9KBFIlkkghgkKiKX pCy8E7HLeHrPqBtwPXOfwgrNAuGNN0ct6E3KqxgIwAXtt7VOsQVEKvKq9vFtC43vYlz5 IbwqhzsyVer/uj6cuwLrncltJXsqFswgiZsagiulODGKcWeldxCavoyv51jLq/xvoqmP QHFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725174223; x=1725779023; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=r/rSRe6ECzhcfDSlyFjKepGFAVWaCffBt0vM9blNFTU=; b=kuhsK81vUlup8Brt8+AoXj9ktbgXH62Gi+LH/mcUi4g5YnweC5hxI1NGPiulCMwgwQ uSruGCW6u1sELvy0QwNWGoAZBBzTf+grFAYDSorumkyIrIcgAGBpkEIubRV0z+tmiWkg sPLYxVFJs3f3TqfhbrNIbeUvmA3qc/Q4PJA9btS6v6SUMUJ3SC8/phZUiPskTyFY0EJs nd2AbnUpacE8eRrQdJ+INzTQP9hFxFXZbt9UJ9+H7GgWVaisGA1bEiQZuzltnURuFdST zrwPCG6iOnja21uOqV0+qaXEDcTyiraw/xWrKb0WrAEE9Ip4kZfnLGimKdlqnrREwndR SDTQ== X-Gm-Message-State: AOJu0YxPkQq0B1IATuttqCcEHZhiWXhVDrnJ6T+Ngei5EMIk0/1dvn70 fC6sJekdHbZFoZAkyr1dXSiDeKBIurKLMYo1fEC7N39wz7Jf5UtbM0CBbg== X-Google-Smtp-Source: AGHT+IH4SKU4gPsLUiHqjKB4kiE4V8OewFTneB+AQCiC1yrhUjwyXo3sxVLewb3b1QL4qkzGJjhyJA== X-Received: by 2002:a17:903:41cf:b0:205:489d:2b22 with SMTP id d9443c01a7336-205489d2dd3mr41293075ad.23.1725174222721; Sun, 01 Sep 2024 00:03:42 -0700 (PDT) Received: from DEskMiniX300.. ([38.84.157.61]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-205155539f0sm48701125ad.255.2024.09.01.00.03.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Sep 2024 00:03:42 -0700 (PDT) From: Andy Tai Date: Sun, 1 Sep 2024 00:03:38 -0700 Message-Id: <3094ea0169f5d37b90a1fccb4d495bdaa6ab6158.1725174170.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 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: , 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 * gnu/packages/patches/screen-hurd-path-max.patch: Update for screen 5.0.0. * gnu/packages/screen.scm (screen): Update to 5.0.0. [arguments]<#:configure-flags: Add "CFLAGS=-D_GNU_SOURCE=1". [inputs]: Add linux-pam. Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244 --- .../patches/screen-hurd-path-max.patch | 33 ++++++------------- gnu/packages/screen.scm | 12 ++++--- 2 files changed, 18 insertions(+), 27 deletions(-) base-commit: 61a7930cb03f5eb9e8003bade21d61262c3db8df diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch index e906f154f3..338666aa09 100644 --- a/gnu/packages/patches/screen-hurd-path-max.patch +++ b/gnu/packages/patches/screen-hurd-path-max.patch @@ -6,30 +6,17 @@ Description: Set PATH_MAX to 4096 if undefined Fixes FTBFS since 4.4.0 on GNU/Hurd. Updated to add one more occurrence for 4.5.0. Author: Axel Beckert Bug: https://savannah.gnu.org/bugs/?50089 -Last-Updated: 2017-01-18 +Updated: 2017-01-18 +Updated: 2024-08-30 Update for Screen 5.0.0 ---- a/tty.sh -+++ b/tty.sh -@@ -1478,6 +1478,13 @@ - return 0; - } - -+/* -+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd -+ */ -+ -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif - - int CheckTtyname (char *tty) - { +diff --git a/screen.h b/screen.h +index 308c365..bda05b4 100644 --- a/screen.h +++ b/screen.h -@@ -109,6 +109,13 @@ - # define DEFAULT_BUFFERFILE "/tmp/screen-exchange" +@@ -63,6 +63,13 @@ struct mode { #endif - + }; + +/* + * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd + */ @@ -37,6 +24,6 @@ Last-Updated: 2017-01-18 +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif - - #if defined(hpux) && !(defined(VSUSP) && defined(VDSUSP) && defined(VWERASE) && defined(VLNEXT)) - # define HPUX_LTCHARS_HACK + + #include "ansi.h" + #include "image.h" diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 095f18d85e..30fd2783a8 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -37,6 +37,7 @@ (define-module (gnu packages screen) #:use-module (gnu packages bash) #:use-module (gnu packages crypto) #:use-module (gnu packages hurd) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -46,24 +47,27 @@ (define-module (gnu packages screen) (define-public screen (package (name "screen") - (version "4.9.1") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) (patches (search-patches "screen-hurd-path-max.patch")) (sha256 - (base32 "0sdc0ms6qxm4gbx0caw7pwghj5aw1h8syvxdhkac0w95qkiz7ki6")))) + (base32 "0wa9v6p7cna2scpimpvk9pgxaah80f4q0f2kln37qp0f1b83jjph")))) (build-system gnu-build-system) (native-inputs (list autoconf automake texinfo)) (inputs - (list libxcrypt ncurses perl)) + (list libxcrypt linux-pam ncurses perl)) (arguments `(#:configure-flags + ;; GNU_SOURCE must be defined for mallocmock_reset() to be defined + '("CFLAGS=-D_GNU_SOURCE=1" + ;; By default, screen supports 16 colors, but we want 256 when ;; ~/.screenrc contains 'term xterm-256color'. - '("--enable-colors256"))) + "--enable-colors256"))) (home-page "https://www.gnu.org/software/screen/") (synopsis "Full-screen window manager providing multiple terminals") (description