From patchwork Fri Aug 30 06:31:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 67428 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 614FB27BBE9; Fri, 30 Aug 2024 07:32:34 +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=unavailable 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 95F9827BBE2 for ; Fri, 30 Aug 2024 07:32:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjvB4-0006lu-PE; Fri, 30 Aug 2024 02:32:10 -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 1sjvB1-0006eE-7h for guix-patches@gnu.org; Fri, 30 Aug 2024 02:32:07 -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 1sjvB0-0007Vc-TT for guix-patches@gnu.org; Fri, 30 Aug 2024 02:32:06 -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:Subject; bh=LUECa6BZ0d/70XTzyaYZW51bJEH32eT3mCol1hJvHv8=; b=FlA7II5g/08JkJCv0hZbeNJ8C7B+QCUEFaFBqb33CCFB+67o8UqhBEaLwZKf7BlCWq5MEdKWBSWrIyvHNDce+7XOmZOSG8R+P6uaFGde1FXteXox+ojA/NscE2EAUzAhQA0yYJVvqrEUsKfOQpJ1HtvvUUAVTE851z+n3x9m22DFwDEYieSkYBQmUnUjsSt/M2IpAyPaevvp7z2YoI68EfX+KPA2IOlMOcFw11y4wfBTeY0yX9HTNj4tSOKH0lM7aGHPFkoiOp97RUp30K/hHW0GinJZyMbtKr9bPY8nkxT/3mMxYWoAbFSLGQs8KZHaMObagJ6gF+ocnzm+BqaU8g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sjvBt-0000a2-Pr for guix-patches@gnu.org; Fri, 30 Aug 2024 02:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72885] [PATCH] gnu: screen: Update to 5.0.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Aug 2024 06:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72885@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17249995332156 (code B ref -1); Fri, 30 Aug 2024 06:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Aug 2024 06:32:13 +0000 Received: from localhost ([127.0.0.1]:52363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjvB7-0000Yi-11 for submit@debbugs.gnu.org; Fri, 30 Aug 2024 02:32:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:49056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjvB4-0000Ya-T5 for submit@debbugs.gnu.org; Fri, 30 Aug 2024 02:32:11 -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 1sjvAA-0003kH-7R for guix-patches@gnu.org; Fri, 30 Aug 2024 02:31:14 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjvA7-0007Nw-UR for guix-patches@gnu.org; Fri, 30 Aug 2024 02:31:13 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-204f52fe74dso13510445ad.1 for ; Thu, 29 Aug 2024 23:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724999469; x=1725604269; darn=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=LUECa6BZ0d/70XTzyaYZW51bJEH32eT3mCol1hJvHv8=; b=EWg9lSw44l+GW+sx+/Pa6XSkluVU/APnN5T4bmGgV5BvCXVTTWN7F25alEMKrlnDgd 2dq6Wz8AYPIsHlCMvz0CFnDTl/8P4xZ2BvYeuDoDUv7Y7KtZ8Z+c9rA26hVSItd1etjS gFZk6QE11U52C/0oiHhdjtVlKseANWAOSWNe2Nd6VQ5fA3pzsSnepA0rGya3mEsFO8DW 7U5kndvAdNlTwzduMWrGnuUiI3yYqahyVGIIXJt+KEsXU9btEMJmXFne5M8KA4F+W5ah T0c457MvGGfTp12O0kRwMhRfeJk96IDE3+8p5slUAgd1+Wxd1yWrPK1raiYSFa1ZUWJ8 yClw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724999469; x=1725604269; 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=LUECa6BZ0d/70XTzyaYZW51bJEH32eT3mCol1hJvHv8=; b=j/tn0/72frjaUQYDlKjLBap5mZZPBQ2HvLh20iDCqCF0XPKNlHgSyADned0GhiTpk+ h1hdrH4okMk5oMiOb1pXUwy/oQ1bblxklmAhLPx+aMMhjQFbGs+IU3Ys+xwsQSm0aFPR vsrCxHAwi2RPF1XU3evgvS7v41qOU332JUMcOh9DmECeCGm8ajlIUSTkchpNiubS0jVV J25DFpHVW5bzOfwaQE+Xy0JD/9p2+nLPbg4Kakh0OQFDFqhcQLnL0i8d2UQ8ubaxBMVg ZyUDOdUD0SvRF1ggqZMFO9ZMqNiFTP8inzERjO/v6DvXiPtC9GHgsWdm5MB8onXJRKm2 S/EQ== X-Gm-Message-State: AOJu0YwyoeJiLWVfcJRxdPWQRzlIp2J6PO2yff0AVIZEN7JaeUwDKp9q BqgRX+W2QSf4A+9f9bIAsDp4Z1ZJOTJ87MIHLrOscD8+V/faFtD/g/mQPA== X-Google-Smtp-Source: AGHT+IH+5OLOOXRZy/xDKzXLcssWyApxOHzFGZe27xnF3DS6Y+cNQdURR42dD+7BfnRj5a92ExB+YQ== X-Received: by 2002:a17:902:f787:b0:202:38d8:161 with SMTP id d9443c01a7336-2050c4b7a17mr60887235ad.57.1724999469095; Thu, 29 Aug 2024 23:31:09 -0700 (PDT) Received: from DEskMiniX300.. ([38.84.157.61]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20515533b94sm20662995ad.168.2024.08.29.23.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 23:31:08 -0700 (PDT) From: Andy Tai Date: Thu, 29 Aug 2024 23:31:03 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+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: d5312370b46ace47e138d84e1bb28e5651cee94b diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch index e906f154f3..6c474d0d11 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 for GNU 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 7c16ee239a..c63472c1eb 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -34,6 +34,7 @@ (define-module (gnu packages screen) #:use-module (gnu packages) #:use-module (gnu packages autotools) #: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) @@ -43,24 +44,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 ncurses perl)) + (list 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