From 951a3f380d6c72b8f4c5d1ca6dbb0c20eea935d6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 25 Mar 2024 07:10:27 +0000 Subject: [PATCH] app-shells/bash: Sync with Gentoo It's from Gentoo commit 59964f00f4693640b0701d2dd98e63a9eed23a56. --- .../app-shells/bash/bash-2.05b_p13.ebuild | 8 +++++++- .../app-shells/bash/bash-3.0_p22.ebuild | 8 +++++++- .../app-shells/bash/bash-3.1_p23.ebuild | 8 +++++++- .../app-shells/bash/bash-3.2_p57.ebuild | 8 +++++++- .../bash/files/bash-5.2_p21-memory-leak.patch | 18 ------------------ 5 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-2.05b_p13.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-2.05b_p13.ebuild index ef9bd98f10..ac35d6f81d 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-2.05b_p13.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-2.05b_p13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -95,6 +95,12 @@ src_prepare() { } src_configure() { + #/var/tmp/portage/app-shells/bash-3.2_p57/temp/ccW7JJDK.ltrans2.ltrans.o: in function `shell_execve': + # :(.text+0x8b30): undefined reference to `__setostype' + # + # It works fine in bash 4+. Backporting may not be worth it. + filter-lto + local myconf=( --with-installed-readline=. diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.0_p22.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.0_p22.ebuild index 15629ba77d..712faa8388 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.0_p22.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.0_p22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -100,6 +100,12 @@ src_prepare() { } src_configure() { + #/var/tmp/portage/app-shells/bash-3.2_p57/temp/ccW7JJDK.ltrans2.ltrans.o: in function `shell_execve': + # :(.text+0x8b30): undefined reference to `__setostype' + # + # It works fine in bash 4+. Backporting may not be worth it. + filter-lto + local myconf=( --with-installed-readline=. diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.1_p23.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.1_p23.ebuild index 9e742a38c0..6f42f41dd6 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.1_p23.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.1_p23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -95,6 +95,12 @@ src_prepare() { } src_configure() { + #/var/tmp/portage/app-shells/bash-3.2_p57/temp/ccW7JJDK.ltrans2.ltrans.o: in function `shell_execve': + # :(.text+0x8b30): undefined reference to `__setostype' + # + # It works fine in bash 4+. Backporting may not be worth it. + filter-lto + local myconf=( --with-installed-readline=. diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.2_p57.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.2_p57.ebuild index fd2dedaf8b..ea0dfd5ce4 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.2_p57.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-3.2_p57.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -97,6 +97,12 @@ src_prepare() { } src_configure() { + #/var/tmp/portage/app-shells/bash-3.2_p57/temp/ccW7JJDK.ltrans2.ltrans.o: in function `shell_execve': + # :(.text+0x8b30): undefined reference to `__setostype' + # + # It works fine in bash 4+. Backporting may not be worth it. + filter-lto + local myconf=( --with-installed-readline=. diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch b/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch deleted file mode 100644 index 19c25e95ea..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00011.html -https://git.savannah.gnu.org/cgit/bash.git/diff/builtins/evalstring.c?h=devel&id=81f7b44564cd1510788035cea7c59631865a7db2&dt=1#n766 - -*** builtins/evalstring.c Tue Dec 13 12:53:21 2022 ---- builtins/evalstring.c Tue Nov 28 17:25:39 2023 -*************** -*** 763,766 **** ---- 773,779 ---- - if (fnp) - *fnp = fn; -+ else -+ free (fn); -+ - return fd; - } - - -