commit:     94c042b123a392209179d33836282f85db02db0f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 15 05:23:41 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 05:23:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c042b1

app-shells/bash: add 5.4_alpha_pre20251014

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-shells/bash/Manifest                          |   1 +
 app-shells/bash/bash-5.4_alpha_pre20251014.ebuild | 463 ++++++++++++++++++++++
 2 files changed, 464 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 642c098b7a4d..8f67258bcc29 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -27,6 +27,7 @@ DIST bash-5.3.tar.gz.sig 95 BLAKE2B 
2fb04e4f699fdee6e583581821cf9a5fa435a00febf7
 DIST 
bash-5.4_alpha_pre20250918-cf8a2518c8b94f75b330d398f5daa0ee21417e1b.tar.gz 
16611222 BLAKE2B 
4c6f4713da5f1b103176980b5def4c8643ca43b2c97faf3cab61f64baf562c3871bb0f5843164de617eb4f9dcab5c5a11ddd1f31e8614ddc5ff00c41893c4ef7
 SHA512 
2d0b90277c6e9130064d712c6167e5a2871b0485251cca746a57055e08626b9a11be0cb134f082446ee8db82043eb1eb7f8b20fa58e8cdc859638f50cb16d56d
 DIST 
bash-5.4_alpha_pre20251001-4f536430e45d847d6945133690312a8e94762254.tar.gz 
16561642 BLAKE2B 
8d33d6916e9590d1ce842621318de7c11c6b5994312c07aabff289714723bce4a58f395f38e76ebad83eb65693fcd90c9cc844e79e3c6762ce582ab60a6c2d30
 SHA512 
b83d6ef0972dbab6ad050a5c6a5d2a349640c706efdedd1ed37068f04d7289a93c225bb45cc96fb8f164239cd3786621a7089dc887dba1abd6314ab4679cab26
 DIST 
bash-5.4_alpha_pre20251007-25c6aa5b230167c6471898539c46dd2891d891a5.tar.gz 
16566456 BLAKE2B 
3623eaf45fa81666f2e5c7e8d38f89a24f95f1e697c8e8c7f728ef7a867563bc2880b10efcb8365bcc3e1352eaec153bffa79e49a79d8a09780d6079434c0ae7
 SHA512 
1d98f20baa6af53f08a15606f398d4546b8e16946f0621d8d96fb964adea2f8ace7b474d83e6997ce6473b807d6d30a47dd3492cd3bef7f6be8ba669784e4b67
+DIST 
bash-5.4_alpha_pre20251014-6a48b39bba066d6ce1e14dc86a864119aa1923d0.tar.gz 
16568971 BLAKE2B 
e4f25d2fd567f5a3f4a400798e37c0894c24210e9605f1d2e346ec482b2f1c9e3686824bc011b3dbf137be89f28f44ae7819eaa9443525477d9b342efe41279a
 SHA512 
2181a827f9aa8e18d9b63cab26527d18f34130e316c4d2d65dcad5ace908ae3dfecab16d55c20a752fef7475a9bf5417d29c88e615722015605dfcc45bdde2a3
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-5.4_alpha_pre20251014.ebuild 
b/app-shells/bash/bash-5.4_alpha_pre20251014.ebuild
new file mode 100644
index 000000000000..308841ef4162
--- /dev/null
+++ b/app-shells/bash/bash-5.4_alpha_pre20251014.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel.
+case ${PV} in
+       9999|*_alpha*|*_beta*|*_rc*)
+               # Set a negative patchlevel to indicate that it's a pre-release.
+               PLEVEL=-1
+               if [[ ${PV} =~ _pre[0-9]{8}$ ]]; then
+                       BASH_COMMIT="6a48b39bba066d6ce1e14dc86a864119aa1923d0"
+               fi
+               ;;
+       *_p*)
+               PLEVEL=${PV##*_p}
+               ;;
+       *)
+               PLEVEL=0
+esac
+
+# The version of readline this bash normally ships with. Note that we only use
+# the bundled copy of readline for pre-releases.
+READLINE_VER="8.3"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html 
https://git.savannah.gnu.org/cgit/bash.git";
+
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git";
+       EGIT_BRANCH=devel
+       inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${BASH_COMMIT} ]]; then
+       # It can be useful to have snapshots in the pre-release period once
+       # the first alpha is out, as various bugs get reported and fixed from
+       # the alpha, and the next pre-release is usually quite far away.
+       #
+       # i.e. if it's worth packaging the alpha, it's worth packaging a 
followup.
+       
SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz
 -> ${P}-${BASH_COMMIT}.tar.gz"
+       S=${WORKDIR}/${PN}-${BASH_COMMIT}
+else
+       my_urls=( "mirror://gnu/bash/${MY_P}.tar.gz" )
+
+       # bash-5.1 -> bash51
+       my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+       for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+               printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+               my_urls+=( "mirror://gnu/bash/${MY_P}-patches/${my_patch_ver}" )
+               MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+       done
+
+       SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+       S=${WORKDIR}/${MY_P}
+
+       unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+       SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz";
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if (( PLEVEL >= 0 )); then
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+       >=sys-libs/ncurses-5.2-r2:=
+       nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+       DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+       ${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, 
bash51-011).
+BDEPEND="
+       pgo? ( dev-util/gperf )
+       verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+       #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+       # Patches to or from Chet, posted to the bug-bash mailing list.
+       "${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+)
+
+pkg_setup() {
+       # bug #7332
+       if is-flag -malign-double; then
+               eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+               eerror "as it breaks LFS (struct stat64) on x86."
+               die "remove -malign-double from your CFLAGS mr ricer"
+       fi
+
+       if use bashlogger; then
+               ewarn "The logging patch should ONLY be used in restricted 
(i.e. honeypot) envs."
+               ewarn "This will log ALL output you enter into the shell, you 
have been warned."
+       fi
+}
+
+src_unpack() {
+       local patch
+
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       elif (( PLEVEL < 0 )) && [[ ${BASH_COMMIT} ]]; then
+               default
+       else
+               if use verify-sig; then
+                       verify-sig_verify_detached 
"${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+                       for patch in "${MY_PATCHES[@]}"; do
+                               verify-sig_verify_detached "${patch}"{,.sig}
+                       done
+               fi
+
+               unpack "${MY_P}.tar.gz"
+
+               if [[ ${GENTOO_PATCH_VER} ]]; then
+                       unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+               fi
+       fi
+}
+
+src_prepare() {
+       # Include official patches.
+       (( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+       # Prefixify hardcoded path names. No-op for non-prefix.
+       hprefixify pathnames.h.in
+
+       # Avoid regenerating docs after patches, bug #407985.
+       sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+       && touch -r . doc/* \
+       || die
+
+       # Sometimes hangs (more noticeable w/ pgo), bug #907403.
+       rm tests/run-jobs || die
+
+       eapply -p0 "${PATCHES[@]}"
+       eapply_user
+}
+
+src_configure() {
+       local -a myconf
+
+       # Upstream only test with Bison and require GNUisms like YYEOF and
+       # YYERRCODE. The former at least may be in POSIX soon:
+       # https://www.austingroupbugs.net/view.php?id=1269.
+       #
+       # configure warns on use of non-Bison but doesn't abort. The result
+       # may misbehave at runtime. Chet also advises against use of byacc:
+       # https://lists.gnu.org/archive/html/bug-bash/2025-08/msg00115.html
+       unset -v YACC
+
+       if tc-is-cross-compiler; then
+               export CFLAGS_FOR_BUILD="${BUILD_CFLAGS} -std=gnu17"
+       fi
+
+       myconf=(
+               --disable-profiling
+
+               # Force linking with system curses ... the bundled termcap lib
+               # sucks bad compared to ncurses.  For the most part, ncurses
+               # is here because readline needs it.  But bash itself calls
+               # ncurses in one or two small places :(.
+               --with-curses
+
+               $(use_enable mem-scramble)
+               $(use_enable net net-redirections)
+               $(use_enable readline)
+               $(use_enable readline bang-history)
+               $(use_enable readline history)
+               $(use_with afs)
+               $(use_with mem-scramble bash-malloc)
+       )
+
+       # For descriptions of these, see config-top.h.
+       # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+       append-cppflags \
+               
-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\'
 \
+               
-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\'
 \
+               
-DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\'
 \
+               -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+               -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+               -DNON_INTERACTIVE_LOGIN_SHELLS \
+               -DSSH_SOURCE_BASHRC \
+               $(use bashlogger && echo -DSYSLOG_HISTORY)
+
+       use nls || myconf+=( --disable-nls )
+
+       if (( PLEVEL >= 0 )); then
+               # Historically, we always used the builtin readline, but since
+               # our handling of SONAME upgrades has gotten much more stable
+               # in the PM (and the readline ebuild itself preserves the old
+               # libs during upgrades), linking against the system copy should
+               # be safe.
+               # Exact cached version here doesn't really matter as long as it
+               # is at least what's in the DEPEND up above.
+               export ac_cv_rl_version=${READLINE_VER%%_*}
+
+               # Use system readline only with released versions.
+               myconf+=( --with-installed-readline=. )
+       fi
+
+       if use plugins; then
+               append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+       else
+               # Disable the plugins logic by hand since bash doesn't provide
+               # a way of doing it.
+               export ac_cv_func_dl{close,open,sym}=no \
+                       ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+               sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+       fi
+
+       # bug #444070
+       tc-export AR
+
+       econf "${myconf[@]}"
+}
+
+src_compile() {
+       local -a pgo_generate_flags pgo_use_flags
+       local flag
+
+       # -fprofile-partial-training because upstream notes the test suite isn't
+       # super comprehensive.
+       # 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+       if use pgo; then
+               pgo_generate_flags=(
+                       -fprofile-update=atomic
+                       -fprofile-dir="${T}"/pgo
+                       -fprofile-generate="${T}"/pgo
+               )
+               pgo_use_flags=(
+                       -fprofile-use="${T}"/pgo
+                       -fprofile-dir="${T}"/pgo
+               )
+               if flag=$(test-flags-CC -fprofile-partial-training); then
+                       pgo_generate_flags+=( "${flag}" )
+                       pgo_use_flags+=( "${flag}" )
+               fi
+       fi
+
+       emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+       use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_generate_flags[*]}" all others
+
+       # Build Bash and run its tests to generate profiles.
+       if (( ${#pgo_generate_flags[@]} )); then
+               # Used in test suite.
+               unset -v A
+
+               emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
+
+               if tc-is-clang; then
+                       llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
+               fi
+
+               # Rebuild Bash using the profiling data we just generated.
+               emake clean
+               emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+               use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_use_flags[*]}" all others
+       fi
+}
+
+src_test() {
+       # Used in test suite.
+       unset -v A
+
+       default
+}
+
+src_install() {
+       local d f
+
+       default
+
+       my_prefixify() {
+               while read -r; do
+                       if [[ $REPLY == *$1* ]]; then
+                               REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+                       fi
+                       printf '%s\n' "${REPLY}" || ! break
+               done < "$2" || die
+       }
+
+       dodir /bin
+       mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+       dosym bash /bin/rbash
+
+       insinto /etc/bash
+       doins "${FILESDIR}"/bash_logout
+       my_prefixify bashrc.d "${FILESDIR}"/bashrc-r2 | newins - bashrc
+
+       insinto /etc/bash/bashrc.d
+       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r2.bash 
| newins - 10-gentoo-color.bash
+       newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r3.bash 
10-gentoo-title.bash
+
+       insinto /etc/profile.d
+       doins "${FILESDIR}/profile.d/00-prompt-command.sh"
+
+       insinto /etc/skel
+       for f in bash{_logout,_profile,rc}; do
+               newins "${FILESDIR}/skel/dot-${f}" ".${f}"
+       done
+
+       if use plugins; then
+               exeinto "/usr/$(get_libdir)/bash"
+               set -- examples/loadables/*.o
+               doexe "${@%.o}"
+
+               insinto /usr/include/bash-plugins
+               doins *.h builtins/*.h include/*.h 
lib/{glob/glob.h,tilde/tilde.h}
+       fi
+
+       if use examples; then
+               for d in examples/{functions,misc,scripts,startup-files}; do
+                       exeinto "/usr/share/doc/${PF}/${d}"
+                       docinto "${d}"
+                       for f in "${d}"/*; do
+                               if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+                                       doexe "${f}"
+                               else
+                                       dodoc "${f}"
+                               fi
+                       done
+               done
+       fi
+
+       # Install bash_builtins.1 and rbash.1.
+       emake -C doc DESTDIR="${D}" install_builtins
+       sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+       doman "${T}"/rbash.1
+
+       newdoc CWRU/changelog ChangeLog
+       dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+       if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+               mkdir -p -- "${EROOT}"/etc/bash \
+               && mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+               || die
+       fi
+}
+
+pkg_postinst() {
+       local IFS old_ver ver
+       local -a versions
+
+       # If /bin/sh does not exist, provide it.
+       if [[ ! -e ${EROOT}/bin/sh ]]; then
+               ln -sf -- bash "${EROOT}"/bin/sh || die
+       fi
+
+       if [[ -e ${EROOT}/etc/bash/bashrc.d/15-gentoo-bashrc-check.bash ]]; then
+               ewarn "The following file is no longer packaged and can safely 
be deleted:"
+               ewarn "${EROOT}/etc/bash/bashrc.d/15-gentoo-bashrc-check.bash"
+       fi
+
+       read -rd '' -a versions <<<"${REPLACING_VERSIONS}"
+       for ver in "${versions[@]}"; do
+               if [[ ! ${old_ver} ]] || ver_test "${ver}" -lt "${old_ver}"; 
then
+                       old_ver=${ver}
+               fi
+       done
+
+       if [[ ! ${old_ver} ]]; then
+               return
+       fi
+
+       {
+               if ver_test "${old_ver}" -ge "5.2" \
+                       && ver_test "${old_ver}" -ge "5.2_p26-r8"
+               then
+                       :
+               elif ver_test "${old_ver}" -lt "5.2" \
+                       && ver_test "${old_ver}" -ge "5.1_p16-r8"
+               then
+                       :
+               else
+                       cat <<'EOF'
+Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, it may contain a command to set
+the terminal's window title. Those who were already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash set the window title in the case
+that the terminal is controlled by sshd(8), unless screen is launched on the
+remote side or the terminal reliably supports saving and restoring the title
+(as alacritty, foot and tmux do). Those wanting for the title to be set
+regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
+drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
+               fi
+
+               if ver_test "${old_ver}" -ge "5.3" \
+                       && ver_test "${old_ver}" -ge "5.3_p3-r3"
+               then
+                       :
+               elif ver_test "${old_ver}" -lt "5.3" \
+                       && ver_test "${old_ver}" -ge "5.2_p37-r5"
+               then
+                       :
+               else
+                       cat <<'EOF'
+The window title setting behaviour has been improved. It is now formatted as
+"\u@\h \W", in accordance with the prompting mechanism of bash. For example,
+after switching to the home directory, the current working directly will be
+shown as the <tilde> character.
+
+The value of PROMPT_DIRTRIM is now respected. If this variable is unset, the
+use of the \W prompt string escape will prevail, with the current working
+directory typically being shown as its basename. If set to 0 or greater, \w
+will be used instead, which may be trimmed. This also means that the title
+can be made to show the full path by setting PROMPT_DIRTRIM=0.
+
+For further information, run info '(bash)Bash Variables' or visit
+https://www.gnu.org/software/bash/manual/bash.html#index-PROMPT_005fDIRTRIM.
+EOF
+               fi
+       } \
+       | if [[ ${COLUMNS} == [1-9]*([0-9]) ]] && (( COLUMNS > 80 )); then
+               fmt -w "$(( COLUMNS - 3 ))"
+       else
+               cat
+       fi \
+       | while read -r; do
+               ewarn "${REPLY}"
+       done
+}

Reply via email to