From patchwork Tue Sep 3 12:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 67565 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 A5BC927BBEA; Tue, 3 Sep 2024 13:32:19 +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 9F48827BBE2 for ; Tue, 3 Sep 2024 13:32:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slShY-0001iq-1Z; Tue, 03 Sep 2024 08:32:04 -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 1slShU-0001TY-Ev for guix-patches@gnu.org; Tue, 03 Sep 2024 08:32:01 -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 1slShU-0006J9-4B for guix-patches@gnu.org; Tue, 03 Sep 2024 08:32:00 -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=Zj5TT/M67JJQQQHwQGJvw2hDZrb7ZsrdSbkjiY5J7qA=; b=N5OHdE189to5q9I/fRWYdNmXhZcE1FNqckUd5Fj7VPw5HkceeXo0we9ptTS17LCKU3VQJBS0ZsJWw1rmBS8lEcdEaytYy/rOlW/qhMMy0DTFUmv7Qwd+9n+gHSjXn4DXXtbKupu0iIhffbfPwG888IyIXmEfq/2K1eHPZ2ETxUtAzUu79YNliihds93H7byLlkpCKgGdFm4kg/NVZtiLyNF3ximkR8HKXp93FhKVQW04C8ClRwE7gM6tDTYcU60bOUTt3cksLwDmFJlgzBn50WqQjjFxfSLUuV/e4tDbiX1yO6bYZukFwcTi7rMxyu7RQ2mg+L9qasb8/BHQf6Qirw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slSiU-0002Hl-2J for guix-patches@gnu.org; Tue, 03 Sep 2024 08:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72885] [PATCH v3] 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: Tue, 03 Sep 2024 12:33: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: ludo@gnu.org, 72885@debbugs.gnu.org Cc: Andy Tai Received: via spool by 72885-submit@debbugs.gnu.org id=B72885.17253667578744 (code B ref 72885); Tue, 03 Sep 2024 12:33:02 +0000 Received: (at 72885) by debbugs.gnu.org; 3 Sep 2024 12:32:37 +0000 Received: from localhost ([127.0.0.1]:59342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slSi5-0002Gy-CN for submit@debbugs.gnu.org; Tue, 03 Sep 2024 08:32:37 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:54385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slSi2-0002Gc-6s for 72885@debbugs.gnu.org; Tue, 03 Sep 2024 08:32:35 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-20688fbaeafso10281865ad.0 for <72885@debbugs.gnu.org>; Tue, 03 Sep 2024 05:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725366626; x=1725971426; 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=Zj5TT/M67JJQQQHwQGJvw2hDZrb7ZsrdSbkjiY5J7qA=; b=kZF54VQRTbwLpKwXvschA+r2T3Q9225O5eLyT4iTalWoDvJQRwtTSC/uzxp1zubtCM 5ZBxt8TcmCoN2iM7zTl58ZrzwIl9VNynbj5MWditc4KfwlkdZXgwfMG4iDGSvUV+I72d YPjs9tN0TDqRlvish9l3PUgNPlP+v0XOrNBppsDc+eMtSJ8IY6u435xyv39A62kQaGPZ oObG7c3zazXN805UcsmQjrpFX6eafVtEr0QU8UJPSYs71EBdCzARcpkcTxeFms9T0u4k hY50lBUN+JDeqSCuWG9cdg347mkgx0Sg/10Q7PxDxqaQ6NXu75IWCn6ZyIU4JpoCANAk csfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725366626; x=1725971426; 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=Zj5TT/M67JJQQQHwQGJvw2hDZrb7ZsrdSbkjiY5J7qA=; b=WQJ+FZK1h7rh37Fk6yB3g07+N588HICFemX2WLfkxZVkIT3dK/ab/VCYBvgE/dHHI+ xCBEpnSQg8Oak4moO2UBDGfyAfSzoTuAkorH1Atv5FGpehkcvEv1N14d4+T87RznIT1S QOy1tjRTrf8mYrizIt4fhtjNr0telpX9jww7RWOzDZ8PpNvlSAh3KQlv80P/oaL8cAkH No0N9HQTY5ILJs4wPmDnF7xGEu1FuLbxHWq2Wm5mc9KdQdy2ZSpuXsrmbUIxcS8bO6Al 8UEESXGU/JbLUUn7QiaUzD+Cmg2R0onWab9atL30R8xOrcm1YWqtty06oUNnkrhQg9Wi D5mg== X-Forwarded-Encrypted: i=1; AJvYcCWeGyoTx080IJwg/yLGVWbxMQx8J+LW8R9fyQAPlMFI9Hi+PmpU2HtN/wA/zIoS6KMbo/veRw==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzEhlP1GP/k+JinStaQSnlf0lE3Kag5eLTie6SykzJ4eeleBli4 ywHGlzNaxYM2GdCLfegxrv/uAeM05+3f5CUcPkdUdZqEdUqwJMK5 X-Google-Smtp-Source: AGHT+IE03WsxYSHbESoX52Xnccp3hbjgbz+w4wQ4L6biZLXImMIonU95D/+7/J7Ir07ysPThd3dcTQ== X-Received: by 2002:a17:902:db0f:b0:201:f052:d3e with SMTP id d9443c01a7336-205841a43a3mr54337005ad.24.1725366625617; Tue, 03 Sep 2024 05:30:25 -0700 (PDT) Received: from DEskMiniX300.. ([38.84.157.61]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2054066ca17sm54666275ad.300.2024.09.03.05.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 05:30:24 -0700 (PDT) From: Andy Tai Date: Tue, 3 Sep 2024 05:30:22 -0700 Message-Id: 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 "-D_GNU_SOURCE=1" to CFLAGS. [inputs]: Add linux-pam. Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244 --- .../patches/screen-hurd-path-max.patch | 40 +++++++++---------- gnu/packages/screen.scm | 12 ++++-- 2 files changed, 26 insertions(+), 26 deletions(-) base-commit: 8f584d2bdb0a5a5e78f04ce0b468d99605157420 diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch index e906f154f3..03b350e79e 100644 --- a/gnu/packages/patches/screen-hurd-path-max.patch +++ b/gnu/packages/patches/screen-hurd-path-max.patch @@ -6,14 +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 + +diff --git a/screen.h b/screen.h +index 308c365..e71bd7f 100644 +--- a/screen.h ++++ b/screen.h +@@ -63,6 +63,22 @@ struct mode { + #endif + }; ---- 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 + */ @@ -21,22 +24,15 @@ Last-Updated: 2017-01-18 +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif - - int CheckTtyname (char *tty) - { ---- a/screen.h -+++ b/screen.h -@@ -109,6 +109,13 @@ - # define DEFAULT_BUFFERFILE "/tmp/screen-exchange" - #endif - ++ +/* -+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd ++ * similarly for MAXPATHLEN + */ + -+#ifndef PATH_MAX -+#define PATH_MAX 4096 ++#ifndef MAXPATHLEN ++#define MAXPATHLEN PATH_MAX +#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..e791f29190 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=-O2 -g -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