From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33B1C15800A for ; Sat, 15 Jul 2023 10:14:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68B91E084A; Sat, 15 Jul 2023 10:14:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B216E084A for ; Sat, 15 Jul 2023 10:14:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AC03335D6F for ; Sat, 15 Jul 2023 10:14:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25085A36 for ; Sat, 15 Jul 2023 10:14:00 +0000 (UTC) From: "Arsen Arsenović" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arsen Arsenović" Message-ID: <1689415942.1bd52fc52dd36b4b83f51530685fc985482ff921.arsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/, sys-devel/gdb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gdb/files/gdb-13.2-fix-auto-load-path-expansion.patch sys-devel/gdb/gdb-13.2-r1.ebuild sys-devel/gdb/gdb-13.2-r2.ebuild X-VCS-Directories: sys-devel/gdb/ sys-devel/gdb/files/ X-VCS-Committer: arsen X-VCS-Committer-Name: Arsen Arsenović X-VCS-Revision: 1bd52fc52dd36b4b83f51530685fc985482ff921 X-VCS-Branch: master Date: Sat, 15 Jul 2023 10:14:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19d85d2d-6011-4ef6-95cd-8ffca43c0bb7 X-Archives-Hash: 0f55d08dc2da35d6394f0776215d50d1 commit: 1bd52fc52dd36b4b83f51530685fc985482ff921 Author: Arsen Arsenović gentoo org> AuthorDate: Sat Jul 15 10:05:50 2023 +0000 Commit: Arsen Arsenović gentoo org> CommitDate: Sat Jul 15 10:12:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd52fc5 sys-devel/gdb: backport fix for auto-load path expansion 02601231fdd91a7bd4837ce202906ea2ce661489 (in binutils-gdb.git) added a refactor that unintentionally broke expansion of auto-load paths of the form of '$datadir/subdir' and similar (i.e. not the trivial '$datadir' case). Backport the reversion. Signed-off-by: Arsen Arsenović gentoo.org> .../gdb-13.2-fix-auto-load-path-expansion.patch | 229 +++++++++++++++++++++ .../gdb/{gdb-13.2-r1.ebuild => gdb-13.2-r2.ebuild} | 1 + 2 files changed, 230 insertions(+) diff --git a/sys-devel/gdb/files/gdb-13.2-fix-auto-load-path-expansion.patch b/sys-devel/gdb/files/gdb-13.2-fix-auto-load-path-expansion.patch new file mode 100644 index 000000000000..4af86f3917be --- /dev/null +++ b/sys-devel/gdb/files/gdb-13.2-fix-auto-load-path-expansion.patch @@ -0,0 +1,229 @@ +https://inbox.sourceware.org/gdb-patches/87351qo3n2.fsf@tromey.com/ +https://sourceware.org/cgit/binutils-gdb/commit/?id=02601231fdd91a7bd4837ce2029 +From 23e46b680f6fa6fce45aaf6c004cab6be322fbf1 Mon Sep 17 00:00:00 2001 +From: Tom Tromey +Date: Fri, 14 Jul 2023 09:35:03 -0600 +Subject: Revert "Simplify auto_load_expand_dir_vars and remove + substitute_path_component" + +This reverts commit 02601231fdd91a7bd4837ce202906ea2ce661489. + +This commit was a refactoring to remove an xrealloc and simplify +utils.[ch]. However, it has a flaw -- it mishandles a substitution +like "$datadir/subdir". + +I am backing out the patch in the interests of fixing the regression +before GDB 14. It can be reinstated (with modifications) later if we +like. + +Regression tested on x86-64 Fedora 36. +--- + gdb/Makefile.in | 1 + + gdb/auto-load.c | 33 +++++++++-------------- + gdb/unittests/utils-selftests.c | 60 +++++++++++++++++++++++++++++++++++++++++ + gdb/utils.c | 45 +++++++++++++++++++++++++++++++ + gdb/utils.h | 3 +++ + 5 files changed, 121 insertions(+), 21 deletions(-) + create mode 100644 gdb/unittests/utils-selftests.c + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index d909786792c..8521e8d11c8 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -490,6 +490,7 @@ SELFTESTS_SRCS = \ + unittests/ui-file-selftests.c \ + unittests/unique_xmalloc_ptr_char.c \ + unittests/unpack-selftests.c \ ++ unittests/utils-selftests.c \ + unittests/vec-utils-selftests.c \ + unittests/xml-utils-selftests.c + +diff --git a/gdb/auto-load.c b/gdb/auto-load.c +index 9d6fabe6bbc..5267cb4e64d 100644 +--- a/gdb/auto-load.c ++++ b/gdb/auto-load.c +@@ -173,33 +173,24 @@ static std::string auto_load_safe_path = AUTO_LOAD_SAFE_PATH; + counterpart. */ + static std::vector> auto_load_safe_path_vec; + +-/* Expand $datadir and $debugdir in STRING. */ ++/* Expand $datadir and $debugdir in STRING according to the rules of ++ substitute_path_component. */ + + static std::vector> + auto_load_expand_dir_vars (const char *string) + { +- std::vector> result +- = dirnames_to_char_ptr_vec (string); ++ char *s = xstrdup (string); ++ substitute_path_component (&s, "$datadir", gdb_datadir.c_str ()); ++ substitute_path_component (&s, "$debugdir", debug_file_directory.c_str ()); + +- for (auto &elt : result) +- { +- if (strcmp (elt.get (), "$datadir") == 0) +- { +- elt = make_unique_xstrdup (gdb_datadir.c_str ()); +- if (debug_auto_load) +- auto_load_debug_printf ("Expanded $datadir to \"%s\".", +- gdb_datadir.c_str ()); +- } +- else if (strcmp (elt.get (), "$debugdir") == 0) +- { +- elt = make_unique_xstrdup (debug_file_directory.c_str ()); +- if (debug_auto_load) +- auto_load_debug_printf ("Expanded $debugdir to \"%s\".", +- debug_file_directory.c_str ()); +- } +- } ++ if (debug_auto_load && strcmp (s, string) != 0) ++ auto_load_debug_printf ("Expanded $-variables to \"%s\".", s); ++ ++ std::vector> dir_vec ++ = dirnames_to_char_ptr_vec (s); ++ xfree(s); + +- return result; ++ return dir_vec; + } + + /* Update auto_load_safe_path_vec from current AUTO_LOAD_SAFE_PATH. */ +diff --git a/gdb/unittests/utils-selftests.c b/gdb/unittests/utils-selftests.c +new file mode 100644 +index 00000000000..70609aa4294 +--- /dev/null ++++ b/gdb/unittests/utils-selftests.c +@@ -0,0 +1,60 @@ ++/* Unit tests for the utils.c file. ++ ++ Copyright (C) 2018-2023 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include "defs.h" ++#include "utils.h" ++#include "gdbsupport/selftest.h" ++ ++namespace selftests { ++namespace utils { ++ ++static void ++test_substitute_path_component () ++{ ++ auto test = [] (std::string s, const char *from, const char *to, ++ const char *expected) ++ { ++ char *temp = xstrdup (s.c_str ()); ++ substitute_path_component (&temp, from, to); ++ SELF_CHECK (strcmp (temp, expected) == 0); ++ xfree (temp); ++ }; ++ ++ test ("/abc/$def/g", "abc", "xyz", "/xyz/$def/g"); ++ test ("abc/$def/g", "abc", "xyz", "xyz/$def/g"); ++ test ("/abc/$def/g", "$def", "xyz", "/abc/xyz/g"); ++ test ("/abc/$def/g", "g", "xyz", "/abc/$def/xyz"); ++ test ("/abc/$def/g", "ab", "xyz", "/abc/$def/g"); ++ test ("/abc/$def/g", "def", "xyz", "/abc/$def/g"); ++ test ("/abc/$def/g", "abc", "abc", "/abc/$def/g"); ++ test ("/abc/$def/g", "abc", "", "//$def/g"); ++ test ("/abc/$def/g", "abc/$def", "xyz", "/xyz/g"); ++ test ("/abc/$def/abc", "abc", "xyz", "/xyz/$def/xyz"); ++} ++ ++} ++} ++ ++void _initialize_utils_selftests (); ++void ++_initialize_utils_selftests () ++{ ++ selftests::register_test ("substitute_path_component", ++ selftests::utils::test_substitute_path_component); ++} +diff --git a/gdb/utils.c b/gdb/utils.c +index 46bfd9a5bbb..cacd6cbd23e 100644 +--- a/gdb/utils.c ++++ b/gdb/utils.c +@@ -3346,6 +3346,51 @@ parse_pid_to_attach (const char *args) + return pid; + } + ++/* Substitute all occurrences of string FROM by string TO in *STRINGP. *STRINGP ++ must come from xrealloc-compatible allocator and it may be updated. FROM ++ needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be ++ located at the start or end of *STRINGP. */ ++ ++void ++substitute_path_component (char **stringp, const char *from, const char *to) ++{ ++ char *string = *stringp, *s; ++ const size_t from_len = strlen (from); ++ const size_t to_len = strlen (to); ++ ++ for (s = string;;) ++ { ++ s = strstr (s, from); ++ if (s == NULL) ++ break; ++ ++ if ((s == string || IS_DIR_SEPARATOR (s[-1]) ++ || s[-1] == DIRNAME_SEPARATOR) ++ && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len]) ++ || s[from_len] == DIRNAME_SEPARATOR)) ++ { ++ char *string_new; ++ ++ string_new ++ = (char *) xrealloc (string, (strlen (string) + to_len + 1)); ++ ++ /* Relocate the current S pointer. */ ++ s = s - string + string_new; ++ string = string_new; ++ ++ /* Replace from by to. */ ++ memmove (&s[to_len], &s[from_len], strlen (&s[from_len]) + 1); ++ memcpy (s, to, to_len); ++ ++ s += to_len; ++ } ++ else ++ s++; ++ } ++ ++ *stringp = string; ++} ++ + #ifdef HAVE_WAITPID + + #ifdef SIGALRM +diff --git a/gdb/utils.h b/gdb/utils.h +index 3faac20ec0f..ad0a86746b8 100644 +--- a/gdb/utils.h ++++ b/gdb/utils.h +@@ -136,6 +136,9 @@ private: + extern int gdb_filename_fnmatch (const char *pattern, const char *string, + int flags); + ++extern void substitute_path_component (char **stringp, const char *from, ++ const char *to); ++ + std::string ldirname (const char *filename); + + extern int count_path_elements (const char *path); +-- +cgit + diff --git a/sys-devel/gdb/gdb-13.2-r1.ebuild b/sys-devel/gdb/gdb-13.2-r2.ebuild similarity index 99% rename from sys-devel/gdb/gdb-13.2-r1.ebuild rename to sys-devel/gdb/gdb-13.2-r2.ebuild index 09dfedaf1ee1..9159d8230726 100644 --- a/sys-devel/gdb/gdb-13.2-r1.ebuild +++ b/sys-devel/gdb/gdb-13.2-r2.ebuild @@ -111,6 +111,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch "${FILESDIR}"/${P}-fix-sparc-debugging.patch + "${FILESDIR}"/${P}-fix-auto-load-path-expansion.patch ) pkg_setup() {