From 66572b8746dbc4e299dc9936a71c80f3e2b63cf2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 18 Nov 2025 17:10:42 +0100 Subject: [PATCH] gnu: Remove readline-6.2. * gnu/packages/readline.scm (readline-6.2): Delete variable. * gnu/packages/patches/readline-6.2-CVE-2014-2524.patch: Remove file. * gnu/packages/readline.scm (dist_patch_DATA): Unregister patch. Fixes: guix/guix#3611 Change-Id: I87c33c44bff9003948cb2b1a7d3c09af9a642892 --- gnu/local.mk | 1 - .../patches/readline-6.2-CVE-2014-2524.patch | 42 ------------------- gnu/packages/readline.scm | 13 ------ 3 files changed, 56 deletions(-) delete mode 100644 gnu/packages/patches/readline-6.2-CVE-2014-2524.patch diff --git a/gnu/local.mk b/gnu/local.mk index 32da0b3b06..264a343b3c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2219,7 +2219,6 @@ dist_patch_DATA = \ %D%/packages/patches/retroarch-unbundle-spirv-cross.patch \ %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ - %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/renpy-use-system-fribidi.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/rdkit-unbundle-external-dependencies.patch \ diff --git a/gnu/packages/patches/readline-6.2-CVE-2014-2524.patch b/gnu/packages/patches/readline-6.2-CVE-2014-2524.patch deleted file mode 100644 index 12db684d87..0000000000 --- a/gnu/packages/patches/readline-6.2-CVE-2014-2524.patch +++ /dev/null @@ -1,42 +0,0 @@ -Fix CVE-2014-2524: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2524 -http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00057.html - -Patch copied from: -https://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003 - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-003 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -There are debugging functions in the readline release that are theoretically -exploitable as security problems. They are not public functions, but have -global linkage. - -Patch (apply with `patch -p0'): - -*** ../readline-6.3/util.c 2013-09-02 13:36:12.000000000 -0400 ---- util.c 2014-03-20 10:25:53.000000000 -0400 -*************** -*** 477,480 **** ---- 479,483 ---- - } - -+ #if defined (DEBUG) - #if defined (USE_VARARGS) - static FILE *_rl_tracefp; -*************** -*** 539,542 **** ---- 542,546 ---- - } - #endif -+ #endif /* DEBUG */ diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index d0236be12a..f506e76398 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -160,19 +160,6 @@ comfortable for anyone.") (search-patches "readline-link-ncurses.patch"))) (patch-flags '("-p0")))))) -(define-public readline-6.2 - (package (inherit readline) - (version "6.2") - (source (origin (inherit (package-source readline)) - (method url-fetch) - (uri (string-append "mirror://gnu/readline/readline-" - version ".tar.gz")) - (patches (search-patches "readline-6.2-CVE-2014-2524.patch")) - (patch-flags '("-p0")) - (sha256 - (base32 - "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr")))))) - (define-public rlwrap (package (name "rlwrap")