[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 9d95ea1c4f26dcb47bc851039f51b75c726e4bdd
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed May 22 02:50:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 22 04:34:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d95ea1c

app-shells/bash: add whitelist for false positive configure implicit decls

makedev isn't supposed to exist where it is being checked here, but the
check itself vanishes in modern autoconf, and is thus unneeded for bash
5.2+.

Whitelist it just for the current version, which predates that.

Closes: https://bugs.gentoo.org/916480
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r10.ebuild | 6 ++
 app-shells/bash/bash-5.1_p16-r6.ebuild  | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/app-shells/bash/bash-5.1_p16-r10.ebuild 
b/app-shells/bash/bash-5.1_p16-r10.ebuild
index 2f4a6284d0a0..9141fddae28e 100644
--- a/app-shells/bash/bash-5.1_p16-r10.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -88,6 +88,12 @@ BDEPEND="
 # EAPI 8 tries to append it but it doesn't exist here.
 QA_CONFIGURE_OPTIONS="--disable-static"
 
+QA_CONFIG_IMPL_DECL_SKIP+=(
+   # this is fixed in autoconf 2.71, used in bash 5.2. The check fails
+   # regardless of GCC version. bug #916480
+   makedev
+)
+
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 

diff --git a/app-shells/bash/bash-5.1_p16-r6.ebuild 
b/app-shells/bash/bash-5.1_p16-r6.ebuild
index 7af661f690f8..488dbff0dc94 100644
--- a/app-shells/bash/bash-5.1_p16-r6.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r6.ebuild
@@ -96,6 +96,12 @@ BDEPEND="sys-devel/bison
 
 S="${WORKDIR}/${MY_P}"
 
+QA_CONFIG_IMPL_DECL_SKIP+=(
+   # this is fixed in autoconf 2.71, used in bash 5.2. The check fails
+   # regardless of GCC version. bug #916480
+   makedev
+)
+
 PATCHES=(
# Patches from Chet sent to bashbug ml

"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: e3deefeddb16a4e66a63cbd0f60ab2479f9f6e98
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 16:58:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 17:05:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3deefed

app-shells/bash: drop 5.1_p16-r7

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r7.ebuild | 328 -
 1 file changed, 328 deletions(-)

diff --git a/app-shells/bash/bash-5.1_p16-r7.ebuild 
b/app-shells/bash/bash-5.1_p16-r7.ebuild
deleted file mode 100644
index aca10522e9cb..
--- a/app-shells/bash/bash-5.1_p16-r7.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   *_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
-
-if is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   upstream_url_base="mirror://gnu/bash"
-   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
-   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-   # Add in the mirror URL too.
-   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
-
-   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-   done
-
-   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
-   fi
-else
-   SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig 
)"
-fi
-
-if [[ -n ${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"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-   >=sys-libs/ncurses-5.2-r2:0=
-   nls? ( virtual/libintl )
-   readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-   ${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, 
bash51-011)
-BDEPEND="sys-devel/bison
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   # Patches from Chet sent to bashbug ml
-   
"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
-
-   "${FILESDIR}"/${PN}-5.1_p16-configure-clang16.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() {
-   if [[ ${PV} ==  ]] ; then
-   git-r3_src_unpack
-   else
-   if use verify-sig ; then
-   verify-sig_verify_detached 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 13c204aad36075689ae1009dff8dcda54509d3b3
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 16:58:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 17:05:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c204aa

app-shells/bash: drop 5.2_p26

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p26.ebuild | 375 
 1 file changed, 375 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p26.ebuild 
b/app-shells/bash/bash-5.2_p26.ebuild
deleted file mode 100644
index e961ca5b7193..
--- a/app-shells/bash/bash-5.2_p26.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2024 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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   upstream_url_base="mirror://gnu/bash"
-   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
-   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-   # Add in the mirror URL too.
-   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
-
-   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-   done
-
-   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-   SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz;
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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 from Chet sent to bash-bug ml
-   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
-   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
-   "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
-   "${FILESDIR}"/${PN}-5.2_p21-configure-strtold.patch
-   "${FILESDIR}"/${PN}-5.2_p26-memory-leaks.patch
-)
-
-pkg_setup() {
-

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Joonas Niilola]

commit: 02be02c286d404b426170105b4edb99089984cfb
Author: Alfred Wingate  protonmail  com>
AuthorDate: Fri May 10 12:17:29 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 10 12:55:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02be02c2

app-shells/bash-completion: disable py3.13

* To add a target that isn't supported by bash-completions you have
  first modify the completions file to add the new target and symlink
  it.
* Symlinking is incorrectly done currently as dosym adds D already.

Closes: https://bugs.gentoo.org/931665
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36627
Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/bash-completion/bash-completion-2.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash-completion/bash-completion-2.14.0.ebuild 
b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
index b415c8c8303c..a66af6d25158 100644
--- a/app-shells/bash-completion/bash-completion-2.14.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/, app-shells/bash-completion/files/

[Arthur Zamarin]

commit: fc6a4f1238d28b66c13266c78493809e55b0ccb1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 10 09:02:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 10 09:04:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6a4f12

app-shells/bash-completion: add 2.14.0

- Also apply fix to optimize kernel modules search completion

Closes: https://bugs.gentoo.org/669128
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/bash-completion/Manifest|   1 +
 .../bash-completion/bash-completion-2.14.0.ebuild  | 178 +
 ...completion-2.14.0-optimize-kernel-modules.patch |  13 ++
 3 files changed, 192 insertions(+)

diff --git a/app-shells/bash-completion/Manifest 
b/app-shells/bash-completion/Manifest
index 52be88d63b02..d7b1043721ff 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,3 +1,4 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 
98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3
 SHA512 
41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bash-completion-2.13.0.tar.xz 424956 BLAKE2B 
5055118378f99ea679cc9e6e2c12a2c82b3428bae3f87b2b73df448ce31c68567fc18423332fccd6f3c0c7ceb3ae8d0f0a84eec7ddbd8c2b7868061a03c4a8a5
 SHA512 
7c65fea599a25c2c9d6ef300a9cc2d5fbabd0bcc9e09fe32bb706d3398936f40501171f03280f042465bc0d9aca4b1b53c2c13a99bbdfb6fe916767a267158af
+DIST bash-completion-2.14.0.tar.xz 428980 BLAKE2B 
c28ec0cd348a3954461f7a865823a358e47c4b479c7812baa6d54aef856c958510967806550e62784955f9daf233a0b01edade19884e534df857472a3196e63e
 SHA512 
2e12d2e57c932b931a6cfe59234f9d33d715538d6ea4eb72ed4ed3d8d2cf2cedaf08fcb6abaf3117e06115d892283e38a07b3abe5c91c026d2c06a0f64e347bd
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 
75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295
 SHA512 
b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008

diff --git a/app-shells/bash-completion/bash-completion-2.14.0.ebuild 
b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
new file mode 100644
index ..b415c8c8303c
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion;
+SRC_URI="
+   
https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+   eselect? (
+   
https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+   )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+eselect test"
+RESTRICT="!test? ( test )"
+
+# completion collision with net-fs/mc
+RDEPEND="
+   >=app-shells/bash-4.3_p30-r1:0
+   sys-apps/miscfiles
+   !http://www.zsh.org/mla/workers/2003/msg00046.html;
+   elog
+   fi
+}

diff --git 
a/app-shells/bash-completion/files/bash-completion-2.14.0-optimize-kernel-modules.patch
 
b/app-shells/bash-completion/files/bash-completion-2.14.0-optimize-kernel-modules.patch
new file mode 100644
index ..10771ac3d92e
--- /dev/null
+++ 
b/app-shells/bash-completion/files/bash-completion-2.14.0-optimize-kernel-modules.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/669128#c3
+
+--- a/bash_completion
 b/bash_completion
+@@ -2037,7 +2037,7 @@ _comp__init_set_up_service_completions
+ _comp_compgen_kernel_modules()
+ {
+ local _modpath=/lib/modules/$1
+-_comp_compgen_split -- "$(command ls -RL "$_modpath" 2>/dev/null |
++_comp_compgen_split -- "$(command ls -RL "$_modpath"/!(source|build) 
2>/dev/null |
+ command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p' \
+ -e 's/^\(.*\)\.ko\.zst$/\1/p')"
+ }

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: ee38c3bd430aea6267b9dbe51888ab58bb6be7c2
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 12:44:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 12:44:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee38c3bd

app-shells/bash-completion: fix blocker atom (!)

Fixes: 3502e4f637e92eedb871b5aab25aec6ea238308a
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild 
b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
index 49356d7680a3..c3b7f3ec814f 100644
--- a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
>=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
-   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: 91ed9b9bf5b22a62ceb5652c1a1244d1f36847ac
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 12:39:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 12:39:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ed9b9b

app-shells/bash-completion: sync live (partly)

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash-completion/bash-completion-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 908ef5fe7dae..7149a05dc495 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
@@ -71,6 +72,7 @@ strip_completions() {
 python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: 2fa63f232bd267a47055cbb0ce024d3b03929c39
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 12:37:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 12:37:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa63f23

app-shells/bash-completion: add pytest-forked test dep

I'm actually wondering if I'm forgetting something here, because I was
convinced pytest-forked or something merged into pytest-xdist...?

Closes: https://bugs.gentoo.org/931131
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild 
b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
index 19a8ed2ada9a..49356d7680a3 100644
--- a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
@@ -78,6 +79,7 @@ strip_completions() {
 python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: 3502e4f637e92eedb871b5aab25aec6ea238308a
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 12:34:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 12:35:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3502e4f6

app-shells/bash-completion: block old app-text/tree which installs its own 
completion

>=app-text/tree-2.1.1-r1 defers to the new one in >=bash-completion-2.13.0.

Closes: https://bugs.gentoo.org/931129
Signed-off-by: Sam James  gentoo.org>

 .../{bash-completion-2.13.0.ebuild => bash-completion-2.13.0-r1.ebuild}  | 1 +
 app-shells/bash-completion/bash-completion-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-shells/bash-completion/bash-completion-2.13.0.ebuild 
b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
similarity index 99%
rename from app-shells/bash-completion/bash-completion-2.13.0.ebuild
rename to app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
index e3dbaa5e5448..19a8ed2ada9a 100644
--- a/app-shells/bash-completion/bash-completion-2.13.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
@@ -27,6 +27,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
>=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Arthur Zamarin]

commit: dd38e7c04822e057068e3ec0c1f1104714f02709
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  3 10:47:36 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  3 10:48:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd38e7c0

app-shells/bash-completion: sync live

Closes: https://bugs.gentoo.org/865511
Signed-off-by: Arthur Zamarin  gentoo.org>

 .../bash-completion/bash-completion-.ebuild| 25 +++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index d9a8954d6f32..452614926c31 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -13,7 +13,6 @@ EGIT_REPO_URI="https://github.com/scop/bash-completion;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
@@ -29,6 +28,7 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
 "
@@ -69,7 +69,8 @@ strip_completions() {
 
 python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -102,7 +103,16 @@ src_test() {
test/t/test_if{down,up}.py
# not available for icedtea
test/t/test_javaws.py
+   # TODO
+   test/t/test_vi.py::TestVi::test_2
+   test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159
+   test/t/test_xrandr.py::TestXrandr::test_output_filter
)
+   local EPYTEST_IGNORE=(
+   # stupid test that async tests work
+   test/fixtures/pytest/test_async.py
+   )
+   local EPYTEST_XDIST=1
 
# portage's HOME override breaks tests
local -x HOME=$(unset HOME; echo ~)
@@ -110,6 +120,7 @@ src_test() {
# used in pytest tests
local -x NETWORK=none
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
emake -C completions check
epytest
 }
@@ -122,7 +133,15 @@ src_install() {
 
strip_completions
 
-   dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+   dodoc AUTHORS CHANGELOG.md CONTRIBUTING.md README.md
+
+   # install the python completions for all targets, bug #622892
+   local TARGET
+   for TARGET in "${PYTHON_COMPAT[@]}"; do
+   if [[ ! -e 
"${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then
+   dosym python 
"${ED}"/usr/share/bash-completion/completions/${TARGET/_/.}
+   fi
+   done
 
# install the eselect module
if use eselect; then

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Arthur Zamarin]

commit: 24feb6d0810d596a6bcac874bec5b901389ba1d4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  3 10:40:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  3 10:48:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24feb6d0

app-shells/bash-completion: add 2.13.0

- add pytest-xdist for tests, for parallel testing
- automatically extend symlinks for all supported python targets
- fix CHANGES file rename
- disable some more tests we don't really care about

Closes: https://bugs.gentoo.org/886159
Closes: https://bugs.gentoo.org/622892
Closes: https://bugs.gentoo.org/836360
Closes: https://bugs.gentoo.org/734120
Closes: https://bugs.gentoo.org/669128
Bug: https://bugs.gentoo.org/865511
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/bash-completion/Manifest|   1 +
 .../bash-completion/bash-completion-2.13.0.ebuild  | 173 +
 2 files changed, 174 insertions(+)

diff --git a/app-shells/bash-completion/Manifest 
b/app-shells/bash-completion/Manifest
index 886d43bc8301..52be88d63b02 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,2 +1,3 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 
98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3
 SHA512 
41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
+DIST bash-completion-2.13.0.tar.xz 424956 BLAKE2B 
5055118378f99ea679cc9e6e2c12a2c82b3428bae3f87b2b73df448ce31c68567fc18423332fccd6f3c0c7ceb3ae8d0f0a84eec7ddbd8c2b7868061a03c4a8a5
 SHA512 
7c65fea599a25c2c9d6ef300a9cc2d5fbabd0bcc9e09fe32bb706d3398936f40501171f03280f042465bc0d9aca4b1b53c2c13a99bbdfb6fe916767a267158af
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 
75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295
 SHA512 
b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008

diff --git a/app-shells/bash-completion/bash-completion-2.13.0.ebuild 
b/app-shells/bash-completion/bash-completion-2.13.0.ebuild
new file mode 100644
index ..e3dbaa5e5448
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.13.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion;
+SRC_URI="
+   
https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+   eselect? (
+   
https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+   )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+eselect test"
+RESTRICT="!test? ( test )"
+
+# completion collision with net-fs/mc
+RDEPEND="
+   >=app-shells/bash-4.3_p30-r1:0
+   sys-apps/miscfiles
+   !!net-fs/mc
+"
+BDEPEND="
+   test? (
+   ${RDEPEND}
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   ')
+   )
+"
+PDEPEND="
+   >=app-shells/gentoo-bashcomp-20140911
+"
+
+strip_completions() {
+   # Remove unwanted completions.
+   local strip_completions=(
+   # Slackware package stuff, quite generic names cause collisions
+   # (e.g. with sys-apps/pacman)
+   explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+   # Debian/Red Hat network stuff
+   ifdown ifup ifquery ifstatus
+
+   # Installed in app-editors/vim-core
+   xxd
+
+   # Now-dead symlinks to deprecated completions
+   hd ncal
+
+   # FreeBSD
+   freebsd-update kldload kldunload portinstall portsnap
+   pkg_deinstall pkg_delete pkg_info
+   )
+
+   local file
+   for file in "${strip_completions[@]}"; do
+   rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+   die "stripping ${file} failed"
+   done
+
+   # remove deprecated completions (moved to other packages)
+   rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+   python_has_version 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Arthur Zamarin]

commit: a51f735ac3f440392819a9f261a3d1144e3135a8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  3 10:48:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  3 10:48:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51f735a

app-shells/bash-completion: add myself as a maintainer

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/bash-completion/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-shells/bash-completion/metadata.xml 
b/app-shells/bash-completion/metadata.xml
index 8b2bdc7b1a53..2336cf2dc57e 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -5,6 +5,10 @@
shell-to...@gentoo.org
Gentoo Shell Tools Project

+   
+   arthur...@gentoo.org
+   Arthur Zamarin
+   


Support blacklisting of completions via 'eselect 
bashcomp'.

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/bashrc.d/, app-shells/bash/files/

[Sam James]

commit: 8771b2ce786bcfe249cd03dc1d994f13266ce5c7
Author: Kerin Millar  plushkava  net>
AuthorDate: Tue Apr 30 00:16:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 02:36:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8771b2ce

app-shells/bash: support -readline properly, GLOBSORT protection, misc cleanups

Address a regression whereby the new initialisation files were composing
a PS1 prompt containing '\[' and '\]' for builds without readline
support. These sequences are normally used to denote sequences of
non-printing characters but are not treated specially unless readline
support is present. This came up 12 years ago as bug #432338. SpanKY's
solution at the time was to have the ebuild monkey-patch
/etc/bash/bashrc with sed, disabling colour support outright for the
USE="-readline" case. Unsurprisingly, moving the colour-related code to
a distinct bashrc.d snippet had prevented this method from being
effective.

After deliberating over the matter, I reached the conclusion that there
are already too many ebuilds containing overly brittle code of this
sort. Therefore, I decided to implement a runtime check instead.
Specifically, it is implemented as a trivial function, which works by
checking whether the direxpand shell option exists. This function is now
used in a twofold manner. Firstly, it is used to determine whether the
no_empty_cmd_completion and histappend shell options should be set in
etc/bash/bashrc (both of those require readline). Secondly, it it used
to determine whether the prompt should _not_ be colourised in
/etc/bash/bashrc.d/10-gentoo-color.bash, even in the case that the
terminal is understood to support colour.

Doing it this way has a few immediate benefits. No longer will colour
support be needlessly disabled outright; there was never any sense in
doing that. Instead, users that elect to compile bash without readline -
for whatever reason - may continue to enjoy full colour support with
only the prompt being rendered in monochrome. Moreover, the ebuild has
been simplified as a consequence of being able to completely drop the
section that defined sed_args before proceeding to clumsily modify
/etc/skel/.bashrc (with no effect, mind) and /etc/bash/bashrc.

Render /etc/bash/bashrc.d processing safer by unsetting the GLOBSORT
variable beforehand. This variable, which is introduced by
bash-5.3-alpha, allows for the user to affect the order in which words
occur as a result of pathname expansion. While there is no question that
the feature is useful, it must not be allowed to influence the order in
which files residing under /etc/bash/bashrc.d are processed. That is,
users must be able to expect that the files are processed in an order
that is based solely on the effective collation.

Remove st-256color from the list of terminals whitelisted for colour
support. There was no need for it to be there because it can already be
matched by the *color* globbing pattern.

The latest round of ebuilds have been cleaned up and should be slightly
easier to maintain from hereon. Further, they are now shellcheck-clean,
albeit with two warning categories having been disabled in the global
scope (so chosen because they aren't particularly helpful in the course
of evaluating ebuilds). Finally, version  has been updated so as to
be abreast of these developments.

Signed-off-by: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 ...5.3_alpha-r1.ebuild => bash-5.1_p16-r10.ebuild} | 291 +++--
 app-shells/bash/bash-5.1_p16-r9.ebuild | 363 -
 ...sh-5.2_p26-r2.ebuild => bash-5.2_p26-r3.ebuild} | 300 -
 3_alpha-r1.ebuild => bash-5.3_alpha-r2.ebuild} | 288 
 app-shells/bash/bash-.ebuild   | 302 +
 app-shells/bash/files/bashrc-r1|  15 +-
 .../bash/files/bashrc.d/10-gentoo-color.bash   |  33 +-
 7 files changed, 568 insertions(+), 1024 deletions(-)

diff --git a/app-shells/bash/bash-5.3_alpha-r1.ebuild 
b/app-shells/bash/bash-5.1_p16-r10.ebuild
similarity index 50%
copy from app-shells/bash/bash-5.3_alpha-r1.ebuild
copy to app-shells/bash/bash-5.1_p16-r10.ebuild
index 9b535f0e39eb..617706099afe 100644
--- a/app-shells/bash/bash-5.3_alpha-r1.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -1,194 +1,175 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# shellcheck shell=bash disable=2015,2034
 
 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
+# Uncomment if we have a patchset.
 #GENTOO_PATCH_DEV="sam"
 #GENTOO_PATCH_VER="${PV}"
 
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/_p*}

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: f7e98e17da6c3a9ddecad45d4d6ca5d51261db8a
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 02:25:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 02:36:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e98e17

app-shells/bash: drop shellcheck annotations; fix readline version

* Drop shellcheck annotations. We don't use them in ::gentoo right now.
  We might revisit that once shellcheck gains proper ebuild support, but right
  now, they serve as noise.

* Fix readline version for <5.3_alpha.

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r10.ebuild  | 6 +-
 app-shells/bash/bash-5.2_p26-r3.ebuild   | 6 +-
 app-shells/bash/bash-5.3_alpha-r2.ebuild | 4 
 app-shells/bash/bash-.ebuild | 4 
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app-shells/bash/bash-5.1_p16-r10.ebuild 
b/app-shells/bash/bash-5.1_p16-r10.ebuild
index 617706099afe..2f4a6284d0a0 100644
--- a/app-shells/bash/bash-5.1_p16-r10.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
 
 EAPI=8
 
@@ -31,7 +30,7 @@ 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_alpha"
+READLINE_VER="8.1"
 
 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;
@@ -168,7 +167,6 @@ src_configure() {
# may misbehave at runtime.
unset -v YACC
 
-   # shellcheck disable=2207
myconf=(
--disable-profiling
 
@@ -189,7 +187,6 @@ src_configure() {
 
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-   # shellcheck disable=2046
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\"\'
 \
@@ -277,7 +274,6 @@ src_install() {
doexe "${@%.o}"
 
insinto /usr/include/bash-plugins
-   # shellcheck disable=2035
doins *.h builtins/*.h include/*.h 
lib/{glob/glob.h,tilde/tilde.h}
fi
 

diff --git a/app-shells/bash/bash-5.2_p26-r3.ebuild 
b/app-shells/bash/bash-5.2_p26-r3.ebuild
index b4517186c6a1..3e1775504a62 100644
--- a/app-shells/bash/bash-5.2_p26-r3.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
 
 EAPI=8
 
@@ -31,7 +30,7 @@ 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_alpha"
+READLINE_VER="8.2_p1"
 
 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;
@@ -175,7 +174,6 @@ src_configure() {
# may misbehave at runtime.
unset -v YACC
 
-   # shellcheck disable=2207
myconf=(
--disable-profiling
 
@@ -196,7 +194,6 @@ src_configure() {
 
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-   # shellcheck disable=2046
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\"\'
 \
@@ -327,7 +324,6 @@ src_install() {
doexe "${@%.o}"
 
insinto /usr/include/bash-plugins
-   # shellcheck disable=2035
doins *.h builtins/*.h include/*.h 
lib/{glob/glob.h,tilde/tilde.h}
fi
 

diff --git a/app-shells/bash/bash-5.3_alpha-r2.ebuild 
b/app-shells/bash/bash-5.3_alpha-r2.ebuild
index aea9789a7642..f33bf717eac6 100644
--- a/app-shells/bash/bash-5.3_alpha-r2.ebuild
+++ b/app-shells/bash/bash-5.3_alpha-r2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
 
 EAPI=8
 
@@ -174,7 +173,6 @@ src_configure() {
# upstream to Chet by email.
filter-lto
 
-   # shellcheck disable=2207
myconf=(
--disable-profiling
 
@@ -195,7 +193,6 @@ src_configure() {
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 850855fd02bc6daec93cd9a11846493f948dd74f
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 13:55:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 13:55:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850855fd

app-shells/bash: fix variable order

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p26-r1.ebuild | 4 ++--
 app-shells/bash/bash-5.2_p26.ebuild| 4 ++--
 app-shells/bash/bash-5.3_alpha.ebuild  | 4 ++--
 app-shells/bash/bash-.ebuild   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p26-r1.ebuild 
b/app-shells/bash/bash-5.2_p26-r1.ebuild
index 05850e376233..0e803fa5048c 100644
--- a/app-shells/bash/bash-5.2_p26-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r1.ebuild
@@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then
SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz;
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
@@ -104,8 +106,6 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 # EAPI 8 tries to append it but it doesn't exist here
 QA_CONFIGURE_OPTIONS="--disable-static"
 

diff --git a/app-shells/bash/bash-5.2_p26.ebuild 
b/app-shells/bash/bash-5.2_p26.ebuild
index c2f04b77e525..e961ca5b7193 100644
--- a/app-shells/bash/bash-5.2_p26.ebuild
+++ b/app-shells/bash/bash-5.2_p26.ebuild
@@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then
SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz;
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
@@ -104,8 +106,6 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 # EAPI 8 tries to append it but it doesn't exist here
 QA_CONFIGURE_OPTIONS="--disable-static"
 

diff --git a/app-shells/bash/bash-5.3_alpha.ebuild 
b/app-shells/bash/bash-5.3_alpha.ebuild
index 7fd382331ee9..036e48751a1f 100644
--- a/app-shells/bash/bash-5.3_alpha.ebuild
+++ b/app-shells/bash/bash-5.3_alpha.ebuild
@@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then
SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz;
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
@@ -104,8 +106,6 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 # EAPI 8 tries to append it but it doesn't exist here
 QA_CONFIGURE_OPTIONS="--disable-static"
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 7fd382331ee9..036e48751a1f 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then
SRC_URI+=" 
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz;
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
@@ -104,8 +106,6 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 # EAPI 8 tries to append it but it doesn't exist here
 QA_CONFIGURE_OPTIONS="--disable-static"
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 0a4c8143b201ad2e042d64d1129b87747bb4b461
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 13:53:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 13:55:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4c8143

app-shells/bash: add verify-sig to mirror URL too

Closes: https://bugs.gentoo.org/928373
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r6.ebuild | 4 ++--
 app-shells/bash/bash-5.1_p16-r7.ebuild | 4 ++--
 app-shells/bash/bash-5.1_p16-r8.ebuild | 4 ++--
 app-shells/bash/bash-5.2_p26-r1.ebuild | 2 +-
 app-shells/bash/bash-5.2_p26.ebuild| 2 +-
 app-shells/bash/bash-5.3_alpha.ebuild  | 2 +-
 app-shells/bash/bash-.ebuild   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-shells/bash/bash-5.1_p16-r6.ebuild 
b/app-shells/bash/bash-5.1_p16-r6.ebuild
index 4553ec952476..7af661f690f8 100644
--- a/app-shells/bash/bash-5.1_p16-r6.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,7 +60,7 @@ if is_release ; then
 
# Add in the mirror URL too.
SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
 
MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done

diff --git a/app-shells/bash/bash-5.1_p16-r7.ebuild 
b/app-shells/bash/bash-5.1_p16-r7.ebuild
index 26db8787ba76..aca10522e9cb 100644
--- a/app-shells/bash/bash-5.1_p16-r7.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,7 +60,7 @@ if is_release ; then
 
# Add in the mirror URL too.
SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
 
MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done

diff --git a/app-shells/bash/bash-5.1_p16-r8.ebuild 
b/app-shells/bash/bash-5.1_p16-r8.ebuild
index 97f08a41017e..41b73878797e 100644
--- a/app-shells/bash/bash-5.1_p16-r8.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,7 +60,7 @@ if is_release ; then
 
# Add in the mirror URL too.
SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
 
MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done

diff --git a/app-shells/bash/bash-5.2_p26-r1.ebuild 
b/app-shells/bash/bash-5.2_p26-r1.ebuild
index 0db88e2a73fd..05850e376233 100644
--- a/app-shells/bash/bash-5.2_p26-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r1.ebuild
@@ -65,7 +65,7 @@ elif is_release ; then
 
# Add in the mirror URL too.
SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
 
MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done

diff --git a/app-shells/bash/bash-5.2_p26.ebuild 
b/app-shells/bash/bash-5.2_p26.ebuild
index 1bee48a4a941..c2f04b77e525 100644
--- a/app-shells/bash/bash-5.2_p26.ebuild
+++ b/app-shells/bash/bash-5.2_p26.ebuild
@@ -65,7 +65,7 @@ elif is_release ; then
 
# Add in the mirror URL too.
SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
 
MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done

diff --git a/app-shells/bash/bash-5.3_alpha.ebuild 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: edc90dfc86c229ae15c6f751f0af758d6fd0437c
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 13:44:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 13:55:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc90dfc

app-shells/bash: add 5.3_alpha (unkeyworded), sync live

Includes newly-added filter-lto, reported that upstream to Chet. Only in
5.3_alpha as the issue is newly-introduced.

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |  2 ++
 .../{bash-.ebuild => bash-5.3_alpha.ebuild}| 38 +++---
 app-shells/bash/bash-.ebuild   | 38 +++---
 3 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 639407e73561..57d7042f95a2 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -23,6 +23,8 @@ DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef788
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2.tar.gz 10950833 BLAKE2B 
51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9
 SHA512 
5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 
2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c
 SHA512 
a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
+DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B 
b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42
 SHA512 
52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
+DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 
69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589
 SHA512 
c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-.ebuild 
b/app-shells/bash/bash-5.3_alpha.ebuild
similarity index 88%
copy from app-shells/bash/bash-.ebuild
copy to app-shells/bash/bash-5.3_alpha.ebuild
index dc26c74b8f9d..51280256f5de 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-5.3_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ is_release() {
 
 # The version of readline this bash normally ships with.
 # Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
+READLINE_VER="8.3_alpha"
 
 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;
@@ -100,7 +100,6 @@ RDEPEND="
 "
 # We only need bison (yacc) when the .y files get patched (bash42-005, 
bash51-011)
 BDEPEND="
-   sys-devel/bison
pgo? ( dev-util/gperf )
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
@@ -185,6 +184,10 @@ src_configure() {
# may misbehave at runtime.
unset YACC
 
+   # wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
+   # upstream to Chet by email.
+   filter-lto
+
local myconf=(
--disable-profiling
 
@@ -298,9 +301,10 @@ src_install() {
 
insinto /etc/bash
doins 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/, app-shells/bash/files/bashrc.d/

[Sam James]

commit: 268b2e7c07d97bd9e833d239d786a0314c3b09ec
Author: Kerin Millar  plushkava  net>
AuthorDate: Thu Apr 18 04:17:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 20 07:29:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268b2e7c

app-shells/bash: restructure the system-wide bashrc for 5.1 and 5.2

This commit simplifies /etc/bash/bashrc by separating out the
functionality that is relatively complicated - perhaps even opinionated
on the part of Gentoo - into files that are installed to the
/etc/bash/bashrc.d directory. The intention is to preserve the overall
Gentoo flavour, while making it easier for users to customise their
operating environment than was the case before, and to be able to easily
suppress functionality that they may not wish for. The exact changes are
described herewith.

No longer will a superfluous error message be printed in the case that
bash was not compiled with readline support.

Files within /etc/bash/bashrc.d must now have a suffix of either ".sh"
or ".bash" in order to be sourced. This better reflects the way in which
/etc/profile works and should be a little safer.

Two new files are introduced:

- /etc/bash/bashrc.d/10-gentoo-color.bash
- /etc/bash/bashrc.d/10-gentoo-title.bash

Users may suppress these with INSTALL_MASK, should they wish to do so.

The NO_COLOR variable is now respected, provided that is is defined
prior to the sourcing of 10-gentoo-color.bash. It should be noted that
ssh users have the option of transmitting this variable by configuring
both ssh(1) and sshd(8) accordingly.

The way in which terminals are evaluated for colour support has been
greatly improved. There are now three heuristics involved. The first
method is to determine whether COLORTERM is already set as an
environment variable. This is an effective method because modern
terminal emulators commonly set the variable so as to advertise 24-bit
colour support. Further, Gentoo already whitelists the COLORTERM
variable in both ssh(1) and sshd(8). The second method is to use the
ncurses implementation of tput(1) to determine whether colour is
supported. The third method is to fall back to a traditional whitelist
of TERM patterns. However, I have overhauled this list based on an
arduous survey of terminal emulators during which I collected empirical
evidence as to which of them actually belong on the list. As such, the
coverage of this method of last resort is broader.

The COLORTERM variable will now be set for terminal emulators that are
found to support 24-bit colour but which do not set the variable by
themselves.

Colour-supporting aliases will now be defined for all of the following
utilities: diff, dir, egrep, fgrep, grep, ls and vdir.

Out of an abundance of caution, the -- operand is now used to signify
end-of-options in the case that dircolors(1) is being passed a pathname
incorporating the user's home directory.

PROMPT_COMMAND will now be defined as an array, as is supported for bash
5.1 or greater. It is more convenient because additional commands can
simply be appended to the array.

No longer will the "Title Definition String" and/or "Set Text Parameter"
sequences be injected into the value of PS1. This keeps the value of PS1
clean and results in fewer side effects in the event that the user
wishes to customise the prompt.

PROMPT_COMMAND will now be used to contain commands that print the
"Title Definition String" and/or "Text Parameter Sequences", depending
on the characteristics of the operating environment. The precise
behaviour is conveyed from hereon.

If the value of TERM is found to be that of the screen or tmux terminal
multiplexers, PROMPT_COMMAND will be set so as to invoke a function that
prints the Title Definition String sequence. The effect of the sequence
is to define the window title for screen, and the pane title for tmux.
The title will incoporate the hostname in short form.

If, on the other hand, the value of TERM is not found to be that of a
terminal multiplexer, a test is performed to see whether the tty is that
of sshd(8). If it is, then no further processing will occur. The reason
for this is it that there is no way for Gentoo to know the
characteristics of the operating environment where ssh(1) happens to be
running at the time. Sadly, there are many cases in which the window
title would simply not be restored after ssh(1) exists, which amounts to
a poor user experience.

Assuming that processing has not ceased at this point, the value of TERM
will be matched against a whitelist of modern terminals that are known
to support the Set Text Parameters Sequence, and to support UTF-8
correctly. If a match is made then PROMPT_COMMAND will be amended so as
to invoke a function that prints the aforementioned sequence. The effect
of the sequence is to define the hardstatus for screen, the window name
for tmux and the window title for graphical terminal emulators. The
title will incorporate the username, the 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 6eea46091ef4e2f853c746f4544858bc79f63a73
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 11 23:54:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 00:28:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eea4609

app-shells/bash: mark as LTO-unsafe in particularly old versions

Due to implicit function declarations, LTO fails to detect the
availability of a function and errors out due to an undefined reference
at link time.

It's fixed in bash 4.0 and on, but the value of backporting the fix to
versions of bash that have niche use (people interested in exploring old
versions, not people who are looking for the shebang interpreter for
their system scripts) is a matter of some question...

Closes: https://bugs.gentoo.org/893958
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 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 +++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash/bash-2.05b_p13.ebuild 
b/app-shells/bash/bash-2.05b_p13.ebuild
index ef9bd98f1080..ac35d6f81d34 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/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/app-shells/bash/bash-3.0_p22.ebuild 
b/app-shells/bash/bash-3.0_p22.ebuild
index 15629ba77d24..712faa838802 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/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/app-shells/bash/bash-3.1_p23.ebuild 
b/app-shells/bash/bash-3.1_p23.ebuild
index 9e742a38c00b..6f42f41dd6a6 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/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/app-shells/bash/bash-3.2_p57.ebuild 
b/app-shells/bash/bash-3.2_p57.ebuild
index fd2dedaf8b86..ea0dfd5ce49d 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/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=.
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: af13b115b94d430d274d3ff17c4bba9496142c3d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:17:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:23:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af13b115

app-shells/bash: drop 5.2_p21-r1, 5.2_p21-r2

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p21-r1.ebuild | 374 
 app-shells/bash/bash-5.2_p21-r2.ebuild | 375 -
 2 files changed, 749 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p21-r1.ebuild 
b/app-shells/bash/bash-5.2_p21-r1.ebuild
deleted file mode 100644
index 48634f88f47d..
--- a/app-shells/bash/bash-5.2_p21-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2023 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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   upstream_url_base="mirror://gnu/bash"
-   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
-   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-   # Add in the mirror URL too.
-   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
-
-   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-   done
-
-   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bash-bug ml
-   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
-   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
-   "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
-   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 81abb1ddb584f7e8803eb5eccc1b9807c1d39721
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Mar  3 15:52:50 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Mar  3 15:52:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81abb1dd

app-shells/bash-completion: Enable py3.12

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 4 ++--
 app-shells/bash-completion/bash-completion-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 9d1182abc528..60411504c5c1 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1
 

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 7e597f994ebc..d9a8954d6f32 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools git-r3 python-any-r1
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 3fb2e3c6952dbca52b0eb04575911a2e1a47e4df
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Mar  3 15:24:30 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Mar  3 15:24:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb2e3c6

app-shells/bash-completion: Remove myself

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-shells/bash-completion/metadata.xml 
b/app-shells/bash-completion/metadata.xml
index 7def7326d530..8b2bdc7b1a53 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   mgo...@gentoo.org
-   Michał Górny
-   

shell-to...@gentoo.org
Gentoo Shell Tools Project

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: 45393b3f565745cf2a002ca96b36d94759c55c9e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 14 02:29:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 14 02:29:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45393b3f

app-shells/bash: add 5.2_p26

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |  10 +
 app-shells/bash/bash-5.2_p26.ebuild| 375 +
 .../bash/files/bash-5.2_p26-memory-leaks.patch | 136 
 3 files changed, 521 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index c4530d8443f3..639407e73561 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -415,3 +415,13 @@ DIST bash52-020 1459 BLAKE2B 
de3e38dbb2395c765767aed516ae3d143e3187a44964f90c587
 DIST bash52-020.sig 95 BLAKE2B 
8fd778b381cc14d17de8f2b7e215fa0d35c569a90d46fac77c0a94bea525bd62428663f0a908e64ff773bd4caf0aab7f92c2dda1f4158aacbd53f053be91d16d
 SHA512 
0ae6d9189329e560a89af9f42f0f98126faeb15d29bd327e6bd7694870a9bcfae3d3d545e42baf4223dcc732a50d46e4c22477c41b98be85736bb05a359c
 DIST bash52-021 1890 BLAKE2B 
cc2d886da8c51eb7bdbed694423eae29dc05dc2c7bd0cd41b9ee3acbc56ef135043bb48275c4162d33d2d4051a0a8b27f3aec097335b9d15e38fd841a6793f71
 SHA512 
c3a61e975819919d7ba120f322fc5e9a420b21f03d7bf989a5e7b6a99bfe35372744277040e88361ee383ab53b05d607d52ff2000b401de038af67c91728b48f
 DIST bash52-021.sig 95 BLAKE2B 
79572b14f423f0a96e89d106c5ed448c2b447760e99c743354bd6315132325c19312cfcad98f94c42d3094bb4283c1f7753ac4d3c600d46c63e49d0f7cc3befd
 SHA512 
4063559edade78d1510c12b825aa29925e515807b447e50fe564770ee26ddf34e18b47132e5154a4c883043cc80b3d6415e4ba370bad308a17dc0f6b53fc61c5
+DIST bash52-022 1305 BLAKE2B 
2e0cc2255c0313ab85547363d7dd060d460db44131b698235275413c51e79cdc33b77064f84d56e75a0951fc62f947482c2f317a0d4f732822a4ffaed943a9cd
 SHA512 
12a669f3b6ba936be31a85c50bfe52689f3deea02eedb31100ab113b1e74d8104934e615965b4bf7f3b1cf5ad71870211b0bd910bf0862e8ce603505b4b1db3f
+DIST bash52-022.sig 95 BLAKE2B 
423bcd005987dae027e29c873edecda0cf51cdcb4bb652b1577c28258602e2a34cfecbc38383068fc95f6e1e0e558bc6de64a225a9e7392f05518a9190237d3f
 SHA512 
f3af8e4ea507b53dd979f597cfde69bd59bf4b7229fd0058c299a2c1abb36182b3a38b8630a81e0654f8da8bc47725459ddf32031ab1a5615105651c14640167
+DIST bash52-023 1817 BLAKE2B 
9727ad8cf219ba906021f833cacbbccf6c5b9c94decf861a5f40627680ac3d19d65eaeafecd575545dc7eb538f27b0ecc55a7462b49d226751ad14fb2f40e825
 SHA512 
59a2e9e4ee4938ba868552eecdbed5f5d797e143bf6f69fde5c50a4e478c19ce36d562b9f51f65d7da5fe216050276bfe1eb430c151c845cffa77d3fdc9ce771
+DIST bash52-023.sig 95 BLAKE2B 
84621d203ab68da6a6e5a36fe31160e463fda864620a94fec99f0be3c18df6c465adf2179f3bc99cae2627058d174e3b3d35d473836609252ae41527857e6464
 SHA512 
b17a8718467e1aee6d47d01b8bcad0892b3c7369f17794604481b655b3404b6f0970aabf5d29b6898e598530946ccdf3e2bddbfb02a7e033927a9be2686aa246
+DIST bash52-024 2298 BLAKE2B 
f9113fcb1b8ee8d96744e45f020fd8ec49546d6a29883544f4d4a4ef1087b764de6e7c37c760ac709370cdace9619aec84f03713be5e6bc9a9e90d97dd35caa0
 SHA512 
ff77920ba4c8df7cb8841d94f483a5678a65ff2aab3f03b02b21eba7daaea15d05af26d2fc7f468509c2047f682908d78cd94254e0688496280e345d010aac24
+DIST bash52-024.sig 95 BLAKE2B 
412b7f3aad7f6eeb49abfafd428bd9dbc72c5b80be0b8908d8284befa29c62c6460f883142145a2eefb157fc53030ea391d6ff50706f387a2ef933b3c89a9895
 SHA512 
d56fc42b92a9c0d2de32a0365c3f83913e0fe37d60a57254ac773d5ee12793694d078ee8de207718a2166631f8269bdb91fb5d386fec09fd19e7f4e6d2008b97
+DIST bash52-025 1454 BLAKE2B 
5d18e00cc44710f078037f25c61741a078bb0fc906d6de581e093d9e99be71f7f06fc0d139f4f25d40f5f854378031aff6e63d26ead55fe6cca626df50bd
 SHA512 
20e708ff483ae2ba655c069fbaccdef59d81f52ba787d97fd1b997522248e9e7e1d7773a35f3a6e44c4521a7a5be273ffa25c580533e6d1d1bfb5e49040530c3
+DIST bash52-025.sig 95 BLAKE2B 
aff63f1a0a753b632f0d2ce4cf8f4117689469150d41dd0e0d7f76fca973d52fb16f3957b12709826e50705f921fe141108b1046de05d17b40216ed5d4a00893
 SHA512 
079888adce1cb8583b547d67005f179614f1c42756de20acdb9e24763dec145a421c68e7ceb48d42b853ae7fcb07e051cc1ca56f9dfd337c9a1b001618df2828
+DIST bash52-026 1372 BLAKE2B 
ebe3bc47dadf5d689258c5ccf9883838d3383dc43bec68d2a6767b6348cf1515a98ec9e445c3110e8eb0d87e742c20a0d4ddb70649ec94217f55aad7d18552af
 SHA512 
571993da2b8067ef5b7b705aee65dd414ee70b216ffbcb9fab7c08807b87a72465594c3f1576c795ae86bf951911cdde70ad1037e851b88ee379c4237ccff6fe
+DIST bash52-026.sig 95 BLAKE2B 
175df0703ee5374094d41761ebc2827d34cb97328ea8e486cc9e5c946e482a7d0a16a7ac45e11296500cff8ac4c013e60b07d34abf8b3478527a80f742fbe85e
 SHA512 
6db725ffcf429e04551b2fde329067696b20bef9418b57cff56a62f31c262d0b800061284469eb9f809ca49516516735213dc05defab52ff864ac3b214336559

diff --git a/app-shells/bash/bash-5.2_p26.ebuild 
b/app-shells/bash/bash-5.2_p26.ebuild
new file mode 100644
index ..1bee48a4a941
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p26.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2024 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: 0cf3adc18c761e0e85543ace7bfcfe5fa1a66d92
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  8 17:12:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  8 17:12:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf3adc1

app-shells/bash: backport memory leak fix for 5.2

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p21-r2.ebuild | 375 +
 .../bash/files/bash-5.2_p21-memory-leak.patch  |  18 +
 2 files changed, 393 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p21-r2.ebuild 
b/app-shells/bash/bash-5.2_p21-r2.ebuild
new file mode 100644
index ..6a1506f3ea13
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p21-r2.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2024 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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   upstream_url_base="mirror://gnu/bash"
+   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
+   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   # Add in the mirror URL too.
+   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+
+   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+   done
+
+   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+   # Patches from Chet sent to bash-bug ml
+   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
+   "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Conrad Kostecki]

commit: 2f5452633816fc3d81e9e31224589fb7467ec1eb
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Dec 29 14:02:50 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 31 02:37:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f545263

app-shells/bash: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34539
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../bash-5.2_p15-shell-parser-reset-issue.patch| 33 --
 1 file changed, 33 deletions(-)

diff --git a/app-shells/bash/files/bash-5.2_p15-shell-parser-reset-issue.patch 
b/app-shells/bash/files/bash-5.2_p15-shell-parser-reset-issue.patch
deleted file mode 100644
index bef5586d0efc..
--- a/app-shells/bash/files/bash-5.2_p15-shell-parser-reset-issue.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://savannah.gnu.org/support/?110745
-https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00103.html
-
-Note that both documents make the claim that only interactive shells are
-affected. This is false, as is demonstrated below.
-
-$ bash -c '[[ ]]; echo fin'; echo $?
-0
-
-diff --git a/parse.y b/parse.y
-index 11b71d4..02b2af1 100644
 parse.y
-+++ parse.y
-@@ -2899,7 +2899,7 @@ yylex ()
- #if defined (YYERRCODE) && !defined (YYUNDEF)
- current_token = YYERRCODE;
- #else
--current_token = YYerror;
-+current_token = YYUNDEF;
- #endif
- 
-   return (current_token);
-@@ -4156,7 +4156,9 @@ parse_comsub (qc, open, close, lenp, flags)
-   shell_eof_token = ps.eof_token;
-   expand_aliases = ps.expand_aliases;
- 
--  /* yyparse() has already called yyerror() and reset_parser() */
-+  /* yyparse() has already called yyerror() and reset_parser(), so we set
-+   PST_NOERROR to avoid a redundant error message. */
-+  parser_state |= PST_NOERROR;
-   return (_pair_error);
- }
-   else if (r != 0)

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 0694556fe786f3a4f1ce74a6bcd276848f0d347f
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 04:59:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 04:59:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0694556f

app-shells/bash: drop 5.2_p15-r6, 5.2_p15-r7, 5.2_p21

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r6.ebuild | 373 
 app-shells/bash/bash-5.2_p15-r7.ebuild | 374 -
 app-shells/bash/bash-5.2_p21.ebuild| 373 
 3 files changed, 1120 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15-r6.ebuild 
b/app-shells/bash/bash-5.2_p15-r6.ebuild
deleted file mode 100644
index fb3ee582c9a5..
--- a/app-shells/bash/bash-5.2_p15-r6.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   upstream_url_base="mirror://gnu/bash"
-   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
-   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-   # Add in the mirror URL too.
-   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
-
-   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-   done
-
-   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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="
-   sys-devel/bison
-   pgo? ( dev-util/gperf )
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bash-bug ml
-   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
-   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: 9c51528023c4f13a5c407e8bbf2fc6d2e0cc56a1
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  2 04:13:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  2 04:13:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c515280

app-shells/bash: fix another configure check for modern c

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p21-r1.ebuild | 374 +
 .../files/bash-5.2_p21-configure-strtold.patch |  32 ++
 2 files changed, 406 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p21-r1.ebuild 
b/app-shells/bash/bash-5.2_p21-r1.ebuild
new file mode 100644
index ..48634f88f47d
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p21-r1.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2023 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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   upstream_url_base="mirror://gnu/bash"
+   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
+   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   # Add in the mirror URL too.
+   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+
+   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+   done
+
+   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+   # Patches from Chet sent to bash-bug ml
+   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
+   "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: 9edfdc3c8998055e798eee56fa4ffd052c847b2e
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 11 00:20:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 11 00:20:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edfdc3c

app-shells/bash: add 5.2_p21

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |  12 +
 app-shells/bash/bash-5.2_p21.ebuild| 373 +
 .../bash/files/bash-5.2_p21-wpointer-to-int.patch  |  13 +
 3 files changed, 398 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 45a63cd6c251..c4530d8443f3 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -403,3 +403,15 @@ DIST bash52-014 3245 BLAKE2B 
990e6566c446ce030d1333a05de9027a994054e983bf414e9aa
 DIST bash52-014.sig 95 BLAKE2B 
2206483fd1b356099bab6fb7793d21dbd5b2adcbe2b108c69c5d7ccd6a13f934c69adcecd5f3fb1783b380c91c362609a175c4b95f25ac9996bbfad0147f250d
 SHA512 
e7404ca3ff8bac3cb0dc7edd0bfc7907734474c8d99a4dfffae87645653f05a26911e5f1e4670d80472423c84b42f86c84835ca310c083bcf16cdf860dd2
 DIST bash52-015 8088 BLAKE2B 
038f03bc543297a3f2e7612afdee7b27eb5d65d7f81c22976936211f4a80acd9f0faf1ba6c56e20fc653b877a448ab7872b5488da3684952682d80c752227ab2
 SHA512 
eb1bd6b3bf8811d765f222cd48360eb7f3f0aaa4f29f1b6c1f17635b819e5e4734ec4e7fcfde551fd7a6299a7d67869ea0bc5cc86cc523bc4a64d30e433df493
 DIST bash52-015.sig 95 BLAKE2B 
b32afb78e24554ccc73f95883e1c78cdee222e589634ecca947b00ce163596373de6179f7c6e6bccbb9ab846c9ff3c8ee04723f23b1a641c908f535c01cbea2c
 SHA512 
047d84c9e1bc996acfb735667409a7285d025fc8c63b9c7da86ace9e6be133d58bd66bf8bf918b81d27aaebc5795419604418d2ddb0ee11b675f283b634f441f
+DIST bash52-016 1225 BLAKE2B 
675b70e1df1083021fb6336e50d10012dc02e1a80865a64579256319ca98c8282af20e7210ef9d993f97718c7bfed2315f23edac04e6f3af65a1e08cd5f7ef2e
 SHA512 
11c3197870570050767887a7497b52549caf2bf74e69c5a4eb95ff316942177da0a1150819f7051eb690841796b98d9a81f784204d18ad176cd2c29473e466d4
+DIST bash52-016.sig 95 BLAKE2B 
6b61d9293f0f804c12d3c0a0afa802d91fbdbb55e3f69daaad8b1fcb23718ebcca56c9a9fc6b35eaefe05f146b5a502291aead23c523f966e32e3f0585b0fc08
 SHA512 
59bae9616765a10b3f12f5ca6f6ef6c2d2179c50d94e5698b1c6bfc5cb0819328ee8537bab86ab6efb936f262bdfe14f7fc9d5ba0b88e5c4ebd2cf1aae22990a
+DIST bash52-017 1396 BLAKE2B 
461f2f6543501306faa5decd98211699f0ce84eea5a1225145dc401ec0ca893c9d8021359c04af4dec265e7d247f2fbb70cfe8d5382e3c38fd2774e017de4aed
 SHA512 
1844d1f4fbce0ae1dd8f2b9c152decc7cc645b7c0c66e84ed129072251e990f2da2220917957e98dd8b1299d2d10fb2dd23e184e40457063c1d554bb132ef1e5
+DIST bash52-017.sig 95 BLAKE2B 
cf83b861273b9f7e7611367f7551be7af678839fd1c0570eaf1f8ec54ab8e858b78086f2c20ff5d1899aa8544cc27dd2dc2b6d518f6ff4e1d35bc6f4eb5c752e
 SHA512 
8978eeb9180d2cf699247a1cff537708be9882916cba02ed991b0403aaf0b9d7bbff54b601f4251466114dc0ce5100685ef655504ce1f2d08bb5f5a2b73dadd8
+DIST bash52-018 151467 BLAKE2B 
89f95c096f8e487e2a1a00541087d157321b125ae93dc656af0cf6ead9158401a028f5c838c4b81aeb95e7c4951a3b4dfb1a88e08297a03236c0ad36eb6710d2
 SHA512 
b454ba8a311b0943f9669425891499fe8d4b5f1a90899bf6c4d0969699e21f8f8e08d0b0e23a7cf5c97aa6b21384ae907ed710254053e7edd43328aa6003780c
+DIST bash52-018.sig 95 BLAKE2B 
4b371fda53d2bd01b4527688209b49677b5b9f60de6c393fb2b810ba1342c98af0b1e50f35a0a6ef85116686451fad1e103da74611645ed99e04f438dd6245c7
 SHA512 
0930923972e94dab24f33ef68be03dde13b9b13424078102f5f7d5a7c8080f64989b283417efe2c72c89d2e2c2def9a27470b3e125cc233f5c95122c78b9b540
+DIST bash52-019 2548 BLAKE2B 
bcf683825da1e56692d7024748501cc582e623168fc1a8713ef3b4eb284222f6bf9144871d6357464a1c8c031f105ca6cac6cc591b5463d8b72eb139fcf044f0
 SHA512 
d009b0a571a3e23ab723c6c6fd4b28c48db1a927d690b4c42d7ed2fa51052aaf662026a2de9e4ee3676087eac844f8b57adae567556228c4fd8fb4ed3c8a1b94
+DIST bash52-019.sig 95 BLAKE2B 
f42700d5a25003d9f3e722c6230bb8795e2d01fe4b4b49411956757346f8df42bdfcc5af3a87469df7f560fb9857a05e45258f6057fd26090f0d3e17f9303fc5
 SHA512 
56de5fe1b98ff89ea5483f9ccef68ea8a7563e7cfa933daa223cd98f9b2d882e6692ae34859281906a228e9c510f1506c3c808eaaad6eeab762df00da2fbf55b
+DIST bash52-020 1459 BLAKE2B 
de3e38dbb2395c765767aed516ae3d143e3187a44964f90c587f41f93447c43515481e3c9bd562175d750d0dfb9e4e3eacb25c31f8bf54168fa544c938955eae
 SHA512 
a5a927e90ac3daead54e90f8ff99dbda0fd652c3df83b7bcde0adb136fc4ba8498810e5bfa1d7f0c143422bf1f4622a4669c96e505bccad7c9a271d7e0668187
+DIST bash52-020.sig 95 BLAKE2B 
8fd778b381cc14d17de8f2b7e215fa0d35c569a90d46fac77c0a94bea525bd62428663f0a908e64ff773bd4caf0aab7f92c2dda1f4158aacbd53f053be91d16d
 SHA512 
0ae6d9189329e560a89af9f42f0f98126faeb15d29bd327e6bd7694870a9bcfae3d3d545e42baf4223dcc732a50d46e4c22477c41b98be85736bb05a359c
+DIST bash52-021 1890 BLAKE2B 
cc2d886da8c51eb7bdbed694423eae29dc05dc2c7bd0cd41b9ee3acbc56ef135043bb48275c4162d33d2d4051a0a8b27f3aec097335b9d15e38fd841a6793f71
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 31d30791ea6ace369259757da891a56ed1267a9c
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 12:12:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 12:13:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d30791

app-shells/bash: tidy up PGO bits

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r7.ebuild | 2 +-
 app-shells/bash/bash-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15-r7.ebuild 
b/app-shells/bash/bash-5.2_p15-r7.ebuild
index af96b44e4a86..a80bdd6357a4 100644
--- a/app-shells/bash/bash-5.2_p15-r7.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r7.ebuild
@@ -260,7 +260,7 @@ src_compile() {
# -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
# See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC 
-fprofile-partial-training)")
-   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
 
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_generate_flags}" all others

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index e2a0d09d841b..6e86e0d185f3 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -257,7 +257,7 @@ src_compile() {
# -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
# See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC 
-fprofile-partial-training)")
-   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
 
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_generate_flags}" all others

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 1d98516e65fb3dc0f1e0effc851216e1b827b9d4
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 12:01:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 12:05:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d98516e

app-shells/bash: cleanup USE=pgo logic a bit, use -fprofile-partial-training if 
available

-fprofile-partial-training helps not to pessimise other paths if no data
is available.

Signed-off-by: Sam James  gentoo.org>

 .../{bash-.ebuild => bash-5.2_p15-r7.ebuild}   | 28 --
 app-shells/bash/bash-.ebuild   | 25 +--
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app-shells/bash/bash-.ebuild 
b/app-shells/bash/bash-5.2_p15-r7.ebuild
similarity index 90%
copy from app-shells/bash/bash-.ebuild
copy to app-shells/bash/bash-5.2_p15-r7.ebuild
index eeff3e0b3023..af96b44e4a86 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
@@ -115,6 +115,9 @@ PATCHES=(
 
# Patches from Chet sent to bash-bug ml
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
+   "${FILESDIR}"/${PN}-5.2_p15-shell-parser-reset-issue.patch
 )
 
 pkg_setup() {
@@ -254,14 +257,20 @@ src_configure() {
 }
 
 src_compile() {
-   if use pgo ; then
-   # Build Bash and run its tests to generate profiles.
-   emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo"
+   # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
+   # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+   local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC 
-fprofile-partial-training)")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo")
+
+   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 use pgo ; then
# Used in test suite.
unset A
 
-   emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
if tc-is-clang; then
llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
@@ -269,13 +278,8 @@ src_compile() {
 
# Rebuild Bash using the profiling data we just generated.
emake clean
-   emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"
-
-   use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
-   else
-   emake
-
-   use plugins && emake -C examples/loadables all others
+   emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
+   use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_use_flags}" all others
fi
 }
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index eeff3e0b3023..e2a0d09d841b 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
@@ -254,14 +254,20 @@ src_configure() {
 }
 
 src_compile() {
-   if use pgo ; then
-   # Build Bash and run its tests to generate profiles.
-   emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo"
+   # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
+   # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+   local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC 
-fprofile-partial-training)")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo")
+
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+   use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
${pgo_generate_flags}" all others
 
+   # Build 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: e686a3c3f1655664f116b827ce836c557ff83ca5
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 05:36:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 05:36:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e686a3c3

app-shells/bash: drop 5.2_p15-r5

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r5.ebuild | 372 -
 1 file changed, 372 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15-r5.ebuild 
b/app-shells/bash/bash-5.2_p15-r5.ebuild
deleted file mode 100644
index a107c639ef8d..
--- a/app-shells/bash/bash-5.2_p15-r5.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   upstream_url_base="mirror://gnu/bash"
-   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
-   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-   # Add in the mirror URL too.
-   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
-   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
-
-   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-   done
-
-   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; 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="
-   sys-devel/bison
-   pgo? ( dev-util/gperf )
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bash-bug ml
-   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
-   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
-)
-
-pkg_setup() {
-   # bug #7332
-   if is-flag -malign-double ; then
-   eerror "Detected bad CFLAGS '-malign-double'.  Do not use 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: dde3a81f420e745fe884b6535796129192f02561
Author: Kerin Millar  plushkava  net>
AuthorDate: Sat Jun 17 04:46:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 23 02:31:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde3a81f

app-shells/bash: backport shell parser reset fix to 5.2

Note that Ramey's claim that only interactive shells are affected is
false, as is demonstrated below.

$ bash -c '[[ ]]; echo fin'; echo $?
0

Signed-off-by: Kerin Millar  plushkava.net>
Bug: https://savannah.gnu.org/support/?110745
Bug: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00103.html
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r4.ebuild | 366 +
 .../bash-5.2_p15-shell-parser-reset-issue.patch|  33 ++
 2 files changed, 399 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15-r4.ebuild 
b/app-shells/bash/bash-5.2_p15-r4.ebuild
new file mode 100644
index ..04710a4c180f
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p15-r4.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   upstream_url_base="mirror://gnu/bash"
+   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
+   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   # Add in the mirror URL too.
+   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+
+   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+   done
+
+   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+   ${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+   app-alternatives/yacc
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: c4f726c53b6af6c3dab6a57943dd7a00ab5e937d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 02:15:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 10:23:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f726c5

app-shells/bash-completion: drop dead prefix targets

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 10 --
 app-shells/bash-completion/bash-completion-.ebuild | 10 --
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index c6323ea788a9..9d1182abc528 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -57,13 +57,11 @@ strip_completions() {
 
# Now-dead symlinks to deprecated completions
hd ncal
+
+   # FreeBSD
+   freebsd-update kldload kldunload portinstall portsnap
+   pkg_deinstall pkg_delete pkg_info
)
-   if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
-   strip_completions+=(
-   freebsd-update kldload kldunload portinstall portsnap
-   pkg_deinstall pkg_delete pkg_info
-   )
-   fi
 
local file
for file in "${strip_completions[@]}"; do

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 8d39bca2b242..7e597f994ebc 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -51,13 +51,11 @@ strip_completions() {
 
# Now-dead symlinks to deprecated completions
hd ncal
+
+   # FreeBSD
+   freebsd-update kldload kldunload portinstall portsnap
+   pkg_deinstall pkg_delete pkg_info
)
-   if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
-   strip_completions+=(
-   freebsd-update kldload kldunload portinstall portsnap
-   pkg_deinstall pkg_delete pkg_info
-   )
-   fi
 
local file
for file in "${strip_completions[@]}"; do

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: d9278cc22a2e84f19bb758b569870470c69562e2
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  2 19:59:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  2 21:46:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9278cc2

app-shells/bash: optimise SRC_URI generation

Thanks to radhermit's new pkgcraft tooling. Also, thanks to ztrawhcse for 
suggestions.

Before:
```
app-shells/bash-5.2_p15-r3::.: 61.224122ms
app-shells/bash-5.1_p16-r4::.: 65.001125ms
app-shells/bash-5.1_p16-r5::.: 65.480029ms
```

After:
```
app-shells/bash-5.2_p15-r3::/home/sam/g/: 10.449073ms
app-shells/bash-5.1_p16-r4::/home/sam/g/: 10.505063ms
app-shells/bash-5.1_p16-r5::/home/sam/g/: 10.523583ms
```

This also gets us to approximately the same speed (almost within rounding
error) of pre-d3c19b7974aeb4ac2a1351a019e80625b4111c4b (where we removed eval
usage).

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r4.ebuild | 22 ++
 app-shells/bash/bash-5.1_p16-r5.ebuild | 22 ++
 app-shells/bash/bash-5.2_p15-r3.ebuild | 21 ++---
 app-shells/bash/bash-.ebuild   | 21 ++---
 4 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/app-shells/bash/bash-5.1_p16-r4.ebuild 
b/app-shells/bash/bash-5.1_p16-r4.ebuild
index b87757b3ca9e..25028ea0a987 100644
--- a/app-shells/bash/bash-5.1_p16-r4.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r4.ebuild
@@ -45,21 +45,27 @@ if is_release ; then
# bash-5.1 -> bash51
my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
 
-   patch_url=
+   patch_url=
my_patch_index=
 
+   upstream_url_base="mirror://gnu/bash"
+   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
+
for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
-   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
+   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
 
-   done
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   # Add in the mirror URL too.
+   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
 
-   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
done
 
-   unset my_pn patch_url my_patch_index
+   unset my_p patch_url my_patch_index upstream_url_base 
mirror_url_base
fi
 else
SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;

diff --git a/app-shells/bash/bash-5.1_p16-r5.ebuild 
b/app-shells/bash/bash-5.1_p16-r5.ebuild
index c617e503f113..230aaaf033a5 100644
--- a/app-shells/bash/bash-5.1_p16-r5.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r5.ebuild
@@ -45,21 +45,27 @@ if is_release ; then
# bash-5.1 -> bash51
my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
 
-   patch_url=
+   patch_url=
my_patch_index=
 
+   upstream_url_base="mirror://gnu/bash"
+   mirror_url_base="ftp://ftp.cwru.edu/pub/bash;
+
for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
-   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+   printf -v mangled_patch_ver ${my_p}-%03d 
${my_patch_index}
+   
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
 
-   done
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   # Add in the mirror URL too.
+   SRC_URI+=" 
${patch_url/${upstream_url_base}/${mirror_url_base}}"
+   SRC_URI+=" verify-sig? ( 
${patch_url/${upstream_url_base}/${mirror_url_base}} )"
 
-   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   MY_PATCHES+=( 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: df365a51faeea136105c02ea20f8d413120b29df
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 04:59:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 04:59:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df365a51

app-shells/bash: skip flaky hanging test

Closes: https://bugs.gentoo.org/907403
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r3.ebuild | 3 +++
 app-shells/bash/bash-.ebuild   | 9 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15-r3.ebuild 
b/app-shells/bash/bash-5.2_p15-r3.ebuild
index cbea068edf2f..7df4466ab275 100644
--- a/app-shells/bash/bash-5.2_p15-r3.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r3.ebuild
@@ -165,6 +165,9 @@ src_prepare() {
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
touch -r . doc/* || die
 
+   # Sometimes hangs (more noticeable w/ pgo), bug #907403.
+   rm tests/run-jobs || die
+
eapply -p0 "${PATCHES[@]}"
eapply_user
 }

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 7235d2213a36..82dfe5fb1c66 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -33,7 +33,7 @@ is_release() {
 
 # The version of readline this bash normally ships with.
 # Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2"
+READLINE_VER="8.2_p1"
 
 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;
@@ -92,8 +92,8 @@ RDEPEND="
${DEPEND}
 "
 # We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="app-alternatives/yacc"
 BDEPEND="
+   app-alternatives/yacc
pgo? ( dev-util/gperf )
verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
@@ -106,7 +106,7 @@ QA_CONFIGURE_OPTIONS="--disable-static"
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
-   # Patches from Chet sent to bashbug ml
+   # Patches from Chet sent to bash-bug ml
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 )
 
@@ -163,6 +163,9 @@ src_prepare() {
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
touch -r . doc/* || die
 
+   # Sometimes hangs (more noticeable w/ pgo), bug #907403.
+   rm tests/run-jobs || die
+
eapply -p0 "${PATCHES[@]}"
eapply_user
 }

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[David Seifert]

commit: a2b773e09e3c5bde3deaafaed2fe248ebd350efb
Author: David Seifert  gentoo  org>
AuthorDate: Mon May 22 16:26:14 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 22 16:26:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b773e0

app-shells/bash: remove ${USERLAND}

Signed-off-by: David Seifert  gentoo.org>

 app-shells/bash/{bash-5.0_p18.ebuild => bash-5.0_p18-r1.ebuild}| 2 +-
 app-shells/bash/{bash-5.1_p16-r2.ebuild => bash-5.1_p16-r4.ebuild} | 2 +-
 app-shells/bash/{bash-5.1_p16-r3.ebuild => bash-5.1_p16-r5.ebuild} | 2 +-
 app-shells/bash/{bash-5.2_p15-r2.ebuild => bash-5.2_p15-r3.ebuild} | 2 +-
 app-shells/bash/bash-.ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-shells/bash/bash-5.0_p18.ebuild 
b/app-shells/bash/bash-5.0_p18-r1.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.0_p18.ebuild
rename to app-shells/bash/bash-5.0_p18-r1.ebuild
index 23ec36757da4..704cb5b5fbe4 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18-r1.ebuild
@@ -218,7 +218,7 @@ src_install() {
done
 
local sed_args=(
-   -e "s:#${USERLAND}#@::"
+   -e 's:#GNU#@::'
-e '/#@/d'
)
 

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r4.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.1_p16-r2.ebuild
rename to app-shells/bash/bash-5.1_p16-r4.ebuild
index a9b7b120cc74..0b77f1aab780 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r4.ebuild
@@ -250,7 +250,7 @@ src_install() {
done
 
local sed_args=(
-   -e "s:#${USERLAND}#@::"
+   -e 's:#GNU#@::'
-e '/#@/d'
)
 

diff --git a/app-shells/bash/bash-5.1_p16-r3.ebuild 
b/app-shells/bash/bash-5.1_p16-r5.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.1_p16-r3.ebuild
rename to app-shells/bash/bash-5.1_p16-r5.ebuild
index 9ff113498a62..706d0106eb91 100644
--- a/app-shells/bash/bash-5.1_p16-r3.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r5.ebuild
@@ -252,7 +252,7 @@ src_install() {
done
 
local sed_args=(
-   -e "s:#${USERLAND}#@::"
+   -e 's:#GNU#@::'
-e '/#@/d'
)
 

diff --git a/app-shells/bash/bash-5.2_p15-r2.ebuild 
b/app-shells/bash/bash-5.2_p15-r3.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.2_p15-r2.ebuild
rename to app-shells/bash/bash-5.2_p15-r3.ebuild
index 6d741db8454c..1c78f3bab2c0 100644
--- a/app-shells/bash/bash-5.2_p15-r2.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r3.ebuild
@@ -292,7 +292,7 @@ src_install() {
done
 
local sed_args=(
-   -e "s:#${USERLAND}#@::"
+   -e 's:#GNU#@::'
-e '/#@/d'
)
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 7d9c7837f3c1..105e8c1c815e 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -290,7 +290,7 @@ src_install() {
done
 
local sed_args=(
-   -e "s:#${USERLAND}#@::"
+   -e 's:#GNU#@::'
-e '/#@/d'
)
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Mike Gilbert]

commit: 06ae7be862ffb82a0cabb211ae274cde39587d9a
Author: Diego Viola  gmail  com>
AuthorDate: Wed Apr 26 06:31:10 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Apr 26 21:07:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ae7be8

app-shells/bash: remove empty line in bashrc

Signed-off-by: Diego Viola  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30765
Signed-off-by: Mike Gilbert  gentoo.org>

 app-shells/bash/files/bashrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 6c909333754d..4a50bdebb93b 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -5,7 +5,6 @@
 # that can't tolerate any output.  So make sure this doesn't display
 # anything or bad things will happen!
 
-
 # Test for an interactive shell.  There is no need to set anything
 # past this point for scp and rcp, and it's important to refrain from
 # outputting anything in those cases.

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Sam James]

commit: 52d91f662e2022070db84e036c9373373fa12624
Author: Diego Viola  gmail  com>
AuthorDate: Tue Apr 25 19:49:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 25 21:26:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d91f66

app-shells/bash: fix whitespace

Signed-off-by: Diego Viola  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30756
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/files/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 98621a7c9a80..6c909333754d 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -3,7 +3,7 @@
 # This file is sourced by all *interactive* bash shells on startup,
 # including some apparently interactive shells such as scp and rcp
 # that can't tolerate any output.  So make sure this doesn't display
-# anything or bad things will happen !
+# anything or bad things will happen!
 
 
 # Test for an interactive shell.  There is no need to set anything

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Sven Wegener]

commit: fad63f29e7ae83a71fb6714576c5a8a9d006
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Mar  4 18:57:26 2023 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Mar  4 19:29:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad6

app-shells/bash: do not update screen's internal window title

The k escape sequence changes screen's internal window title, which is
the alias given by the user to the window and which should not be
changed by an application running inside screen. screen supports the so
called hardstatus line with the _ escape sequence, which should be used
instead and which gets forwarded to the terminal as the title.

Signed-off-by: Sven Wegener  gentoo.org>

 app-shells/bash/files/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index b7202a361d31..98621a7c9a80 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -42,7 +42,7 @@ case ${TERM} in
PS1='\[\033]0;\u@\h:\w\007\]'
;;
screen*)
-   PS1='\[\033k\u@\h:\w\033\\\]'
+   PS1='\[\033_\u@\h:\w\033\\\]'
;;
*)
unset PS1

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 7cb013fa5badfe31ab8975d77062f2e46f85c4e4
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 13:11:10 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb013fa

app-shells/bash-completion: Use epytest to run tests

Signed-off-by: Michał Górny  gentoo.org>

 .../bash-completion/bash-completion-2.11.ebuild| 23 +-
 .../bash-completion/bash-completion-.ebuild| 23 +-
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 67ec99d5b6ca..5ee98932da25 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -89,20 +89,25 @@ src_prepare() {
eapply 
"${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
fi
 
-   # redhat-specific, we strip these completions
-   rm test/t/test_if{down,up}.py || die
-   # not available for icedtea
-   rm test/t/test_javaws.py || die
-
eapply_user
 }
 
 src_test() {
+   local EPYTEST_DESELECT=(
+   # redhat-specific, we strip these completions
+   test/t/test_if{down,up}.py
+   # not available for icedtea
+   test/t/test_javaws.py
+   )
+
# portage's HOME override breaks tests
-   local myhome=$(unset HOME; echo ~)
-   local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-   addpredict "${myhome}"
-   emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
+   local -x HOME=$(unset HOME; echo ~)
+   addpredict "${HOME}"
+   # used in pytest tests
+   local -x NETWORK=none
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   emake -C completions check
+   epytest
 }
 
 src_install() {

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index a95ffccbac98..8d39bca2b242 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -94,21 +94,26 @@ src_prepare() {
eapply 
"${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
fi
 
-   # redhat-specific, we strip these completions
-   rm test/t/test_if{down,up}.py || die
-   # not available for icedtea
-   rm test/t/test_javaws.py || die
-
eapply_user
eautoreconf
 }
 
 src_test() {
+   local EPYTEST_DESELECT=(
+   # redhat-specific, we strip these completions
+   test/t/test_if{down,up}.py
+   # not available for icedtea
+   test/t/test_javaws.py
+   )
+
# portage's HOME override breaks tests
-   local myhome=$(unset HOME; echo ~)
-   local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-   addpredict "${myhome}"
-   emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
+   local -x HOME=$(unset HOME; echo ~)
+   addpredict "${HOME}"
+   # used in pytest tests
+   local -x NETWORK=none
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   emake -C completions check
+   epytest
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 246f728c80195fa27955e07d65dbe41a54c21c84
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:35:13 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246f728c

app-shells/bash-completion: Update URLs

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 3b52c5d1e19f..67ec99d5b6ca 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/scop/bash-completion;
 SRC_URI="

https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
eselect? (
-   
https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+   
https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
)
 "
 

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index ffb776fd867b..a95ffccbac98 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -79,10 +79,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-   use eselect && git-r3_fetch https://github.com/mgorny/bashcomp2
+   use eselect && git-r3_fetch https://github.com/projg2/bashcomp2
git-r3_fetch
 
-   use eselect && git-r3_checkout https://github.com/mgorny/bashcomp2 \
+   use eselect && git-r3_checkout https://github.com/projg2/bashcomp2 \
"${WORKDIR}"/bashcomp2
git-r3_checkout
 }

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 90e21f91513d9770e65c125b1415ab69b039b2ef
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 13:11:34 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e21f91

app-shells/bash-completion: Deselect a failing test

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 5ee98932da25..6353cab23964 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -98,6 +98,8 @@ src_test() {
test/t/test_if{down,up}.py
# not available for icedtea
test/t/test_javaws.py
+   # TODO
+   test/t/test_xmlwf.py::TestXmlwf::test_2
)
 
# portage's HOME override breaks tests

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 3fd01bd87ec4e79653d66c4ec2ea617f83ae91db
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:32:37 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd01bd8

app-shells/bash-completion: Reformat

Signed-off-by: Michał Górny  gentoo.org>

 .../bash-completion/bash-completion-2.11.ebuild| 22 --
 .../bash-completion/bash-completion-.ebuild| 17 -
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index a1fa288f505d..6620da126225 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -5,13 +5,17 @@ EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.3
 PYTHON_COMPAT=( python3_{9..11} )
+
 inherit python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion;
 SRC_URI="

https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-   eselect? ( 
https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
 )"
+   eselect? (
+   
https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+   )
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -20,9 +24,11 @@ IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
 # completion collision with net-fs/mc
-RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+RDEPEND="
+   >=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
-   !!net-fs/mc"
+   !!net-fs/mc
+"
 DEPEND="
test? (
${RDEPEND}
@@ -30,8 +36,11 @@ DEPEND="
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
')
-   )"
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+   )
+"
+PDEPEND="
+   >=app-shells/gentoo-bashcomp-20140911
+"
 
 strip_completions() {
# Remove unwanted completions.
@@ -76,8 +85,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-   use eselect &&
+   if use eselect; then
eapply 
"${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+   fi
 
# redhat-specific, we strip these completions
rm test/t/test_if{down,up}.py || die

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index db9e158ca8ee..b6d3b0aa9615 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9..11} )
+
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
@@ -17,9 +18,11 @@ IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
 # completion collision with net-fs/mc
-RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+RDEPEND="
+   >=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
-   !!net-fs/mc"
+   !!net-fs/mc
+"
 DEPEND="
test? (
${RDEPEND}
@@ -27,8 +30,11 @@ DEPEND="
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
')
-   )"
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+   )
+"
+PDEPEND="
+   >=app-shells/gentoo-bashcomp-20140911
+"
 
 strip_completions() {
# Remove unwanted completions.
@@ -116,9 +122,10 @@ src_install() {
dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
 
# install the eselect module
-   use eselect &&
+   if use eselect; then
emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" install
+   fi
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 1f441a442ec593d765164226967f87466e922a6a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:24:48 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f441a44

app-shells/bash-completion: Use python_has_version

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 4 ++--
 app-shells/bash-completion/bash-completion-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 42368e09344e..b54591dd58fa 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -67,8 +67,8 @@ strip_completions() {
 }
 
 python_check_deps() {
-   has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-   has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index e43aea818d4d..326984fbf6fe 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -64,8 +64,8 @@ strip_completions() {
 }
 
 python_check_deps() {
-   has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-   has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 7c2ff944675784650b3368b8484ffeb1d498933a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:34:10 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2ff944

app-shells/bash-completion: EAPI 8

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 898536500905..3b52c5d1e19f 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 BASHCOMP_P=bashcomp-2.0.3
 PYTHON_COMPAT=( python3_{9..11} )

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 332524412045..ffb776fd867b 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: d72cdec14167a3ff2a12d94639708405794c9adc
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:25:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72cdec1

app-shells/bash-completion: Remove unused inherits

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index b54591dd58fa..a1fa288f505d 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.3
 PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 python-any-r1 user-info
+inherit python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion;

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 326984fbf6fe..db9e158ca8ee 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools git-r3 python-any-r1 user-info
+inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion;

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 255393b055a29959d91830109a6dffa01d4130fc
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 12:33:57 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255393b0

app-shells/bash-completion: Move test dependencies to BDEPEND

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 6620da126225..898536500905 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
sys-apps/miscfiles
!!net-fs/mc
 "
-DEPEND="
+BDEPEND="
test? (
${RDEPEND}
$(python_gen_any_dep '

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index b6d3b0aa9615..332524412045 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
sys-apps/miscfiles
!!net-fs/mc
 "
-DEPEND="
+BDEPEND="
test? (
${RDEPEND}
$(python_gen_any_dep '

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 497fa8f8e69989b8c520d50cee5c41d30e595ef9
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar  3 06:26:30 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar  3 13:29:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497fa8f8

app-shells/bash-completion: Enable py3.11

Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index c7bcbfdfe2e6..42368e09344e 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit bash-completion-r1 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index ee41ba30bbde..e43aea818d4d 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools git-r3 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: f70b4736f5aa8521c18c1ef39e5d3dcf6d592544
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 28 03:19:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 28 03:19:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70b4736

app-shells/bash: backport clang 16 configure fix to 5.1

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r3.ebuild | 315 +
 .../files/bash-5.1_p16-configure-clang16.patch |  37 +++
 2 files changed, 352 insertions(+)

diff --git a/app-shells/bash/bash-5.1_p16-r3.ebuild 
b/app-shells/bash/bash-5.1_p16-r3.ebuild
new file mode 100644
index ..9ff113498a62
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r3.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   *_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
+
+if is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
+   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   done
+
+   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   done
+
+   unset my_pn patch_url my_patch_index
+   fi
+else
+   SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig 
)"
+fi
+
+if [[ -n ${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"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+   >=sys-libs/ncurses-5.2-r2:0=
+   nls? ( virtual/libintl )
+   readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+   ${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="app-alternatives/yacc
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   # Patches from Chet sent to bashbug ml
+   
"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+
+   "${FILESDIR}"/${PN}-5.1_p16-configure-clang16.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() {
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   else
+   if use verify-sig ; then
+   verify-sig_verify_detached 
"${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+   local patch
+   for patch in "${MY_PATCHES[@]}" ; do
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: a65512af125ca7433402246d1b6c6b62eb7d0936
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  9 04:08:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  9 04:08:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65512af

app-shells/bash: fix configure w/ clang 16

Signed-off-by: Sam James  gentoo.org>

 ...sh-5.2_p15-r1.ebuild => bash-5.2_p15-r2.ebuild} |  1 +
 .../files/bash-5.2_p15-configure-clang16.patch | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15-r1.ebuild 
b/app-shells/bash/bash-5.2_p15-r2.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.2_p15-r1.ebuild
rename to app-shells/bash/bash-5.2_p15-r2.ebuild
index b0db51f7f0ce..8c7792de30c2 100644
--- a/app-shells/bash/bash-5.2_p15-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r2.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
# Patches from Chet sent to bash-bug ml
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
"${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+   "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
 )
 
 pkg_setup() {

diff --git a/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch 
b/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch
new file mode 100644
index ..6005d39df59c
--- /dev/null
+++ b/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch
@@ -0,0 +1,37 @@
+https://lists.gnu.org/archive/html/bug-bash/2023-02/msg0.html)
+
+From 2cdf8b42885189b3cf7c47096b01f104e520546a Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Thu, 2 Feb 2023 05:43:37 +
+Subject: [PATCH] aclocal.m4: fix -Wimplicit-function-declaration in dup2 check
+
+dup2 requires a  include. Fixes the following when diffing config.log
+ when testing with a stricter compiler:
+```
+-warning: call to undeclared function 'dup2'; ISO C99 and later do not support 
implicit function declarations [-Wimplicit-function-declaration]
++error: call to undeclared function 'dup2'; ISO C99 and later do not support 
implicit function declarations [-Wimplicit-function-declaration]
+```
+--- aclocal.m4
 aclocal.m4
+@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken,
+ #include 
+ #include 
+ #include 
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
+ int
+ main()
+ {
+--- configure
 configure
+@@ -18121,6 +18121,9 @@ else $as_nop
+ #include 
+ #include 
+ #include 
++#ifdef HAVE_UNISTD_H
++#include 
++#endif
+ int
+ main()
+ {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Mike Gilbert]

commit: 548352c9f0312813aec795fad09170cc48d8c077
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jan 28 20:23:40 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jan 28 20:24:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548352c9

app-shells/bash: quote EPREFIX

Signed-off-by: Mike Gilbert  gentoo.org>

 app-shells/bash/bash-4.3_p48-r2.ebuild | 10 +-
 app-shells/bash/bash-4.4_p23-r2.ebuild | 10 +-
 app-shells/bash/bash-5.0_p18.ebuild| 10 +-
 app-shells/bash/bash-5.1_p16-r2.ebuild | 10 +-
 app-shells/bash/bash-5.2_p15-r1.ebuild |  8 
 app-shells/bash/bash-.ebuild   |  8 
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild 
b/app-shells/bash/bash-4.3_p48-r2.ebuild
index dcd165238d97..fa5b257be9da 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -129,10 +129,10 @@ src_configure() {
# 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\"\'
 \
-   -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-   -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+   
-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\"\'
 \
+   -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+   -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-DNON_INTERACTIVE_LOGIN_SHELLS \
-DSSH_SOURCE_BASHRC \
-DUSE_MKTEMP -DUSE_MKSTEMP \

diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild 
b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 3da92649f1d5..d560deaae10f 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -138,10 +138,10 @@ src_configure() {
# 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\"\'
 \
-   -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-   -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+   
-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\"\'
 \
+   -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)

diff --git a/app-shells/bash/bash-5.0_p18.ebuild 
b/app-shells/bash/bash-5.0_p18.ebuild
index 84c1ac19288a..23ec36757da4 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -142,10 +142,10 @@ src_configure() {
# 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\"\'
 \
-   -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-   -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 0006d8f4352803faebac6a3a88972b8142f29ed6
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 15 22:34:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 15 22:40:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0006d8f4

app-shells/bash: drop 5.2_p15

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 353 
 1 file changed, 353 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
deleted file mode 100644
index 9dbde4810a73..
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
-   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-   done
-
-   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
-   done
-
-   unset my_pn patch_url my_patch_index
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-   >=sys-libs/ncurses-5.2-r2:=
-   nls? ( virtual/libintl )
-"
-if is_release ; then
-   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-   ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="
-   app-alternatives/yacc
-   pgo? ( dev-util/gperf )
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bash-bug ml
-   "${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."
-  

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: c834e23a32d262a415a7d553e5bd6c6460b0d38a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 07:43:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 07:48:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c834e23a

app-shells/bash: backport random UB fix

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15-r1.ebuild | 354 +
 app-shells/bash/files/bash-5.2_p15-random-ub.patch |  13 +
 2 files changed, 367 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15-r1.ebuild 
b/app-shells/bash/bash-5.2_p15-r1.ebuild
new file mode 100644
index ..5fad0049fc09
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p15-r1.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
+   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+   done
+
+   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   done
+
+   unset my_pn patch_url my_patch_index
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+   >=sys-libs/ncurses-5.2-r2:=
+   nls? ( virtual/libintl )
+"
+if is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+   ${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+   app-alternatives/yacc
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+   # Patches from Chet sent to bash-bug ml
+   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+   "${FILESDIR}"/${PN}-5.2_p15-random-ub.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 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 13d407057928f96ce29ef4988b7bd4400db8c060
Author: Leonardo Hernández Hernández  protonmail  com>
AuthorDate: Fri Jan  6 16:37:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  7 00:06:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d40705

app-shells/bash: fix build with gcc and USE=pgo

Closes: https://bugs.gentoo.org/889848
Signed-off-by: Leonardo Hernández Hernández  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28985
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 4 +++-
 app-shells/bash/bash-.ebuild| 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
index a1a2a14ae0e4..9dbde4810a73 100644
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ b/app-shells/bash/bash-5.2_p15.ebuild
@@ -246,7 +246,9 @@ src_compile() {
 
emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
 
-   tc-is-clang && llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
+   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

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index b0207e51036e..b491dd7b04e3 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -246,7 +246,9 @@ src_compile() {
 
emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
 
-   tc-is-clang && llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
+   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

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: a677e141b023ae241cf32180fdbc052036a7c642
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  4 05:32:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 05:32:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a677e141

app-shells/bash: crank copyright

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 2 +-
 app-shells/bash/bash-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
index e0c1c5ecc52e..a1a2a14ae0e4 100644
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ b/app-shells/bash/bash-5.2_p15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index c082c658b1aa..b0207e51036e 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: f75639b635eacab161f65103ae4c53a3edffe816
Author: Leonardo Hernández Hernández  protonmail  com>
AuthorDate: Tue Dec 13 21:59:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 05:31:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75639b6

app-shells/bash: fix build with clang and USE=pgo

Signed-off-by: Leonardo Hernández Hernández  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28659
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 2 ++
 app-shells/bash/bash-.ebuild| 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
index 3aa6795a6431..e0c1c5ecc52e 100644
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ b/app-shells/bash/bash-5.2_p15.ebuild
@@ -246,6 +246,8 @@ src_compile() {
 
emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
 
+   tc-is-clang && llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
+
# Rebuild Bash using the profiling data we just generated.
emake clean
emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 5fecc6b0353c..c082c658b1aa 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -246,6 +246,8 @@ src_compile() {
 
emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
 
+   tc-is-clang && llvm-profdata merge "${T}"/pgo 
--output="${T}"/pgo/default.profdata || die
+
# Rebuild Bash using the profiling data we just generated.
emake clean
emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 0042496ebae91879fa9747f92320cebfeed83fc2
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 13 18:58:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 13 19:36:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0042496e

app-shells/bash: wire up verify-sig for patches

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   | 6 ++
 app-shells/bash/bash-5.1_p16-r2.ebuild | 5 +
 app-shells/bash/bash-5.2_p12.ebuild| 5 +
 app-shells/bash/bash-.ebuild   | 5 +
 4 files changed, 21 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index a6a915791ea8..45a63cd6c251 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -397,3 +397,9 @@ DIST bash52-011 1229 BLAKE2B 
e1b246634ee7b1bba7e4b140bc730fa6770f5988ed215ea1ba6
 DIST bash52-011.sig 95 BLAKE2B 
e74cee94ba4f5a1e094b026a5fde7d10a1d9280302694476cc701c79cb1915bec2eabc937f5f44ab393e427dd12c900609e35469514121b006f5efce92acaf29
 SHA512 
15ca053df8c1e87c1724379984ef93d509602f38fc0ce272a2fb1375e07d68299add46605c2c0fb0053eb449cc588cf063bd7a889eec77d4d55f18d3290359ed
 DIST bash52-012 9107 BLAKE2B 
b7c4888a3af4e9ee37f3d83d15bad1360209eb412ba1e963c4be90b0b1d62e0c860f61f5cf7de3b7b1a34d341101069ffa5a65efc7dc5857dac296444321b9d2
 SHA512 
8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
 DIST bash52-012.sig 95 BLAKE2B 
e4c1867b22814335c9cf233e6240578e181ae9f515e83a652b00b325efc314af463ed019f6f2c692d981a4ef6e70610ae69a16c880e29b44d11c332277f466e6
 SHA512 
22793024cc8a3c67c03a7e82d910c005e0cbfc657196427cdaaa25158c89c580e5cf2153f62d5bb2083ad5a88715724b79d9d922524c39b82c217824b5609a97
+DIST bash52-013 1503 BLAKE2B 
a8c5a2d526a049b36677a485d8e12a6ccbabc6118ba760e2e08785650b89ae13b155242c7c5f557fb229ffcdea6ff6d5b0de1d0c66b7f2a1711bee7d01a4b663
 SHA512 
5aaa82d88ec98382e241cbf1a4356a9e69888432301f1c974038b59fd8be08ad2a52b782f51ac673bad72bc4e07d1eb45b926595ebe6d53223dcb7f15f3883a7
+DIST bash52-013.sig 95 BLAKE2B 
93c7fd31b79a89c97f5b37012298f4d36d665d534f8be1a67a71d6c65540a2485821ec0524e6daa3cc845f28c5a9aedab235c8d3670cfddb35d98d61d86a2fa7
 SHA512 
2d103c299e3bf17bb559d4372e537c5ccf162b4e225fb8c52d27f8e7f64ee5cd884141d849c8728b7c0cb58a2dd56b62d2c2f69795b3b8aecf99ade82c1eb1c4
+DIST bash52-014 3245 BLAKE2B 
990e6566c446ce030d1333a05de9027a994054e983bf414e9aa09505c94d0615f1726494e139320b0d1c923c680565b2cf4249bd062e9e8aa98b226386c03c26
 SHA512 
5b6e846b30691e398ee5628226278ffd9def64ef1edd8d77dd4bd681405c339fce39f820837cf8e09c0478b39ecb3a8db01c3e0afb88bdecb7bf362d797e4884
+DIST bash52-014.sig 95 BLAKE2B 
2206483fd1b356099bab6fb7793d21dbd5b2adcbe2b108c69c5d7ccd6a13f934c69adcecd5f3fb1783b380c91c362609a175c4b95f25ac9996bbfad0147f250d
 SHA512 
e7404ca3ff8bac3cb0dc7edd0bfc7907734474c8d99a4dfffae87645653f05a26911e5f1e4670d80472423c84b42f86c84835ca310c083bcf16cdf860dd2
+DIST bash52-015 8088 BLAKE2B 
038f03bc543297a3f2e7612afdee7b27eb5d65d7f81c22976936211f4a80acd9f0faf1ba6c56e20fc653b877a448ab7872b5488da3684952682d80c752227ab2
 SHA512 
eb1bd6b3bf8811d765f222cd48360eb7f3f0aaa4f29f1b6c1f17635b819e5e4734ec4e7fcfde551fd7a6299a7d67869ea0bc5cc86cc523bc4a64d30e433df493
+DIST bash52-015.sig 95 BLAKE2B 
b32afb78e24554ccc73f95883e1c78cdee222e589634ecca947b00ce163596373de6179f7c6e6bccbb9ab846c9ff3c8ee04723f23b1a641c908f535c01cbea2c
 SHA512 
047d84c9e1bc996acfb735667409a7285d025fc8c63b9c7da86ace9e6be133d58bd66bf8bf918b81d27aaebc5795419604418d2ddb0ee11b675f283b634f441f

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index eda4291bf8b7..795a74626b61 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -115,6 +115,11 @@ src_unpack() {
else
if use verify-sig ; then
verify-sig_verify_detached 
"${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+   local patch
+   for patch in "${MY_PATCHES[@]}" ; do
+   verify-sig_verify_detached ${patch}{,.sig}
+   done
fi
 
unpack ${MY_P}.tar.gz

diff --git a/app-shells/bash/bash-5.2_p12.ebuild 
b/app-shells/bash/bash-5.2_p12.ebuild
index 96a742ef63a7..3aa6795a6431 100644
--- a/app-shells/bash/bash-5.2_p12.ebuild
+++ b/app-shells/bash/bash-5.2_p12.ebuild
@@ -130,6 +130,11 @@ src_unpack() {
else
if use verify-sig ; then
verify-sig_verify_detached 
"${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+   local patch
+   for patch in "${MY_PATCHES[@]}" ; do
+   verify-sig_verify_detached ${patch}{,.sig}
+   done
fi
 
unpack ${MY_P}.tar.gz

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: ee6b9432e5f759cd86cf8b2be6ca4c8e3050dac9
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 13 18:59:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 13 19:36:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6b9432

app-shells/bash: add 5.2_p15

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 349 
 1 file changed, 349 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
new file mode 100644
index ..3aa6795a6431
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p15.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
+   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+   done
+
+   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   done
+
+   unset my_pn patch_url my_patch_index
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+   >=sys-libs/ncurses-5.2-r2:=
+   nls? ( virtual/libintl )
+"
+if is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+   ${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+   app-alternatives/yacc
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+   # Patches from Chet sent to bash-bug ml
+   "${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

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit: 6edd9df6a2ba25921d145fd958c54afa51250b5b
Author: Chris Mayo  gmail  com>
AuthorDate: Mon Dec  5 19:20:41 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec  5 20:00:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6edd9df6

app-shells/bash-completion: use the correct eselect module name

Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28554
Signed-off-by: Michał Górny  gentoo.org>

 app-shells/bash-completion/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash-completion/metadata.xml 
b/app-shells/bash-completion/metadata.xml
index b8af55c2981a..7def7326d530 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -11,7 +11,7 @@



-   Support blacklisting of completions via 'eselect 
bash-completion'.
+   Support blacklisting of completions via 'eselect 
bashcomp'.
This enables custom Gentoo patching of upstream 
completion loader.

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: 7e76039814e8fd90df70b0d63e9c8832629d966b
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 24 02:37:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 24 02:40:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e760398

app-shells/bash: drop 5.2_p9-r1

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p9-r1.ebuild  | 345 -
 ...ash-5.2_p9-fix-for-extglob-in-compat-mode.patch |  42 ---
 2 files changed, 387 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p9-r1.ebuild 
b/app-shells/bash/bash-5.2_p9-r1.ebuild
deleted file mode 100644
index 4d87e7c40c59..
--- a/app-shells/bash/bash-5.2_p9-r1.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2_p1"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
-   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-   done
-
-   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
-   done
-
-   unset my_pn patch_url my_patch_index
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-   >=sys-libs/ncurses-5.2-r2:=
-   nls? ( virtual/libintl )
-"
-if is_release ; then
-   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-   ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="
-   virtual/yacc
-   pgo? ( dev-util/gperf )
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bash-bug ml
-   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${P}-fix-for-extglob-in-compat-mode.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 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: c0322f1d5dbd5b8c0468d93800281923599cfe4b
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 23 23:29:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 23 23:29:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0322f1d

app-shells/bash: add 5.2_p12

Bug: https://bugs.gentoo.org/873931
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest|   6 +
 app-shells/bash/bash-5.2_p12.ebuild | 344 
 2 files changed, 350 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 80b15f475b96..a6a915791ea8 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,3 +391,9 @@ DIST bash52-008 1771 BLAKE2B 
b46dde58525b727565efeca99cf4279fd2510382430b227ed23
 DIST bash52-008.sig 95 BLAKE2B 
bf702abda6415ac31627c84095d211807cfaed74d53cdd712e1524ec5926f334852bf88b316aade5a87c5c2be2e2268d6867813e0d5205e4c3adc332259d54cf
 SHA512 
84fde6817c0d63525d79355452eb31242b69d39dcc6d9e9453e5691e7ceb79af48a1be854a002d57aa120c7decbcae61af047a48ab1de54eef35b3877856c73b
 DIST bash52-009 1316 BLAKE2B 
36a1a5be9166f436077aff8c8dc8e6b8745b6b07408e5abc3756846d199799cee22e825ae992f3db5f3885157fb37b64f1159b3bc8d0bd1d16c5980c9f74e092
 SHA512 
71fffb71e5876e7abea7e769f4438f2f8d3843d7dfec13f1ba7e79ead5b001d7543c92eb3a628b393f8652bf136e4768c1d1c7b55c155cafe83886b900396e68
 DIST bash52-009.sig 95 BLAKE2B 
5527f79b8477b48077002e0fa8277ea6851c02895e0e2cc3bb164f09032be093c2db9afeaea10410451cc4d6d0c189ef153d25f015e64d98495afb28b9d73769
 SHA512 
ca4b88c3f056d5ab25aaef0f4f9071fd29efc1ac1034a18f0c82187789618203db7eeb4693f82a302a553a0c779b5f186083d4d3f77d03fe34b8398dc44fcbec
+DIST bash52-010 2045 BLAKE2B 
0c61991d38c95b25411e793a09855c18f536ddfae237b09d01ac7898d4638b8747fc58d2c2f35c651026bd6957cb04780382256417e0bbde288aa4e05cd80530
 SHA512 
12d120e39593d3f23aa86e510b0eda514ec69ef42e910e5855e4c7510354e8504e5d6949770448f5632ce482c9ab468f4ba82a8a38b4a8237cdd7b54f742946a
+DIST bash52-010.sig 95 BLAKE2B 
347282a2784bfd813919d9690ba2d2dcf76772d826dae2885ca23a10c54ad76009d9637d2cbd7b249ec04ff1d8effcf238c3b75abb576a922e423993bee89153
 SHA512 
e046197aee4c3acef30872a5a742882e61f8d0eca88a311b9e3826f814935e7d1627800f3dbef22543cf47084b48ca07b22cadfc6c761c5b5a943dabfb150709
+DIST bash52-011 1229 BLAKE2B 
e1b246634ee7b1bba7e4b140bc730fa6770f5988ed215ea1ba646eea630789b86fec471e99c28b142b74539639f37239487b02b877ea360f519bdaee2894
 SHA512 
83a7584ca8ee512839183e329183476a2c8bcb995e3dc9d5188f04f11760bd3cb0f2d29d12bca2661b7ce8ab125d44d35d839f735992ca6c27f936d609ac4683
+DIST bash52-011.sig 95 BLAKE2B 
e74cee94ba4f5a1e094b026a5fde7d10a1d9280302694476cc701c79cb1915bec2eabc937f5f44ab393e427dd12c900609e35469514121b006f5efce92acaf29
 SHA512 
15ca053df8c1e87c1724379984ef93d509602f38fc0ce272a2fb1375e07d68299add46605c2c0fb0053eb449cc588cf063bd7a889eec77d4d55f18d3290359ed
+DIST bash52-012 9107 BLAKE2B 
b7c4888a3af4e9ee37f3d83d15bad1360209eb412ba1e963c4be90b0b1d62e0c860f61f5cf7de3b7b1a34d341101069ffa5a65efc7dc5857dac296444321b9d2
 SHA512 
8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
+DIST bash52-012.sig 95 BLAKE2B 
e4c1867b22814335c9cf233e6240578e181ae9f515e83a652b00b325efc314af463ed019f6f2c692d981a4ef6e70610ae69a16c880e29b44d11c332277f466e6
 SHA512 
22793024cc8a3c67c03a7e82d910c005e0cbfc657196427cdaaa25158c89c580e5cf2153f62d5bb2083ad5a88715724b79d9d922524c39b82c217824b5609a97

diff --git a/app-shells/bash/bash-5.2_p12.ebuild 
b/app-shells/bash/bash-5.2_p12.ebuild
new file mode 100644
index ..955033674b60
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p12.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2_p1"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Conrad Kostecki]

commit: b103238d77075bb3d96c07d748ed0f615c271157
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Nov 16 18:17:21 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Nov 16 18:33:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b103238d

app-shells/bash: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28299
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...r-brackets-in-nested-parameter-expansions.patch |  41 ---
 ...h-5.2_p2-fixes-for-extglob-in-compat-mode.patch | 282 -
 2 files changed, 323 deletions(-)

diff --git 
a/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
 
b/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
deleted file mode 100644
index 9c1b03f8b2df..
--- 
a/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel=22f21b760ed90eb77c3756e6ccf39b73c84f532a
-
 subst.c
-+++ subst.c
-@@ -1798,6 +1798,9 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, 
flags)
-   return (result);
- }
- 
-+#define PARAMEXPNEST_MAX  32  // for now
-+static int dbstate[PARAMEXPNEST_MAX];
-+
- /* Extract a parameter expansion expression within ${ and } from STRING.
-Obey the Posix.2 rules for finding the ending `}': count braces while
-skipping over enclosed quoted strings and command substitutions.
-@@ -1828,6 +1831,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
-   if (quoted == Q_HERE_DOCUMENT && dolbrace_state == DOLBRACE_QUOTE && (flags 
& SX_NOALLOC) == 0)
- return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags));
- 
-+  dbstate[0] = dolbrace_state;
-+
-   pass_character = 0;
-   nesting_level = 1;
-   slen = strlen (string + *sindex) + *sindex;
-@@ -1852,6 +1857,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
- 
-   if (string[i] == '$' && string[i+1] == LBRACE)
-   {
-+if (nesting_level < PARAMEXPNEST_MAX)
-+  dbstate[nesting_level] = dolbrace_state;
- nesting_level++;
- i += 2;
- if (dolbrace_state == DOLBRACE_QUOTE || dolbrace_state == 
DOLBRACE_WORD)
-@@ -1864,6 +1871,7 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
- nesting_level--;
- if (nesting_level == 0)
-   break;
-+dolbrace_state = (nesting_level < PARAMEXPNEST_MAX) ? 
dbstate[nesting_level] : dbstate[0];/* Guess using initial state */
- i++;
- continue;
-   }
-

diff --git 
a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch 
b/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch
deleted file mode 100644
index 16393c79af8b..
--- a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-https://bugs.gentoo.org/873931
-https://lists.gnu.org/archive/html/bug-bash/2022-10/msg1.html
-https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel=22f21b760ed90eb77c3756e6ccf39b73c84f532a
-
 MANIFEST
-+++ MANIFEST
-@@ -1131,6 +1131,7 @@ tests/extglob4.sub   f
- tests/extglob5.subf
- tests/extglob6.subf
- tests/extglob7.subf
-+tests/extglob8.subf
- tests/func.tests  f
- tests/func.right  f
- tests/func1.sub   f
 builtins/common.h
-+++ builtins/common.h
-@@ -257,6 +257,10 @@ extern int print_shift_error;
- extern int expand_once_flag;
- #endif
- 
-+#if defined (EXTENDED_GLOB)
-+extern int extglob_flag;
-+#endif
-+
- /* variables from source.def */
- extern int source_searches_cwd;
- extern int source_uses_path;
 builtins/shopt.def
-+++ builtins/shopt.def
-@@ -1,7 +1,7 @@
- This file is shopt.def, from which is created shopt.c.
- It implements the Bash `shopt' builtin.
- 
--Copyright (C) 1994-2021 Free Software Foundation, Inc.
-+Copyright (C) 1994-2022 Free Software Foundation, Inc.
- 
- This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -149,6 +149,11 @@ static int shopt_set_complete_direxpand PARAMS((char *, 
int));
- static int set_assoc_expand PARAMS((char *, int));
- #endif
- 
-+#if defined (EXTENDED_GLOB)
-+int extglob_flag = EXTGLOB_DEFAULT;
-+static int shopt_set_extglob PARAMS((char *, int));
-+#endif
-+
- static int shopt_set_debug_mode PARAMS((char *, int));
- 
- static int shopt_login_shell;
-@@ -203,7 +208,7 @@ static struct {
-   { "extdebug", _mode, shopt_set_debug_mode },
- #endif
- #if defined (EXTENDED_GLOB)
--  { "extglob", _glob, (shopt_set_func_t *)NULL },
-+  { "extglob", _flag, shopt_set_extglob },
- #endif
-   { "extquote", _quote, (shopt_set_func_t *)NULL },
-   { "failglob", _glob_expansion, (shopt_set_func_t *)NULL },
-@@ -374,7 +379,7 @@ reset_shopt_options ()
- #endif
- 
- #if defined 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 01cd0a05091d31c7a50bb060399e5b434651aa9f
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  8 02:52:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  8 02:52:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01cd0a05

app-shells/bash: add 5.2_p9

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |  14 ++
 app-shells/bash/bash-5.2_p9.ebuild | 344 +
 2 files changed, 358 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index be774d0ff071..80b15f475b96 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -377,3 +377,17 @@ DIST bash52-001 1381 BLAKE2B 
d00a8b4fb3babf52c67a3e345158c1f70b5b45e5a54100a6671
 DIST bash52-001.sig 95 BLAKE2B 
003557022d011c084d542256de0bb8f7430a66adb0aef997599802cae3a0de1aa8015d45b1d6cb83611557e95cb8d359ec9ba70eb6351468639d10c5a65a59d1
 SHA512 
95b70255674df4f39be8c976702f851a245bd234b330bfb21e3f91120d4ebd6a4dfe448f7d35497d51787350d172cebd33a99c528d938e749161bf52cdc71370
 DIST bash52-002 1328 BLAKE2B 
b3b7e2511823a0527aeed5af2c8d9f44e5ab079fa8b3f48fe84b35a14327d0143e14e04316c16bfbe2a1cac0c7fcf7ab5058a2b00be38ed3243b53b786e969f1
 SHA512 
2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1
 DIST bash52-002.sig 95 BLAKE2B 
7ba48e58c973630e845dfe887f6bae35bb67ff6c099fd3f820b89f98d89ed5cfe38bec1aacdd3f2612a862057cf7b0da42848f926dd8f1ed7d1c4889cde0e84b
 SHA512 
201631d4ec2a238a58d09ced4c497e83ccadc005e3c64a2fa8cbd11734d552272e525198b682f5380acb4294b89d7bfd80392c9fb9d96b4f965bde812596e33d
+DIST bash52-003 2157 BLAKE2B 
d9f358c240d998a331d6aa4513b02191b1fbe7e875f8e96e531fca8968f84d0f4672d3644bbd6258f2aca0cabd2deb6159bbf98ba201e667d61353113a3e8240
 SHA512 
c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb
+DIST bash52-003.sig 95 BLAKE2B 
fa7176e2d80ef549c9f62875779e72050c6f5180034c29d98159e0835ed0ee332367404b533b2938ba7e41b1404d096398127c2fb0d60631d515d5433b0e1633
 SHA512 
1f261af58ac459be50ba3267c73275597407b0b5fa0b953940d217b49a9c5a9c991b7a3f5b8b3189d4f5ada81096bbdc8095a13200d517db5ee5b63c68ce219c
+DIST bash52-004 2016 BLAKE2B 
159fbb7a6dddece1d4db2b38d6de591366ae07eb237ffa8ad61c933560160561736a4e70b8bd5441cd75ae88e8d4a29869367838b169a4533d06d9d3c345d554
 SHA512 
64bab53225ab2f0b974988c9b1ad5d2d2bb256ce384bb9d4646d1e75411a8eefc7ce2a7ee470345bff276e71147e9b5149a5d9b25bd5308f7bad77b8f68b5c84
+DIST bash52-004.sig 95 BLAKE2B 
01c145e4e24293cf65c79052836cb7f7588592fe08f5a9e533613ee52e06c89814eaa150a2e8ab78168832fe18c0e84878d50ff5a8cae903ae2a6def000a39d5
 SHA512 
01c41e33fdb91850b6e1673567216570ee35d92ff9f857a33393f6fc249064215cdabe30065ef2d837d526e8b194584a9474954898dd10694c2b2ae576c1cc97
+DIST bash52-005 1515 BLAKE2B 
5afdbe8fa644e1b7108600a7ecc0a8e5774a837f3acff45bfe5eff9ffca1b9e5ab09f19083464a9cfaee4bd6c9b351275c5baef5331c43dbfbc642e226ca8af3
 SHA512 
9971ebef50d2a776226d68dbb11feaac85522f66824a0e54faa97b0a14cc242eb8daae2c4364ec59cea5413824be7cbc149c02d1452f211588c505f030b13ee0
+DIST bash52-005.sig 95 BLAKE2B 
abbf6b5633af059ce24863102774583339d340a911d4a9c0c7404f7b99f05f5faa5b94f8cfeccde8505808fb25b2d57870ab0a5ec90d58c846fe74c9a60e272a
 SHA512 
3c761c0bd44301a755ec6c8d5d04430e89fdfa8500388f8a792ba511e9061ae908d39b3a1432c441559af966a8cee5667d7e2f76cfaf45557434925f1432d9fe
+DIST bash52-006 8790 BLAKE2B 
68c37f5f5164685d0d1f25a05d5584128b6d8d83efa271aaaf80c82e2ec71bc78a3961ebd5d5d6620ef6a3dcca7e6494f0e666b651056faef9c0ea0866b3b94e
 SHA512 
aa46d8a5523374a269ea3d1b4b75ae4e3d918ef4f6d89331bed5da24505bcfac321864071f29161e56487c611d35fe1351c2a2ea226ccaeecef55d01a5a5f2c7
+DIST bash52-006.sig 95 BLAKE2B 
9343c367d8e162ce481a1d38e96c0df2113935d54fd200952cc45fb80b513d53db8a1a21942332426a10af9adadb84e0268dd7a2418e2e6940a5893c29e6fa14
 SHA512 
49f78ba88cda3dcdc60f6c9e4dc02f6bd4c35ec271ecf5ca766037f34d2835b144573dcd80b7f64acf3810a446d61f5a260e4fea6328084c2c5a98c173369199
+DIST bash52-007 9072 BLAKE2B 
028808fa9eac85e66ad942fff07ca6595b578911b3f3f99ae7d67289bd6c27936bbce66fea160e8c3e2fcc6bb18f6429121685c550a815ed992f9d0c757391ae
 SHA512 
a2f5ce78c651ec220852989a8b2325d0f1a3739f6494796124324e5883290f74b7e360f91d540c339e1ca3030e54b91301241bb481e965f9fdf915d5fd5accd1
+DIST bash52-007.sig 95 BLAKE2B 
511bfeb735d4f5fdaa5a2bdd3659421c1087a7cd6ce1bcbf5cc7169a3c9d3535f113c63b81165be18552c17e8c9f228f1416d025ab89064cf4293d067d28d06e
 SHA512 
38f02577c6feb687bca5ceb86b04457c29e4aff9612ea1ec690f8f733dd885433dc5b8913cc0aa78fda235afd8e7697884e3585242b12b409228d4ab3f519a42
+DIST bash52-008 1771 BLAKE2B 
b46dde58525b727565efeca99cf4279fd2510382430b227ed233e7fc78c433b8d7eb2f1f7e4d31174118e9cc5bb8c43656e78583dc7fde15381aa63001b78277
 SHA512 
1f317f3c2313ede7b67c4e396dfad453787f4a30ff77fc53aae482c7dbb752f60c1f33cb414dcc3055a55b77c8c80aeda9626e5b066a79af8a082c6e056340e2
+DIST bash52-008.sig 95 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Arthur Zamarin]

commit: 5805857cbeac369c108156f3be38257c0805a25f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct 29 05:45:41 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Oct 29 05:45:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5805857c

app-shells/bash: Stabilize 5.1_p16-r2 hppa, #878573

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index bff10a6f78c7..54d56596e605 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 972abd3395085e50b0da4e3fed1f08a19e4141a8
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:52:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:53:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972abd33

app-shells/bash: Stabilize 5.1_p16-r2 ppc64, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 5fbfe5af77e4..bff10a6f78c7 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 6b97e689858197eae618e0ea8fdd86907bf1d03b
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:44:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:44:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b97e689

app-shells/bash: Stabilize 5.1_p16-r2 amd64, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 19154a1e8e5a..5fbfe5af77e4 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 23143344bbd2c9d3ba715a48b22c3ed532299c60
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:44:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:44:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23143344

app-shells/bash: Stabilize 5.1_p16-r2 arm, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 805c60b456e7..19154a1e8e5a 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: f40c9a7e6a702c366af07809215a0c7ccb9b5f5a
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:44:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:44:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40c9a7e

app-shells/bash: Stabilize 5.1_p16-r2 sparc, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 2f47da61ae54..805c60b456e7 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: aebeb8b790272cebb12899dbec7bc799d383
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:44:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:44:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebeb8b7

app-shells/bash: Stabilize 5.1_p16-r2 arm64, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index cfa1dfe069d2..2f47da61ae54 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 53f0614cf5b70d09c61518e4ded4ab28f90e8379
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:44:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:44:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f0614c

app-shells/bash: Stabilize 5.1_p16-r2 x86, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 95ce2de073f1..cfa1dfe069d2 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 3aa45b855fea61aba4ddde707280587cd02c0b1e
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:27:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:27:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa45b85

app-shells/bash: Stabilize 5.1_p16-r2 ppc, #878573

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.1_p16-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 27cc205c5d91..95ce2de073f1 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 23a8e26414b1aac76e35ed845e4fdbe5cb58d925
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 02:38:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 02:38:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a8e264

app-shells/bash: add savannah upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 6ec75e4bd86f..9459ebc90e90 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -27,5 +27,6 @@
mailto:bug-b...@gnu.org

https://tiswww.case.edu/php/chet/bash/NEWS
cpe:/a:gnu:bash
+   bash

 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/

[Sam James]

commit: f311a77983e608c3218f492ece715bced27f77a0
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 22:07:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 22:08:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f311a779

app-shells/bash: reorganise 5.2_p2-r2 patches

Just splits the patches from 47950445cddff736a1e6c0c1346a20ab6b326cc1
into two.

Closes: https://bugs.gentoo.org/873931
See: 47950445cddff736a1e6c0c1346a20ab6b326cc1
Thanks-to: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p2-r2.ebuild  |  3 +-
 ...r-brackets-in-nested-parameter-expansions.patch | 41 ++
 ...h-5.2_p2-fixes-for-extglob-in-compat-mode.patch | 38 
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/app-shells/bash/bash-5.2_p2-r2.ebuild 
b/app-shells/bash/bash-5.2_p2-r2.ebuild
index 897cf5324a38..c79b71ca70ef 100644
--- a/app-shells/bash/bash-5.2_p2-r2.ebuild
+++ b/app-shells/bash/bash-5.2_p2-r2.ebuild
@@ -108,7 +108,8 @@ PATCHES=(
 
# Patches from Chet sent to bash-bug ml
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-   "${FILESDIR}"/${PN}-5.2_p2-fixes-for-extglob-in-compat-mode.patch
+   "${FILESDIR}"/${P}-fix-for-brackets-in-nested-parameter-expansions.patch
+   "${FILESDIR}"/${P}-fixes-for-extglob-in-compat-mode.patch
 )
 
 pkg_setup() {

diff --git 
a/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
 
b/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
new file mode 100644
index ..9c1b03f8b2df
--- /dev/null
+++ 
b/app-shells/bash/files/bash-5.2_p2-fix-for-brackets-in-nested-parameter-expansions.patch
@@ -0,0 +1,41 @@
+https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel=22f21b760ed90eb77c3756e6ccf39b73c84f532a
+
+--- subst.c
 subst.c
+@@ -1798,6 +1798,9 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, 
flags)
+   return (result);
+ }
+ 
++#define PARAMEXPNEST_MAX  32  // for now
++static int dbstate[PARAMEXPNEST_MAX];
++
+ /* Extract a parameter expansion expression within ${ and } from STRING.
+Obey the Posix.2 rules for finding the ending `}': count braces while
+skipping over enclosed quoted strings and command substitutions.
+@@ -1828,6 +1831,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
+   if (quoted == Q_HERE_DOCUMENT && dolbrace_state == DOLBRACE_QUOTE && (flags 
& SX_NOALLOC) == 0)
+ return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags));
+ 
++  dbstate[0] = dolbrace_state;
++
+   pass_character = 0;
+   nesting_level = 1;
+   slen = strlen (string + *sindex) + *sindex;
+@@ -1852,6 +1857,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
+ 
+   if (string[i] == '$' && string[i+1] == LBRACE)
+   {
++if (nesting_level < PARAMEXPNEST_MAX)
++  dbstate[nesting_level] = dolbrace_state;
+ nesting_level++;
+ i += 2;
+ if (dolbrace_state == DOLBRACE_QUOTE || dolbrace_state == 
DOLBRACE_WORD)
+@@ -1864,6 +1871,7 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
+ nesting_level--;
+ if (nesting_level == 0)
+   break;
++dolbrace_state = (nesting_level < PARAMEXPNEST_MAX) ? 
dbstate[nesting_level] : dbstate[0];/* Guess using initial state */
+ i++;
+ continue;
+   }
+

diff --git 
a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch 
b/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch
index 06415b5cdaa4..16393c79af8b 100644
--- a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch
+++ b/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch
@@ -213,44 +213,6 @@ 
https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel=22f21b760ed90eb77c
  
 This file is part of GNU Bash, the Bourne Again SHell.
  
 subst.c
-+++ subst.c
-@@ -1798,6 +1798,9 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, 
flags)
-   return (result);
- }
- 
-+#define PARAMEXPNEST_MAX  32  // for now
-+static int dbstate[PARAMEXPNEST_MAX];
-+
- /* Extract a parameter expansion expression within ${ and } from STRING.
-Obey the Posix.2 rules for finding the ending `}': count braces while
-skipping over enclosed quoted strings and command substitutions.
-@@ -1828,6 +1831,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
-   if (quoted == Q_HERE_DOCUMENT && dolbrace_state == DOLBRACE_QUOTE && (flags 
& SX_NOALLOC) == 0)
- return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags));
- 
-+  dbstate[0] = dolbrace_state;
-+
-   pass_character = 0;
-   nesting_level = 1;
-   slen = strlen (string + *sindex) + *sindex;
-@@ -1852,6 +1857,8 @@ extract_dollar_brace_string (string, sindex, quoted, 
flags)
- 
-   if 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: ece657823e19ed22f93885336be8e87ae3ff3ee8
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 14:54:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 14:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece65782

app-shells/bash: tighten readline dep for 5.2_p2

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/{bash-5.2_p2-r1.ebuild => bash-5.2_p2-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash/bash-5.2_p2-r1.ebuild 
b/app-shells/bash/bash-5.2_p2-r2.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.2_p2-r1.ebuild
rename to app-shells/bash/bash-5.2_p2-r2.ebuild
index e40e4b39547a..897cf5324a38 100644
--- a/app-shells/bash/bash-5.2_p2-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p2-r2.ebuild
@@ -33,7 +33,7 @@ is_release() {
 
 # The version of readline this bash normally ships with.
 # Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2"
+READLINE_VER="8.2_p1"
 
 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;

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: 47950445cddff736a1e6c0c1346a20ab6b326cc1
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 13:24:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 13:25:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47950445

app-shells/bash: backport fixes for extglob in compat mode for 5.2

Bug: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00029.html
Closes: https://bugs.gentoo.org/873931
Thanks-to: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_p2-r1.ebuild  | 345 +
 ...h-5.2_p2-fixes-for-extglob-in-compat-mode.patch | 320 +++
 2 files changed, 665 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p2-r1.ebuild 
b/app-shells/bash/bash-5.2_p2-r1.ebuild
new file mode 100644
index ..e40e4b39547a
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p2-r1.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
+   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+   done
+
+   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   done
+
+   unset my_pn patch_url my_patch_index
+   fi
+else
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${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 is_release ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+   >=sys-libs/ncurses-5.2-r2:=
+   nls? ( virtual/libintl )
+"
+if is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+   ${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+   virtual/yacc
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+   # Patches from Chet sent to bash-bug ml
+   "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+   "${FILESDIR}"/${PN}-5.2_p2-fixes-for-extglob-in-compat-mode.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 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 775f600808e5868dab7988ef8b917a9d487b1ece
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  6 14:43:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  6 14:45:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775f6008

app-shells/bash: add 5.2_p2

Changes:
* Bash-5.2 patch 1: fix crash with unset arrays in arithmetic contexts
  
(https://git.savannah.gnu.org/cgit/bash.git/commit/?id=a1e58b8c064cbf3cb0180b63e581770de7ccea5b)
  (https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00012.html)

* Bash-5.2 patch 2: fix crash in readline when started with an invalid locale 
specification
  
(https://git.savannah.gnu.org/cgit/bash.git/commit/?id=a99d905216cc0aac5de0c3050f4afc54e21c6bc5)
  (https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00013.html)

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |   4 +
 app-shells/bash/bash-5.2_p2.ebuild | 344 +
 2 files changed, 348 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ab0065a5dc0f..be774d0ff071 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -373,3 +373,7 @@ DIST bash51-015 1409 BLAKE2B 
c9f4d7bb13727cbea142200ff61f09d5b06a117d863afd8a451
 DIST bash51-015.sig 95 BLAKE2B 
236e63344a1d4f82acee460b84c7a0153ab27a5f8a1429eadb2db29c2506293828330a7da337a89d4e33cc1578ad47a427c574f669f6a4c560ffb7db719205bb
 SHA512 
6dd83302c2dffa701ccb5ecb6d655714479609f2297bd53c5d02a9d8169fe52cea09149d122b679405da0ecbaeb4252b8834dd5397e89aaad1b87528d18ea7fb
 DIST bash51-016 2122 BLAKE2B 
c44d269366cf13d896602bc14ebefd8f5826cb10820e9bace83b643f5af0264cff0240da81cabcbb36af55a009795420cc622100969656bcb3c977ee9359d810
 SHA512 
020b3f3db77ca603a27a3423323538db5c9844be17ee428cf7cda80bebdcc715d30eab6c95773541cb8d14f3ad9e6142bf0adcda0e745ee638242508cc0ab05f
 DIST bash51-016.sig 95 BLAKE2B 
6da76c4dc413b0a4560ae6b7ec550090c819b7a3e05dc2e000ee709b8430ae6373003f7c99dc94a13cfcce33e393199bd9b8f670a120375c929bf40b9e5a2a15
 SHA512 
d008d91db6b6bccea9431f962665fc4976cbeed87b24ea133044e9a15b0aba14f1d6361e524f00096377aa11a9b1daeea2bbeb65e82396cb12bc57cb560940f0
+DIST bash52-001 1381 BLAKE2B 
d00a8b4fb3babf52c67a3e345158c1f70b5b45e5a54100a6671d96f9cfbf893143d5a23df7e7c5f4d5c0bd650519fb0c447b2304db2d6e0751dfffa651a7cf49
 SHA512 
d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409
+DIST bash52-001.sig 95 BLAKE2B 
003557022d011c084d542256de0bb8f7430a66adb0aef997599802cae3a0de1aa8015d45b1d6cb83611557e95cb8d359ec9ba70eb6351468639d10c5a65a59d1
 SHA512 
95b70255674df4f39be8c976702f851a245bd234b330bfb21e3f91120d4ebd6a4dfe448f7d35497d51787350d172cebd33a99c528d938e749161bf52cdc71370
+DIST bash52-002 1328 BLAKE2B 
b3b7e2511823a0527aeed5af2c8d9f44e5ab079fa8b3f48fe84b35a14327d0143e14e04316c16bfbe2a1cac0c7fcf7ab5058a2b00be38ed3243b53b786e969f1
 SHA512 
2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1
+DIST bash52-002.sig 95 BLAKE2B 
7ba48e58c973630e845dfe887f6bae35bb67ff6c099fd3f820b89f98d89ed5cfe38bec1aacdd3f2612a862057cf7b0da42848f926dd8f1ed7d1c4889cde0e84b
 SHA512 
201631d4ec2a238a58d09ced4c497e83ccadc005e3c64a2fa8cbd11734d552272e525198b682f5380acb4294b89d7bfd80392c9fb9d96b4f965bde812596e33d

diff --git a/app-shells/bash/bash-5.2_p2.ebuild 
b/app-shells/bash/bash-5.2_p2.ebuild
new file mode 100644
index ..f679e4cd77dc
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p2.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 7488d4400989b0cdbcd53b272cd748a7aae7828c
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  6 14:45:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  6 14:45:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7488d440

app-shells/bash: drop 5.2

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2.ebuild | 344 
 1 file changed, 344 deletions(-)

diff --git a/app-shells/bash/bash-5.2.ebuild b/app-shells/bash/bash-5.2.ebuild
deleted file mode 100644
index f679e4cd77dc..
--- a/app-shells/bash/bash-5.2.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-   return 0
-   ;;
-   esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2"
-
-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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-   if [[ ${PLEVEL} -gt 0 ]] ; then
-   # bash-5.1 -> bash51
-   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-   patch_url=
-   my_patch_index=
-
-   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
-   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
-   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
-   SRC_URI+=" ${patch_url}"
-   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-   done
-
-   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
-   done
-
-   unset my_pn patch_url my_patch_index
-   fi
-else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${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 is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-   >=sys-libs/ncurses-5.2-r2:=
-   nls? ( virtual/libintl )
-"
-if is_release ; then
-   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-   ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="virtual/yacc"
-BDEPEND="
-   pgo? ( dev-util/gperf )
-   verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-   #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-   # Patches from Chet sent to bashbug ml
-   "${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() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 5cfcbad6756b42d608d702a49bdd0b9dda885159
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 26 17:53:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 26 17:53:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfcbad6

app-shells/bash: forward ~loong

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2.ebuild  | 2 +-
 app-shells/bash/bash-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2.ebuild b/app-shells/bash/bash-5.2.ebuild
index 139632fba6a7..f679e4cd77dc 100644
--- a/app-shells/bash/bash-5.2.ebuild
+++ b/app-shells/bash/bash-5.2.ebuild
@@ -77,7 +77,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 139632fba6a7..f679e4cd77dc 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -77,7 +77,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 8c7cd027392309a17b7cd1b26804f7a27c68456a
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 26 17:49:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 26 17:49:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7cd027

app-shells/bash: add 5.2, drop 5.2_rc4 (masked)

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest | 4 ++--
 app-shells/bash/{bash-5.2_rc4.ebuild => bash-5.2.ebuild} | 4 
 app-shells/bash/bash-.ebuild | 4 
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ff793c382b45..ab0065a5dc0f 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,8 +21,8 @@ DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 
89e615a08920a4cfc90f72d125a8256275b
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 
42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7
 SHA512 
c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f
 SHA512 
3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
-DIST bash-5.2-rc4.tar.gz 10953456 BLAKE2B 
c39eb9640a08fe3a6e8e61fd7e9f8116b34e5da83fd97afa3abb78164cb70af9774fb2315bbd2507ead33fd38718ca7fcfd4df7ee6d2e564424dce9c5f230640
 SHA512 
3f00e5872b1c90901446c3d9299d72229f2fb28e7db7659acc52d353e20b34f627ced42e6b02159f499c5885a211aaf55510b9cd145c46f4e0b3cb19237b4bbc
-DIST bash-5.2-rc4.tar.gz.sig 95 BLAKE2B 
6ae8e4e48fcd821bad7a67a0f1ab8bf4c20c385d8eefceca178d114210a4a95d03ae891039d01efdf15b7849401df61f4748d2baa6ca13b09fe4d23b0132113f
 SHA512 
c44b02fb2e22a8d77bbb09a3712878478fabe287abe5a5a5c40e00cef89a9b516e9e72074f123580b0840e3e62ef9a192096738fa1bd5906acadbfe5cc5e206c
+DIST bash-5.2.tar.gz 10950833 BLAKE2B 
51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9
 SHA512 
5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
+DIST bash-5.2.tar.gz.sig 95 BLAKE2B 
2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c
 SHA512 
a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-5.2_rc4.ebuild 
b/app-shells/bash/bash-5.2.ebuild
similarity index 98%
rename from app-shells/bash/bash-5.2_rc4.ebuild
rename to app-shells/bash/bash-5.2.ebuild
index 847e52506d7f..139632fba6a7 100644
--- a/app-shells/bash/bash-5.2_rc4.ebuild
+++ b/app-shells/bash/bash-5.2.ebuild
@@ -3,10 +3,6 @@
 
 EAPI=7
 
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 847e52506d7f..139632fba6a7 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -3,10 +3,6 @@
 
 EAPI=7
 
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: a2eabcc998bbb2e2b7c776ba3c2e9395e327de26
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 02:03:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 02:08:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2eabcc9

app-shells/bash: drop 5.2_rc2, 5.2_rc3

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest|   4 -
 app-shells/bash/bash-5.2_rc2.ebuild | 348 
 app-shells/bash/bash-5.2_rc3.ebuild | 348 
 3 files changed, 700 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 87f6925ef845..ff793c382b45 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,10 +21,6 @@ DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 
89e615a08920a4cfc90f72d125a8256275b
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 
42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7
 SHA512 
c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f
 SHA512 
3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
-DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 
839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b
 SHA512 
431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
-DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 
446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f
 SHA512 
c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
-DIST bash-5.2-rc3.tar.gz 10896868 BLAKE2B 
32b3345325f50a1883390403eb77105a9f1aacc5c1991bd47b817e9d86dbefa389281a68b758e898018e734a77e61117e581347ebc1f132003ae8b93239e1ac2
 SHA512 
a8ac061d6815de74c820081e320634f671ad91dace9e3fbcc5dc4b9ab56208c6207cebd4dd6aaf2379c1ff98f6edcdf8ca58c6b07f6b2b490a4a632eea36
-DIST bash-5.2-rc3.tar.gz.sig 95 BLAKE2B 
b4f87665814943860a64bc3c2102c61147f9047f525e81554c8a46a5366421e13a02052f878f955f775355920ae32af8033a209abf70bd36b64e14177dce5db2
 SHA512 
e0591d761d2502591edc2e0e330341708104f8d5bdddb7f62d737c5c306c1aa7a4d129d00a197e63d52833a3fc1691a0b6b8060de6e6762afa165a147126d95b
 DIST bash-5.2-rc4.tar.gz 10953456 BLAKE2B 
c39eb9640a08fe3a6e8e61fd7e9f8116b34e5da83fd97afa3abb78164cb70af9774fb2315bbd2507ead33fd38718ca7fcfd4df7ee6d2e564424dce9c5f230640
 SHA512 
3f00e5872b1c90901446c3d9299d72229f2fb28e7db7659acc52d353e20b34f627ced42e6b02159f499c5885a211aaf55510b9cd145c46f4e0b3cb19237b4bbc
 DIST bash-5.2-rc4.tar.gz.sig 95 BLAKE2B 
6ae8e4e48fcd821bad7a67a0f1ab8bf4c20c385d8eefceca178d114210a4a95d03ae891039d01efdf15b7849401df61f4748d2baa6ca13b09fe4d23b0132113f
 SHA512 
c44b02fb2e22a8d77bbb09a3712878478fabe287abe5a5a5c40e00cef89a9b516e9e72074f123580b0840e3e62ef9a192096738fa1bd5906acadbfe5cc5e206c
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071

diff --git a/app-shells/bash/bash-5.2_rc2.ebuild 
b/app-shells/bash/bash-5.2_rc2.ebuild
deleted file mode 100644
index 847e52506d7f..
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*)
-   return 1
-   ;;
-   *)
-  

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/

[Mike Gilbert]

commit: 04add5d9bfe8a7b790ad8564e11f7c5bd7846139
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep 11 23:10:25 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep 11 23:10:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04add5d9

app-shells/bash: remove egrep/fgrep aliases from bashrc

Upstream has declared these forms to be deprecated. Aliasing them to
'grep -E' and 'grep -F' prevents the deprecation warning from being
displayed, which could lead to confusion.

Bug: https://bugs.gentoo.org/869788
Signed-off-by: Mike Gilbert  gentoo.org>

 app-shells/bash/files/bashrc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index bce7204e3c01..b7202a361d31 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -94,8 +94,6 @@ if ${use_color} ; then
#BSD#@export CLICOLOR=1
#GNU#@alias ls='ls --color=auto'
alias grep='grep --colour=auto'
-   alias egrep='grep -E --colour=auto'
-   alias fgrep='grep -F --colour=auto'
 else
# show root@ when we don't have colors
PS1+='\u@\h \w \$ '

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: da2cef35a1534d057c97bf4eb0e4dcd52f1f8c19
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 00:17:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 00:22:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2cef35

app-shells/bash: add 5.2_rc4

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest|   2 +
 app-shells/bash/bash-5.2_rc4.ebuild | 348 
 2 files changed, 350 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 7cafbac2dfb8..87f6925ef845 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,6 +25,8 @@ DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 
839be13e89b679bbcfca19f2e331e471639cea
 DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 
446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f
 SHA512 
c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
 DIST bash-5.2-rc3.tar.gz 10896868 BLAKE2B 
32b3345325f50a1883390403eb77105a9f1aacc5c1991bd47b817e9d86dbefa389281a68b758e898018e734a77e61117e581347ebc1f132003ae8b93239e1ac2
 SHA512 
a8ac061d6815de74c820081e320634f671ad91dace9e3fbcc5dc4b9ab56208c6207cebd4dd6aaf2379c1ff98f6edcdf8ca58c6b07f6b2b490a4a632eea36
 DIST bash-5.2-rc3.tar.gz.sig 95 BLAKE2B 
b4f87665814943860a64bc3c2102c61147f9047f525e81554c8a46a5366421e13a02052f878f955f775355920ae32af8033a209abf70bd36b64e14177dce5db2
 SHA512 
e0591d761d2502591edc2e0e330341708104f8d5bdddb7f62d737c5c306c1aa7a4d129d00a197e63d52833a3fc1691a0b6b8060de6e6762afa165a147126d95b
+DIST bash-5.2-rc4.tar.gz 10953456 BLAKE2B 
c39eb9640a08fe3a6e8e61fd7e9f8116b34e5da83fd97afa3abb78164cb70af9774fb2315bbd2507ead33fd38718ca7fcfd4df7ee6d2e564424dce9c5f230640
 SHA512 
3f00e5872b1c90901446c3d9299d72229f2fb28e7db7659acc52d353e20b34f627ced42e6b02159f499c5885a211aaf55510b9cd145c46f4e0b3cb19237b4bbc
+DIST bash-5.2-rc4.tar.gz.sig 95 BLAKE2B 
6ae8e4e48fcd821bad7a67a0f1ab8bf4c20c385d8eefceca178d114210a4a95d03ae891039d01efdf15b7849401df61f4748d2baa6ca13b09fe4d23b0132113f
 SHA512 
c44b02fb2e22a8d77bbb09a3712878478fabe287abe5a5a5c40e00cef89a9b516e9e72074f123580b0840e3e62ef9a192096738fa1bd5906acadbfe5cc5e206c
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-5.2_rc4.ebuild 
b/app-shells/bash/bash-5.2_rc4.ebuild
new file mode 100644
index ..847e52506d7f
--- /dev/null
+++ b/app-shells/bash/bash-5.2_rc4.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO on release:
+# - check READLINE_VER, obviously
+# (presumably there weren't always readline releases for bash RCs etc)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
+   esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2"
+
+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} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[WANG Xuerui]

commit: 3e7a32355fa57e2320b9d3cc952b89c3a5777129
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Aug 28 07:03:06 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Aug 28 07:41:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7a3235

app-shells/bash-completion: keyword 2.11 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 77dfb81a73bd..8540d81528a0 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: d3c19b7974aeb4ac2a1351a019e80625b4111c4b
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 26 22:31:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 26 22:44:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c19b79

app-shells/bash: drop use of 'eval' for newer versions for patch generation

Use similar approach as dev-libs/mpfr and sys-libs/readline
for generating SRC_URI & patch list.

Signed-off-by: Sam James  gentoo.org>

 ...{bash-5.2_rc2.ebuild => bash-5.1_p16-r2.ebuild} | 149 +
 app-shells/bash/bash-5.2_rc2.ebuild|  51 ---
 app-shells/bash/bash-5.2_rc3.ebuild|  51 ---
 app-shells/bash/bash-.ebuild   |  51 ---
 4 files changed, 157 insertions(+), 145 deletions(-)

diff --git a/app-shells/bash/bash-5.2_rc2.ebuild 
b/app-shells/bash/bash-5.1_p16-r2.ebuild
similarity index 66%
copy from app-shells/bash/bash-5.2_rc2.ebuild
copy to app-shells/bash/bash-5.1_p16-r2.ebuild
index d451bde867f0..27cc205c5d91 100644
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -3,16 +3,12 @@
 
 EAPI=7
 
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
@@ -20,85 +16,83 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
 is_release() {
case ${PV} in
-   |*_alpha*|*_beta*|*_rc*) return 1 ;;
-   *) return 0 ;;
+   *_alpha*|*_beta*|*_rc*)
+   return 1
+   ;;
+   *)
+   return 0
+   ;;
esac
 }
+
 [[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-   local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-   [[ ${plevel} -eq 0 ]] && return 1
-   eval set -- {1..${plevel}}
-   set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-   if [[ ${opt} == -s ]] ; then
-   echo "${@/#/${DISTDIR}/}"
-   else
-   local u
-   for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
-   printf "${u}/${pn}-${pv}-patches/%s " "$@"
-   printf "${u}/${pn}-${pv}-patches/%s.asc " "$@"
-   done
-   fi
-}
 
 # The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
-READLINE_VER="8.2"
+READLINE_VER="8.1"
 
 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} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
-   EGIT_BRANCH=devel
-   inherit git-r3
-elif is_release ; then
-   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
+
+if is_release ; then
+   SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+   if [[ ${PLEVEL} -gt 0 ]] ; then
+   # bash-5.1 -> bash51
+   my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+   patch_url=
+   my_patch_index=
+
+   for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; 
my_patch_index++)) ; do
+   for url in mirror://gnu/${pn} 
ftp://ftp.cwru.edu/pub/bash ; do
+   patch_url=$(printf "${url}/${PN}-$(ver_cut 
1-2)-patches/${my_p}-%03d" ${my_patch_index})
+   SRC_URI+=" ${patch_url}"
+   SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+   done
+
+   MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d 
${my_patch_index}) )
+   done
+
+   unset my_pn patch_url my_patch_index
+   fi
 else
-   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+   SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig 
)"
 fi
 
 if [[ -n ${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+"
+LICENSE="GPL-3"
 SLOT="0"
-if is_release 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 3b9c8905181cf28066655bf8486ea2ba89dff4bf
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 26 21:59:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 26 22:33:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c8905

app-shells/bash: add 5.2_rc3

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest| 2 ++
 app-shells/bash/{bash-5.2_rc2-r1.ebuild => bash-5.2_rc2.ebuild} | 2 +-
 app-shells/bash/{bash-5.2_rc2-r1.ebuild => bash-5.2_rc3.ebuild} | 2 +-
 app-shells/bash/bash-.ebuild| 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index b6a9dd50d838..7cafbac2dfb8 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -23,6 +23,8 @@ DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef788
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 
839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b
 SHA512 
431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
 DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 
446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f
 SHA512 
c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
+DIST bash-5.2-rc3.tar.gz 10896868 BLAKE2B 
32b3345325f50a1883390403eb77105a9f1aacc5c1991bd47b817e9d86dbefa389281a68b758e898018e734a77e61117e581347ebc1f132003ae8b93239e1ac2
 SHA512 
a8ac061d6815de74c820081e320634f671ad91dace9e3fbcc5dc4b9ab56208c6207cebd4dd6aaf2379c1ff98f6edcdf8ca58c6b07f6b2b490a4a632eea36
+DIST bash-5.2-rc3.tar.gz.sig 95 BLAKE2B 
b4f87665814943860a64bc3c2102c61147f9047f525e81554c8a46a5366421e13a02052f878f955f775355920ae32af8033a209abf70bd36b64e14177dce5db2
 SHA512 
e0591d761d2502591edc2e0e330341708104f8d5bdddb7f62d737c5c306c1aa7a4d129d00a197e63d52833a3fc1691a0b6b8060de6e6762afa165a147126d95b
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-5.2_rc2-r1.ebuild 
b/app-shells/bash/bash-5.2_rc2.ebuild
similarity index 99%
copy from app-shells/bash/bash-5.2_rc2-r1.ebuild
copy to app-shells/bash/bash-5.2_rc2.ebuild
index 38b23139ba9a..d451bde867f0 100644
--- a/app-shells/bash/bash-5.2_rc2-r1.ebuild
+++ b/app-shells/bash/bash-5.2_rc2.ebuild
@@ -73,7 +73,7 @@ fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
-   >=sys-libs/ncurses-5.2-r2:0=
+   >=sys-libs/ncurses-5.2-r2:=
nls? ( virtual/libintl )
 "
 if is_release ; then

diff --git a/app-shells/bash/bash-5.2_rc2-r1.ebuild 
b/app-shells/bash/bash-5.2_rc3.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.2_rc2-r1.ebuild
rename to app-shells/bash/bash-5.2_rc3.ebuild
index 38b23139ba9a..d451bde867f0 100644
--- a/app-shells/bash/bash-5.2_rc2-r1.ebuild
+++ b/app-shells/bash/bash-5.2_rc3.ebuild
@@ -73,7 +73,7 @@ fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
-   >=sys-libs/ncurses-5.2-r2:0=
+   >=sys-libs/ncurses-5.2-r2:=
nls? ( virtual/libintl )
 "
 if is_release ; then

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 3d2370ffe950..d451bde867f0 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 # TODO on release:
 # - check READLINE_VER, obviously
@@ -73,7 +73,7 @@ fi
 IUSE="afs 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 86279cbf5dc98223b492cbf27a78de37e652b591
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 18 02:37:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 14 22:00:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86279cbf

app-shells/bash: add pgo

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_rc2-r1.ebuild | 45 +++---
 app-shells/bash/bash-.ebuild   | 45 +++---
 app-shells/bash/metadata.xml   |  3 +++
 3 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/app-shells/bash/bash-5.2_rc2-r1.ebuild 
b/app-shells/bash/bash-5.2_rc2-r1.ebuild
index 3fa9e5592430..38b23139ba9a 100644
--- a/app-shells/bash/bash-5.2_rc2-r1.ebuild
+++ b/app-shells/bash/bash-5.2_rc2-r1.ebuild
@@ -70,7 +70,7 @@ SLOT="0"
 if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
@@ -84,7 +84,10 @@ RDEPEND="
 "
 # We only need yacc when the .y files get patched (bash42-005, bash51-011)
 #BDEPEND="virtual/yacc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+BDEPEND="
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -186,16 +189,16 @@ src_configure() {
#use static && export LDFLAGS="${LDFLAGS} -static"
use nls || myconf+=( --disable-nls )
 
-   # 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%%_*}
-
if is_release ; 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
@@ -220,10 +223,24 @@ src_configure() {
 }
 
 src_compile() {
-   emake
+   if use pgo ; then
+   # Build Bash and run its tests to generate profiles.
+   emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo"
 
-   if use plugins ; then
-   emake -C examples/loadables all others
+   # Used in test suite.
+   unset A
+
+   emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo 
-fprofile-dir=${T}/pgo" -k check
+
+   # Rebuild Bash using the profiling data we just generated.
+   emake clean
+   emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"
+
+   use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} 
-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
+   else
+   emake
+
+   use plugins && emake -C examples/loadables all others
fi
 }
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 065cb2bc6dee..3d2370ffe950 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -70,7 +70,7 @@ SLOT="0"
 if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
@@ -84,7 +84,10 @@ RDEPEND="
 "
 # We only need yacc when the .y files get patched (bash42-005, bash51-011)
 #BDEPEND="virtual/yacc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+BDEPEND="
+   pgo? ( dev-util/gperf )
+   verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -186,16 +189,16 @@ src_configure() {
#use static && 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Mike Gilbert]

commit: c2204cc82792abe8ba280740fb441d440ceb5055
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jul 30 22:39:16 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul 31 16:55:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2204cc8

app-shells/bash: rename builtins.1 to bash_builtins.1

This seems to be the intended name based on doc/Makefile.in.

This also fixes a rendering issue when the man pages are viewed with
mandoc.

Closes: https://github.com/gentoo/gentoo/pull/26669
Closes: https://github.com/gentoo/gentoo/pull/26673
Signed-off-by: Mike Gilbert  gentoo.org>

 app-shells/bash/{bash-5.1_p16.ebuild => bash-5.1_p16-r1.ebuild} | 6 +-
 app-shells/bash/{bash-5.2_rc2.ebuild => bash-5.2_rc2-r1.ebuild} | 6 +-
 app-shells/bash/bash-.ebuild| 6 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash/bash-5.1_p16.ebuild 
b/app-shells/bash/bash-5.1_p16-r1.ebuild
similarity index 97%
rename from app-shells/bash/bash-5.1_p16.ebuild
rename to app-shells/bash/bash-5.1_p16-r1.ebuild
index 43292ec1f762..e7efd65fd661 100644
--- a/app-shells/bash/bash-5.1_p16.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r1.ebuild
@@ -270,7 +270,11 @@ src_install() {
done
fi
 
-   doman doc/*.1
+   # 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
 }

diff --git a/app-shells/bash/bash-5.2_rc2.ebuild 
b/app-shells/bash/bash-5.2_rc2-r1.ebuild
similarity index 98%
rename from app-shells/bash/bash-5.2_rc2.ebuild
rename to app-shells/bash/bash-5.2_rc2-r1.ebuild
index 4effa61a8843..3fa9e5592430 100644
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ b/app-shells/bash/bash-5.2_rc2-r1.ebuild
@@ -294,7 +294,11 @@ src_install() {
done
fi
 
-   doman doc/*.1
+   # 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
 }

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 6e82b8f94a03..065cb2bc6dee 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -294,7 +294,11 @@ src_install() {
done
fi
 
-   doman doc/*.1
+   # 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
 }

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: ff0c2559520b315cc6bd84d5b761a8ce97e10bbb
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 31 03:54:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 31 03:54:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0c2559

app-shells/bash: add bugs-to, changelog

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/metadata.xml | 39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 77e4f896fe1c..67efcea3d7d5 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,19 +1,28 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  base-sys...@gentoo.org
-  Gentoo Base System
-
-
-  Log ALL commands typed into bash; should ONLY be
-used in restricted environments such as honeypots
-  Build with custom malloc/free overwriting 
allocated/freed memory
-  Enable /dev/tcp/host/port redirection
-  Add support for loading builtins at runtime via
-'enable'
-
-
-  cpe:/a:gnu:bash
-
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
+   
+   
+   Log ALL commands typed into bash; should ONLY be
+   used in restricted environments such as honeypots
+   
+   
+   Build with custom malloc/free overwriting allocated/freed memory
+   
+   
+   Enable /dev/tcp/host/port redirection
+   
+   
+   Add support for loading builtins at runtime via 'enable'
+   
+   
+   
+   mailto:bug-b...@gnu.org
+   
https://tiswww.case.edu/php/chet/bash/NEWS
+   cpe:/a:gnu:bash
+   
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 1ded1edebeb6e5b126292b53c8b629a80e230a1f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 04:09:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 04:09:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ded1ede

app-shells/bash: drop 5.2_beta, 5.2_rc1

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest |   4 -
 app-shells/bash/bash-5.2_beta.ebuild | 302 -
 app-shells/bash/bash-5.2_rc1.ebuild  | 314 ---
 3 files changed, 620 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 7a390c780bad..b6a9dd50d838 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,10 +21,6 @@ DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 
89e615a08920a4cfc90f72d125a8256275b
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 
42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7
 SHA512 
c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f
 SHA512 
3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
-DIST bash-5.2-beta.tar.gz 10767207 BLAKE2B 
e3e0afd0d032dab002f3f7327cddbed56578d4d205e687c3408a9985038a4f24e7a728b874ff4ad960ca0c18e3174364e251658fb5ac8d1abed9907dd77764d2
 SHA512 
114fef0e3160d68fec977ccbe921b9e8a5ce468a8baefa1adb38c253da4528a3bd9a2791c667b01f0b7e248692044357d0506ee8a0b0ff2d4facc26112d0557d
-DIST bash-5.2-beta.tar.gz.sig 95 BLAKE2B 
1c5a1ce4f6157593c40d931591dfa0c6b0baf8e871119fd94687d1fd17266be5e8445a174609075878f31f0e4d6722a6f19ae399a30bf3b5f254494aba5e21f7
 SHA512 
e0054cc76c9c5d066f6c4343ba8f144acb4f8792a1df1514845a9be4a1bd55b2b5bbf9f9318e8657d1efcd6dbe7b374eab757219d2334698a9ef56367bb4b4c1
-DIST bash-5.2-rc1.tar.gz 10829145 BLAKE2B 
86f03b7982a71e01c29dc8aed632776913b5fb041321e6b9feca013790403cb6c72103dda338f2512be2bfba023a4e1cb56542e44e39ff2e9fef09cd92ea0d70
 SHA512 
a60a46829247129081d1c6a9ad65d83e54c51da481b2dbba3540e575f6c9148461bfcc8eb3f81258d7a70697c5e25eaf0331e86e50a1c7a321122ede07f1a11d
-DIST bash-5.2-rc1.tar.gz.sig 95 BLAKE2B 
11204acfaa9c3407b3816b89a7f107326cbd0eadb9fb23f8b19e49b8899b655ca61ef6d7a75d8da84af7c236fee3dfd5f14327a2132dc31f42c2d7d600636b5a
 SHA512 
e50b5cbf769902bfb89c13c1096e4f4853260cb8a9887766f4f7139aca84988e8ca0543a3b684516acb60a3cd5c5e65454522dea875bc46eeea57da5af6c96ff
 DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 
839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b
 SHA512 
431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
 DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 
446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f
 SHA512 
c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071

diff --git a/app-shells/bash/bash-5.2_beta.ebuild 
b/app-shells/bash/bash-5.2_beta.ebuild
deleted file mode 100644
index 9582f937a142..
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
-   case ${PV} in
-   |*_alpha*|*_beta*|*_rc*) return 1 ;;
-   *) return 0 ;;
-   esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: db90daf91e0ee96cf1d850b2130d6a0a66093713
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 04:10:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 04:10:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db90daf9

app-shells/bash: add git repo to HOMEPAGE

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_rc2.ebuild | 2 +-
 app-shells/bash/bash-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_rc2.ebuild 
b/app-shells/bash/bash-5.2_rc2.ebuild
index f3b505a4a835..4effa61a8843 100644
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ b/app-shells/bash/bash-5.2_rc2.ebuild
@@ -48,7 +48,7 @@ patches() {
 READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html 
https://git.savannah.gnu.org/cgit/bash.git;
 if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
EGIT_BRANCH=devel

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 09d7f435408e..6e82b8f94a03 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -48,7 +48,7 @@ patches() {
 READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html 
https://git.savannah.gnu.org/cgit/bash.git;
 if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
EGIT_BRANCH=devel

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: cdf3fa82c4115f5ecbd57f2d74287094fec9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 02:09:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 02:13:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf3fa82

app-shells/bash: add 5.2_rc2

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest|   2 +
 app-shells/bash/bash-5.2_rc2.ebuild | 314 
 2 files changed, 316 insertions(+)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 77b474193182..7a390c780bad 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,6 +25,8 @@ DIST bash-5.2-beta.tar.gz 10767207 BLAKE2B 
e3e0afd0d032dab002f3f7327cddbed56578d
 DIST bash-5.2-beta.tar.gz.sig 95 BLAKE2B 
1c5a1ce4f6157593c40d931591dfa0c6b0baf8e871119fd94687d1fd17266be5e8445a174609075878f31f0e4d6722a6f19ae399a30bf3b5f254494aba5e21f7
 SHA512 
e0054cc76c9c5d066f6c4343ba8f144acb4f8792a1df1514845a9be4a1bd55b2b5bbf9f9318e8657d1efcd6dbe7b374eab757219d2334698a9ef56367bb4b4c1
 DIST bash-5.2-rc1.tar.gz 10829145 BLAKE2B 
86f03b7982a71e01c29dc8aed632776913b5fb041321e6b9feca013790403cb6c72103dda338f2512be2bfba023a4e1cb56542e44e39ff2e9fef09cd92ea0d70
 SHA512 
a60a46829247129081d1c6a9ad65d83e54c51da481b2dbba3540e575f6c9148461bfcc8eb3f81258d7a70697c5e25eaf0331e86e50a1c7a321122ede07f1a11d
 DIST bash-5.2-rc1.tar.gz.sig 95 BLAKE2B 
11204acfaa9c3407b3816b89a7f107326cbd0eadb9fb23f8b19e49b8899b655ca61ef6d7a75d8da84af7c236fee3dfd5f14327a2132dc31f42c2d7d600636b5a
 SHA512 
e50b5cbf769902bfb89c13c1096e4f4853260cb8a9887766f4f7139aca84988e8ca0543a3b684516acb60a3cd5c5e65454522dea875bc46eeea57da5af6c96ff
+DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 
839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b
 SHA512 
431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
+DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 
446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f
 SHA512 
c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-5.2_rc2.ebuild 
b/app-shells/bash/bash-5.2_rc2.ebuild
new file mode 100644
index ..f3b505a4a835
--- /dev/null
+++ b/app-shells/bash/bash-5.2_rc2.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO on release:
+# - check READLINE_VER, obviously
+# (presumably there weren't always readline releases for bash RCs etc)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+   case ${PV} in
+   |*_alpha*|*_beta*|*_rc*) return 1 ;;
+   *) return 0 ;;
+   esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+   local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+   [[ ${plevel} -eq 0 ]] && return 1
+   eval set -- {1..${plevel}}
+   set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+   if [[ ${opt} == -s ]] ; then
+   echo "${@/#/${DISTDIR}/}"
+   else
+   local u
+   for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+   printf "${u}/${pn}-${pv}-patches/%s " "$@"
+   printf "${u}/${pn}-${pv}-patches/%s.asc " "$@"
+   done
+   fi
+}
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 40d891ccac4e3f1ba1311332f68d6dda42c922f1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 20:30:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 20:30:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d891cc

app-shells/bash: minor nit for QA_CONFIGURE_OPTIONS

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_rc1.ebuild | 2 +-
 app-shells/bash/bash-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_rc1.ebuild 
b/app-shells/bash/bash-5.2_rc1.ebuild
index 30812eac26e8..09d7f435408e 100644
--- a/app-shells/bash/bash-5.2_rc1.ebuild
+++ b/app-shells/bash/bash-5.2_rc1.ebuild
@@ -89,7 +89,7 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 S="${WORKDIR}/${MY_P}"
 
 # EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS+="--disable-static"
+QA_CONFIGURE_OPTIONS="--disable-static"
 
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index 30812eac26e8..09d7f435408e 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -89,7 +89,7 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 S="${WORKDIR}/${MY_P}"
 
 # EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS+="--disable-static"
+QA_CONFIGURE_OPTIONS="--disable-static"
 
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: e2fe286f2d5c0ae959cb6daa0f3695a08fe4f32b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 20:21:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 20:24:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2fe286f

app-shells/bash: only dep on readline if is_release

To match reality.

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_rc1.ebuild |  7 ++-
 app-shells/bash/bash-.ebuild| 16 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash/bash-5.2_rc1.ebuild 
b/app-shells/bash/bash-5.2_rc1.ebuild
index af272883e190..30812eac26e8 100644
--- a/app-shells/bash/bash-5.2_rc1.ebuild
+++ b/app-shells/bash/bash-5.2_rc1.ebuild
@@ -75,8 +75,10 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins 
+readline"
 DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
nls? ( virtual/libintl )
-   readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 "
+if is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
 RDEPEND="
${DEPEND}
 "
@@ -86,6 +88,9 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 
 S="${WORKDIR}/${MY_P}"
 
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS+="--disable-static"
+
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index f36854ee07d4..30812eac26e8 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -65,7 +65,7 @@ if [[ -n ${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"
+LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -75,8 +75,10 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins 
+readline"
 DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
nls? ( virtual/libintl )
-   readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 "
+if is_release ; then
+   DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
 RDEPEND="
${DEPEND}
 "
@@ -86,6 +88,9 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 
 S="${WORKDIR}/${MY_P}"
 
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS+="--disable-static"
+
 PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
@@ -222,6 +227,13 @@ src_compile() {
fi
 }
 
+src_test() {
+   # Used in test suite.
+   unset A
+
+   default
+}
+
 src_install() {
local d f
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: c990c58af2bd3c1e318b27d099590f90c863556c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 19:15:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 19:32:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c990c58a

app-shells/bash: add 5.2_rc1

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest  |  2 ++
 app-shells/bash/{bash-.ebuild => bash-5.2_rc1.ebuild} | 15 +++
 app-shells/bash/bash-.ebuild  |  6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 36f166d3c882..77b474193182 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -23,6 +23,8 @@ DIST bash-5.1.tar.gz.sig 95 BLAKE2B 
ac9209d6a4ab4436c511a7a195594e9036d7d1aef788
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 
1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015
 SHA512 
c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2-beta.tar.gz 10767207 BLAKE2B 
e3e0afd0d032dab002f3f7327cddbed56578d4d205e687c3408a9985038a4f24e7a728b874ff4ad960ca0c18e3174364e251658fb5ac8d1abed9907dd77764d2
 SHA512 
114fef0e3160d68fec977ccbe921b9e8a5ce468a8baefa1adb38c253da4528a3bd9a2791c667b01f0b7e248692044357d0506ee8a0b0ff2d4facc26112d0557d
 DIST bash-5.2-beta.tar.gz.sig 95 BLAKE2B 
1c5a1ce4f6157593c40d931591dfa0c6b0baf8e871119fd94687d1fd17266be5e8445a174609075878f31f0e4d6722a6f19ae399a30bf3b5f254494aba5e21f7
 SHA512 
e0054cc76c9c5d066f6c4343ba8f144acb4f8792a1df1514845a9be4a1bd55b2b5bbf9f9318e8657d1efcd6dbe7b374eab757219d2334698a9ef56367bb4b4c1
+DIST bash-5.2-rc1.tar.gz 10829145 BLAKE2B 
86f03b7982a71e01c29dc8aed632776913b5fb041321e6b9feca013790403cb6c72103dda338f2512be2bfba023a4e1cb56542e44e39ff2e9fef09cd92ea0d70
 SHA512 
a60a46829247129081d1c6a9ad65d83e54c51da481b2dbba3540e575f6c9148461bfcc8eb3f81258d7a70697c5e25eaf0331e86e50a1c7a321122ede07f1a11d
+DIST bash-5.2-rc1.tar.gz.sig 95 BLAKE2B 
11204acfaa9c3407b3816b89a7f107326cbd0eadb9fb23f8b19e49b8899b655ca61ef6d7a75d8da84af7c236fee3dfd5f14327a2132dc31f42c2d7d600636b5a
 SHA512 
e50b5cbf769902bfb89c13c1096e4f4853260cb8a9887766f4f7139aca84988e8ca0543a3b684516acb60a3cd5c5e65454522dea875bc46eeea57da5af6c96ff
 DIST bash205b-001 1132 BLAKE2B 
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
 SHA512 
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
 SHA512 
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ecf3a9526883
 DIST bash205b-003 2356 BLAKE2B 
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
 SHA512 
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399

diff --git a/app-shells/bash/bash-.ebuild 
b/app-shells/bash/bash-5.2_rc1.ebuild
similarity index 96%
copy from app-shells/bash/bash-.ebuild
copy to app-shells/bash/bash-5.2_rc1.ebuild
index 9582f937a142..af272883e190 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-5.2_rc1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # TODO on release:
 # - check READLINE_VER, obviously
@@ -57,15 +57,15 @@ elif is_release ; then
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
 else
-   SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
-   SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig 
)"
+   SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz;
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig 
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 fi
 
 if [[ -n ${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"
+LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -222,6 +222,13 @@ src_compile() {
fi
 }
 
+src_test() {
+   # Used in test suite.
+   unset A
+

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/files/, app-shells/bash/

[Sam James]

commit: 39a5d033d59067ce95cf212358e2ed7a03a2a94b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 11:02:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 13 19:38:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a5d033

app-shells/bash: switch to patch tarballs

Was taking up 129K in files/ before.

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/Manifest   |  11 +
 app-shells/bash/bash-2.05b_p13.ebuild  |  30 ++-
 app-shells/bash/bash-3.0_p22.ebuild|  34 ++-
 app-shells/bash/bash-3.1_p23.ebuild|  30 ++-
 app-shells/bash/bash-3.2_p57.ebuild|  34 ++-
 app-shells/bash/bash-4.0_p44.ebuild|  28 +-
 app-shells/bash/bash-4.1_p17.ebuild|  18 +-
 app-shells/bash/bash-4.2_p53.ebuild|  22 +-
 app-shells/bash/bash-4.3_p48-r2.ebuild |  20 +-
 app-shells/bash/bash-4.4_p23-r2.ebuild |  16 +-
 app-shells/bash/bash-5.0_p18.ebuild|  16 +-
 app-shells/bash/bash-5.1_p16.ebuild|  24 +-
 app-shells/bash/bash-5.2_beta.ebuild   |  19 +-
 app-shells/bash/bash-.ebuild   |  19 +-
 app-shells/bash/files/autoconf-mktime-2.53.patch   | 199 ---
 app-shells/bash/files/autoconf-mktime-2.59.patch   | 197 ---
 app-shells/bash/files/bash-2.05b-destdir.patch |  28 --
 .../bash/files/bash-2.05b-empty-herestring.patch   |  25 --
 .../bash/files/bash-2.05b-fix-job-warning.patch|  14 -
 app-shells/bash/files/bash-2.05b-jobs.patch|  28 --
 .../bash/files/bash-2.05b-parallel-build.patch |  15 --
 app-shells/bash/files/bash-2.05b-protos.patch  |  25 --
 app-shells/bash/files/bash-2.05b-rbash.patch   |  27 --
 app-shells/bash/files/bash-3.0-afs.patch   |  20 --
 app-shells/bash/files/bash-3.0-crash.patch |  46 
 app-shells/bash/files/bash-3.0-darwin-conn.patch   |  20 --
 .../bash/files/bash-3.0-histtimeformat.patch   |  56 
 app-shells/bash/files/bash-3.0-jobs.patch  |  56 
 app-shells/bash/files/bash-3.0-locale.patch| 112 
 app-shells/bash/files/bash-3.0-manpage.patch   |  15 --
 app-shells/bash/files/bash-3.0-multibyteifs.patch  | 281 -
 app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch |  20 --
 app-shells/bash/files/bash-3.0-protos.patch|  68 -
 app-shells/bash/files/bash-3.0-pwd.patch   |  16 --
 app-shells/bash/files/bash-3.0-rbash.patch |  18 --
 .../bash/files/bash-3.0-read-builtin-pipe.patch|  20 --
 app-shells/bash/files/bash-3.0-read-memleak.patch  |  15 --
 app-shells/bash/files/bash-3.0-strnlen.patch   | 175 -
 app-shells/bash/files/bash-3.0-subshell.patch  |  39 ---
 .../bash/files/bash-3.0-trap-fg-signals.patch  |  23 --
 app-shells/bash/files/bash-3.0-ulimit.patch| 186 --
 .../bash/files/bash-3.0-volatile-command.patch |  16 --
 .../files/bash-3.1-dev-fd-buffer-overflow.patch|  16 --
 .../bash/files/bash-3.1-dev-fd-test-as-user.patch  |  14 -
 .../bash/files/bash-3.1-fix-dash-login-shell.patch |  52 
 app-shells/bash/files/bash-3.1-protos.patch|  67 -
 app-shells/bash/files/bash-3.1-ulimit.patch| 122 -
 .../bash/files/bash-3.2-dev-fd-test-as-user.patch  |  26 --
 .../bash/files/bash-3.2-ldflags-for-build.patch|  37 ---
 app-shells/bash/files/bash-3.2-loadables.patch | 239 --
 app-shells/bash/files/bash-3.2-process-subst.patch |  12 -
 app-shells/bash/files/bash-3.2-protos.patch|  57 -
 .../bash/files/bash-3.2-session-leader.patch   |  65 -
 app-shells/bash/files/bash-3.2-ulimit.patch|  13 -
 app-shells/bash/files/bash-4.0-configure.patch |  25 --
 .../bash/files/bash-4.0-ldflags-for-build.patch|  15 --
 .../bash/files/bash-4.0-negative-return.patch  |  33 ---
 .../bash/files/bash-4.0-parallel-build.patch   |  65 -
 app-shells/bash/files/bash-4.1-fbsd-eaccess.patch  |  29 ---
 .../bash/files/bash-4.1-parallel-build.patch   |  23 --
 .../files/bash-4.2-dev-fd-buffer-overflow.patch|  46 
 .../bash/files/bash-4.2-execute-job-control.patch  |  24 --
 app-shells/bash/files/bash-4.2-no-readline.patch   |  19 --
 .../bash/files/bash-4.2-parallel-build.patch   | 106 
 app-shells/bash/files/bash-4.2-read-retry.patch|  41 ---
 .../bash/files/bash-4.2-speed-up-read-N.patch  | 112 
 app-shells/bash/files/bash-4.3-arrayfunc.patch |  15 --
 3-mapfile-improper-array-name-validation.patch |  13 -
 app-shells/bash/files/bash-4.3-protos.patch|  10 -
 app-shells/bash/files/bash-4.4-jobs_overflow.patch |  14 -
 .../bash/files/bash-4.4-popd-offset-overflow.patch |  30 ---
 .../bash/files/bash-4.4-set-SHOBJ_STATUS.patch |  14 -
 .../bash/files/bash-4.x-deferred-heredocs.patch|  47 
 

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Sam James]

commit: 9024cb1d6d422d54462576a9a12f82b17fdbd070
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 07:43:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 07:44:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9024cb1d

app-shells/bash-completion: add Python 3.10

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +-
 app-shells/bash-completion/bash-completion-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 4c55e7352304..77dfb81a73bd 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 2f4caf5b89e1..05fd91a33670 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools git-r3 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Mike Gilbert]

commit: 5032feb8d914d7c277154aa74d7e04414999e428
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 23 15:14:25 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 23 15:14:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5032feb8

app-shells/bash-completion: addpredict ~ for tests

Closes: https://bugs.gentoo.org/839840
Signed-off-by: Mike Gilbert  gentoo.org>

 app-shells/bash-completion/bash-completion-2.11.ebuild | 7 +--
 app-shells/bash-completion/bash-completion-.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild 
b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 36c924cea3a5..4c55e7352304 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,10 @@ src_prepare() {
 
 src_test() {
# portage's HOME override breaks tests
-   emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
+   local myhome=$(unset HOME; echo ~)
+   local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+   addpredict "${myhome}"
+   emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
 }
 
 src_install() {

diff --git a/app-shells/bash-completion/bash-completion-.ebuild 
b/app-shells/bash-completion/bash-completion-.ebuild
index 70ce84b4ed82..2f4caf5b89e1 100644
--- a/app-shells/bash-completion/bash-completion-.ebuild
+++ b/app-shells/bash-completion/bash-completion-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -99,7 +99,10 @@ src_prepare() {
 
 src_test() {
# portage's HOME override breaks tests
-   emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
+   local myhome=$(unset HOME; echo ~)
+   local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+   addpredict "${myhome}"
+   emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 41ad895a74b26c6f24b209990b549778a018a793
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 19 19:05:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 19 19:05:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ad895a

app-shells/bash: add note re readline for testing versions

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_beta.ebuild | 3 ++-
 app-shells/bash/bash-.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-shells/bash/bash-5.2_beta.ebuild 
b/app-shells/bash/bash-5.2_beta.ebuild
index c93d31e357b8..851264513714 100644
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ b/app-shells/bash/bash-5.2_beta.ebuild
@@ -40,7 +40,8 @@ patches() {
 }
 
 # The version of readline this bash normally ships with.
-READLINE_VER="8.2_beta"
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;

diff --git a/app-shells/bash/bash-.ebuild b/app-shells/bash/bash-.ebuild
index c93d31e357b8..851264513714 100644
--- a/app-shells/bash/bash-.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -40,7 +40,8 @@ patches() {
 }
 
 # The version of readline this bash normally ships with.
-READLINE_VER="8.2_beta"
+# Note: right now, we don't use the system copy of readline for bash for 
non-releases.
+READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: 74cb61be3fbf283a61a4d1bbd8467af4609ae1e0
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 19 19:04:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 19 19:04:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74cb61be

app-shells/bash: sync 5.2_beta w/ live

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_beta.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-shells/bash/bash-5.2_beta.ebuild 
b/app-shells/bash/bash-5.2_beta.ebuild
index c5b8657f7f0d..c93d31e357b8 100644
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ b/app-shells/bash/bash-5.2_beta.ebuild
@@ -5,8 +5,6 @@ EAPI=7
 
 # TODO on release:
 # - check READLINE_VER, obviously
-# - remove autotools/eautoreconf from readline ebuild
-# - tidy up is_release check in this ebuild for using system readline
 # (presumably there weren't always readline releases for bash RCs etc)
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
@@ -20,8 +18,8 @@ MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 is_release() {
case ${PV} in
-   |*_alpha*|*_beta*|*_rc*) return 1 ;;
-   *) return 0 ;;
+   |*_alpha*|*_beta*|*_rc*) return 1 ;;
+   *) return 0 ;;
esac
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
@@ -48,6 +46,7 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
 if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
inherit git-r3
 elif is_release ; then
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"

[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit: c6541a10d387eeb502fc2c9a05c21db8b50c4e02
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 19 18:48:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 19 18:58:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6541a10

app-shells/bash: add 

Signed-off-by: Sam James  gentoo.org>

 app-shells/bash/bash-5.2_beta.ebuild   | 21 ++---
 .../{bash-5.2_beta.ebuild => bash-.ebuild} | 26 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app-shells/bash/bash-5.2_beta.ebuild 
b/app-shells/bash/bash-5.2_beta.ebuild
index 9c0db54a6049..c5b8657f7f0d 100644
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ b/app-shells/bash/bash-5.2_beta.ebuild
@@ -20,7 +20,7 @@ MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 is_release() {
case ${PV} in
-   *_alpha*|*_beta*|*_rc*) return 1 ;;
+   |*_alpha*|*_beta*|*_rc*) return 1 ;;
*) return 0 ;;
esac
 }
@@ -46,7 +46,10 @@ READLINE_VER="8.2_beta"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
-if is_release ; then
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   inherit git-r3
+elif is_release ; then
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
 else
@@ -56,7 +59,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
@@ -95,9 +98,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-   verify-sig_src_unpack
-
-   unpack ${MY_P}.tar.gz
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   else
+   verify-sig_src_unpack
+   unpack ${MY_P}.tar.gz
+   fi
 }
 
 src_prepare() {
@@ -167,8 +173,7 @@ src_configure() {
# is at least what's in the DEPEND up above.
export ac_cv_rl_version=${READLINE_VER%%_*}
 
-   # TODO: Clean this up before 5.2 release
-   if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] || 
is_release ; then
+   if is_release ; then
# Use system readline only with released versions.
myconf+=( --with-installed-readline=. )
fi

diff --git a/app-shells/bash/bash-5.2_beta.ebuild 
b/app-shells/bash/bash-.ebuild
similarity index 94%
copy from app-shells/bash/bash-5.2_beta.ebuild
copy to app-shells/bash/bash-.ebuild
index 9c0db54a6049..c93d31e357b8 100644
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ b/app-shells/bash/bash-.ebuild
@@ -5,8 +5,6 @@ EAPI=7
 
 # TODO on release:
 # - check READLINE_VER, obviously
-# - remove autotools/eautoreconf from readline ebuild
-# - tidy up is_release check in this ebuild for using system readline
 # (presumably there weren't always readline releases for bash RCs etc)
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
@@ -20,8 +18,8 @@ MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 is_release() {
case ${PV} in
-   *_alpha*|*_beta*|*_rc*) return 1 ;;
-   *) return 0 ;;
+   |*_alpha*|*_beta*|*_rc*) return 1 ;;
+   *) return 0 ;;
esac
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
@@ -46,7 +44,11 @@ READLINE_VER="8.2_beta"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html;
-if is_release ; then
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git;
+   EGIT_BRANCH=devel
+   inherit git-r3
+elif is_release ; then
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
 else
@@ -56,7 +58,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
@@ -95,9 +97,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-   verify-sig_src_unpack
-
-   unpack ${MY_P}.tar.gz
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   else
+   verify-sig_src_unpack
+   unpack ${MY_P}.tar.gz
+   fi
 }
 
 src_prepare() {
@@ -167,8 +172,7 @@ src_configure() {
# is at least what's in the DEPEND up above.