From unknown Mon Aug 18 04:38:03 2025 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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 base-commit: d5312370b46ace47e138d84e1bb28e5651cee94b -- 2.34.1 From unknown Mon Aug 18 04:38:03 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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(-) 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 base-commit: 61a7930cb03f5eb9e8003bade21d61262c3db8df -- 2.34.1 From unknown Mon Aug 18 04:38:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72885] [PATCH v2] gnu: screen: Update to 5.0.0 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Sep 2024 11:50: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: Andy Tai Cc: 72885@debbugs.gnu.org Received: via spool by 72885-submit@debbugs.gnu.org id=B72885.17253641963547 (code B ref 72885); Tue, 03 Sep 2024 11:50:02 +0000 Received: (at 72885) by debbugs.gnu.org; 3 Sep 2024 11:49:56 +0000 Received: from localhost ([127.0.0.1]:59195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slS2l-0000v8-Tn for submit@debbugs.gnu.org; Tue, 03 Sep 2024 07:49:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slS2j-0000uq-89 for 72885@debbugs.gnu.org; Tue, 03 Sep 2024 07:49:54 -0400 Received: from fencepost.gnu.org ([209.51.188.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slS1d-000850-G8; Tue, 03 Sep 2024 07:48:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=HIsphwH7uFvOroBTwrFM5/tswduqOrNekgMGOne/zXw=; b=KmIRQ8DOpoOyBRnMaN3h kT4NP4KZAtGfBMcSUS6U/hXbDcjdVQfWbuiaPfNPLV3PnHF5NLhnecBuCes+6hhtLrxrJARbp0YFD 5huMgU7brGxRJSiZ4Rx5cW/eAuTX3llyYL07JPQo1daVacmqZMDseGie/KRv0p4sptEW+4EtjLCGG 8v9aQECJL1mwKbJktwiIQPgzbV91CpQOcQqIioz3Zeov8Kc59yYWPWthvSEa5ePje0cBaYWYnKHNh eI8mIZLKPX1LJKNktTc4STBE2uDgUHiwGhB5PKTYk8hqRhrhq6R9PCqkqS/wo7OY63MnhMRY/T5+H 5bTxt2iebPhZFA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <3094ea0169f5d37b90a1fccb4d495bdaa6ab6158.1725174170.git.atai@atai.org> (Andy Tai's message of "Sun, 1 Sep 2024 00:03:38 -0700") References: <3094ea0169f5d37b90a1fccb4d495bdaa6ab6158.1725174170.git.atai@atai.org> Date: Tue, 03 Sep 2024 13:48:43 +0200 Message-ID: <877cbtgdpg.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Andy Tai skribis: > * 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=3D-D_GNU_SOURCE=3D1". > [inputs]: Add linux-pam. > > Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244 [...] > -+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd Did you confirm that it still builds for GNU/Hurd? You can test by cross-compiling with =E2=80=98--target=3Di586-pc-gnu=E2=80= =99 or by compiling natively, if you have configured the =E2=80=98hurd-vm=E2=80=99 se= rvice, with =E2=80=98--system=3Di586-gnu=E2=80=99. > (arguments > `(#:configure-flags > + ;; GNU_SOURCE must be defined for mallocmock_reset() to be defi= ned > + '("CFLAGS=3D-D_GNU_SOURCE=3D1" This very likely removes the default flags, =E2=80=9C-O2 -g=E2=80=9D, which= is something we should not do (we=E2=80=99d get an unoptimized build and =E2=80=98--with= -debug-info=E2=80=99 wouldn=E2=80=99t have the intended effect). I think you need to have: "CFLAGS=3D-O2 -g -D_GNU_SOURCE=3D1" instead. Please check the build log to make sure it has the intended effect. Could you send an updated patch? Thanks, Ludo=E2=80=99. From unknown Mon Aug 18 04:38:03 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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(-) 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 base-commit: 8f584d2bdb0a5a5e78f04ce0b468d99605157420 -- 2.34.1 From unknown Mon Aug 18 04:38:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72885] [PATCH v2] gnu: screen: Update to 5.0.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Sep 2024 12:37: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 72885@debbugs.gnu.org Received: via spool by 72885-submit@debbugs.gnu.org id=B72885.17253669649131 (code B ref 72885); Tue, 03 Sep 2024 12:37:02 +0000 Received: (at 72885) by debbugs.gnu.org; 3 Sep 2024 12:36:04 +0000 Received: from localhost ([127.0.0.1]:59352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slSlQ-0002NC-69 for submit@debbugs.gnu.org; Tue, 03 Sep 2024 08:36:04 -0400 Received: from mail-vs1-f49.google.com ([209.85.217.49]:52375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slSlO-0002Me-9F for 72885@debbugs.gnu.org; Tue, 03 Sep 2024 08:36:03 -0400 Received: by mail-vs1-f49.google.com with SMTP id ada2fe7eead31-498c8a6220fso1799398137.0 for <72885@debbugs.gnu.org>; Tue, 03 Sep 2024 05:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1725366834; x=1725971634; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Sob3UWdHZB5wzMSHZqbvmmY6/B4GiZM2L2kRvbPNczQ=; b=jWTI40/Qe8IoJSbiRCCdNdDV5qJKm9BF7SN2Y7rMR2NWBe1FmibYh+SWmRq60ribv7 jgyJaUfQLdBFRDllhq3OoLx7Ve1Y+aktY9qTPIXETnK2b3eE7/eW0dTIX498CGGnh5ie vC7kYekhrHml93RBmq/om8x86V4wZTeeVh8NQ2Nq0LMvsXeRk67OisoypDKdBr3cFLwO to4PdVh4wJn5gS79Bdt99R+C8FdkERjfQs3Ne3lmQGXrVE0V/ti0lE4PxFGCSKTCT1cq Nzfwlf1BSDT7nptMXTOwHGlC14nWaSkpcyxQeQZAooZ7gPTD65zw2Df+b8dJegRTVGVH 3zXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725366834; x=1725971634; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sob3UWdHZB5wzMSHZqbvmmY6/B4GiZM2L2kRvbPNczQ=; b=kmSaDzFEnJWfp4hfIclpv8b5POOTrPPQhZqcXIbsb+YvXhw5SMJPVAKnZZkRNjXpNg qeeJfzCFDK1H4SrZDBqWohKX/wVgFFfmIF61QOorL7Te5ag3X2g06HCX2mBdl5PTdMyZ TYijuk5huRmBqgnWkxWc/r7WAvXNHDHj+Dc2FkYcyXzUXzytA5CVETBvnb2BoHjG9/dB q0Rq2ooY7c1NN/7nQPDmoqQxkOyhVFggEOCNF9SuhN5gPxXV7hzzFBGRgt9TLu1HiKe0 uOqSZcowtGTupe47vKTgGxt6yGU1xn41ltZcE3qW5dUSu4JEMdMC7FW2nCZYCE0qM//0 SRNg== X-Gm-Message-State: AOJu0Ywl3/F7PrKsBjFMfaKtDUZJhNnEImxAU9d8WCR3pDqpQZ5RIBJg iy4ElfL2E45Uu1pa3MNwpfLXi+XHyLVAMObRjW8MSvRSRVTXXjlNWm/0prQF7USYYJO4vEJ7NSQ hS2W8RWlFZ21mcwgbek1cfjs8XXCylg== X-Google-Smtp-Source: AGHT+IG87LzZwDemDts4ZSURmcxCj3MWKjqRb+eJn+EUAZA5b1QLN51bMzqigkqjKxk/A5QfrH2UZ1C5bDKvKPJQT60= X-Received: by 2002:a05:6102:41a6:b0:493:b006:e1a with SMTP id ada2fe7eead31-49a774f4ac5mr13783973137.7.1725366834355; Tue, 03 Sep 2024 05:33:54 -0700 (PDT) MIME-Version: 1.0 References: <3094ea0169f5d37b90a1fccb4d495bdaa6ab6158.1725174170.git.atai@atai.org> <877cbtgdpg.fsf@gnu.org> In-Reply-To: <877cbtgdpg.fsf@gnu.org> From: Andy Tai Date: Tue, 3 Sep 2024 05:33:17 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Updated patch sent, CFLAGS updated, Hurd cross compiling OK. On Tue, Sep 3, 2024 at 4:48=E2=80=AFAM Ludovic Court=C3=A8s = wrote: > > Hello, > > Andy Tai skribis: > > > * 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=3D-D_GNU_SOURCE=3D1". > > [inputs]: Add linux-pam. > > > > Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244 > > [...] > > > -+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd > > Did you confirm that it still builds for GNU/Hurd? > > You can test by cross-compiling with =E2=80=98--target=3Di586-pc-gnu=E2= =80=99 or by > compiling natively, if you have configured the =E2=80=98hurd-vm=E2=80=99 = service, with > =E2=80=98--system=3Di586-gnu=E2=80=99. > > > (arguments > > `(#:configure-flags > > + ;; GNU_SOURCE must be defined for mallocmock_reset() to be de= fined > > + '("CFLAGS=3D-D_GNU_SOURCE=3D1" > > This very likely removes the default flags, =E2=80=9C-O2 -g=E2=80=9D, whi= ch is something > we should not do (we=E2=80=99d get an unoptimized build and =E2=80=98--wi= th-debug-info=E2=80=99 > wouldn=E2=80=99t have the intended effect). I think you need to have: > > "CFLAGS=3D-O2 -g -D_GNU_SOURCE=3D1" > > instead. Please check the build log to make sure it has the intended > effect. > > Could you send an updated patch? > > Thanks, > Ludo=E2=80=99. From unknown Mon Aug 18 04:38:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Andy Tai Subject: bug#72885: closed (Re: [PATCH v3] gnu: screen: Update to 5.0.0) Message-ID: References: <8734mfcpv7.fsf@gnu.org> X-Gnu-PR-Message: they-closed 72885 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72885@debbugs.gnu.org Date: Wed, 04 Sep 2024 17:06:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1725469562-30165-1" This is a multi-part message in MIME format... ------------=_1725469562-30165-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72885: [PATCH] gnu: screen: Update to 5.0.0 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72885@debbugs.gnu.org. --=20 72885: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72885 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1725469562-30165-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72885-done) by debbugs.gnu.org; 4 Sep 2024 17:05:29 +0000 Received: from localhost ([127.0.0.1]:35277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sltRh-0007pR-8D for submit@debbugs.gnu.org; Wed, 04 Sep 2024 13:05:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sltRf-0007pC-5t for 72885-done@debbugs.gnu.org; Wed, 04 Sep 2024 13:05:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sltQW-0003Cc-30; Wed, 04 Sep 2024 13:04:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=NM5rUJ1Wrv+XX6rfcNr97u1X3/Hvy3lmLXX/QhPRe24=; b=ImRBLseWvgF/NRTFZLOg VXkfhi4mWNiZUxzAoAsY1mgR/LOZ8uu6N6tJ4M6pciQnFIU1FSb9hSOzit/cjXUa6CzD/7p3DfXkJ vYrR/x0O7SbKO0VTHFoco4r8ScAs0Emg85LUmQ69SPNAIO4xLeFlCUatDGKpd9Ytw5bJLuCGXxHsv 24M8pT+A7I6XVPd2GWcEKc4k52F/Ko0ROot+/+MPbO91phf1zFDGfe3pkTXbQ8CBYoQ+d81HzYeX/ m2XSu5UpHa2oMeFdBw3dGVCEfar2WG5VMcL2wSfLZyyY9E6CuSkTflYAowRj1cSt3uJ/emCnS9Qkq cwKjydNIGiE70g==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: [PATCH v3] gnu: screen: Update to 5.0.0 In-Reply-To: (Andy Tai's message of "Tue, 3 Sep 2024 05:30:22 -0700") References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Nonidi 19 Fructidor an 232 de la =?utf-8?Q?R=C3=A9vo?= =?utf-8?Q?lution=2C?= jour du Tagette X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 04 Sep 2024 19:04:12 +0200 Message-ID: <8734mfcpv7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72885-done Cc: 72885-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Andy, Andy Tai skribis: > * 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=3D1" to CFLAGS. > [inputs]: Add linux-pam. > > Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244 Applied, thanks! Ludo=E2=80=99. ------------=_1725469562-30165-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: screen: Update to 5.0.0 Date: Thu, 29 Aug 2024 23:31:03 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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 base-commit: d5312370b46ace47e138d84e1bb28e5651cee94b -- 2.34.1 ------------=_1725469562-30165-1--