diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2025-05-15 15:04:57 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2025-05-15 15:26:48 +0300 |
| commit | bb5968d755b5f676b630d8b91a9d07ce29f424a8 (patch) | |
| tree | 9d438c5c6b639bab17c8dbf8daf5de8ad35e0b52 | |
| parent | f882e365e1b2e9383ee03c81b4ab87951ad3b7f7 (diff) | |
| download | guix-bb5968d755b5f676b630d8b91a9d07ce29f424a8.tar.gz guix-bb5968d755b5f676b630d8b91a9d07ce29f424a8.zip | |
gnu: screen: Update to 5.0.1 [security fixes].
Fixes CVE-2025-23395, CVE-2025-{46802,46803,46804,46805}.
* gnu/packages/screen.scm (screen): Update to 5.0.1.
[source]: Download using git-fetch. Add a snippet.
[native-inputs]: Replace autoconf with autoconf-2.71.
[arguments]: Add a phase to change into the source directory.
* gnu/packages/patches/screen-hurd-path-max.patch: Adjust for building
from git.
Change-Id: Ie6eceac0f14b5b94c47aee01d770f7e42a71416e
| -rw-r--r-- | gnu/packages/patches/screen-hurd-path-max.patch | 7 | ||||
| -rw-r--r-- | gnu/packages/screen.scm | 30 |
2 files changed, 26 insertions, 11 deletions
diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch index 03b350e79e..7782a625b2 100644 --- a/gnu/packages/patches/screen-hurd-path-max.patch +++ b/gnu/packages/patches/screen-hurd-path-max.patch @@ -8,11 +8,12 @@ Author: Axel Beckert <abe@debian.org> Bug: https://savannah.gnu.org/bugs/?50089 Updated: 2017-01-18 Updated: 2024-08-30 Update for Screen 5.0.0 +Updated: 2025-05-15 Update for building from git. -diff --git a/screen.h b/screen.h +diff --git a/src/screen.h b/src/screen.h index 308c365..e71bd7f 100644 ---- a/screen.h -+++ b/screen.h +--- a/src/screen.h ++++ b/src/screen.h @@ -63,6 +63,22 @@ struct mode { #endif }; diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index e791f29190..45500e55a8 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019-2022, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -47,17 +47,27 @@ (define-public screen (package (name "screen") - (version "5.0.0") + (version "5.0.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/screen/screen-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/screen.git") + (commit (string-append "v." version)))) + (file-name (git-file-name name version)) (patches (search-patches "screen-hurd-path-max.patch")) (sha256 - (base32 "0wa9v6p7cna2scpimpvk9pgxaah80f4q0f2kln37qp0f1b83jjph")))) + (base32 "1km6qbczlvzwcaagb8fy65k5z6ywn2whw57wdkfxg9dh9kg39hg7")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; Fixes https://savannah.gnu.org/bugs/?67126. + ;; Can be removed with 5.0.2? + (with-fluids ((%default-port-encoding #f)) + (substitute* "src/doc/screen.texinfo" + (("alexander_naumov@opensuse.org") + "alexander_naumov@@opensuse.org"))))))) (build-system gnu-build-system) (native-inputs - (list autoconf automake texinfo)) + (list autoconf-2.71 automake texinfo)) (inputs (list libxcrypt linux-pam ncurses perl)) (arguments @@ -67,7 +77,11 @@ ;; By default, screen supports 16 colors, but we want 256 when ;; ~/.screenrc contains 'term xterm-256color'. - "--enable-colors256"))) + "--enable-colors256") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src")))))) (home-page "https://www.gnu.org/software/screen/") (synopsis "Full-screen window manager providing multiple terminals") (description |