From 9e944332c838367637c3da80893d9d28461009f8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH] app-shells/bash: Sync with Gentoo It's from Gentoo commit d9278cc22a2e84f19bb758b569870470c69562e2. --- .../app-shells/bash/bash-4.4_p23-r2.ebuild | 2 +- ...-5.0_p18.ebuild => bash-5.0_p18-r1.ebuild} | 4 +-- ...1_p16-r2.ebuild => bash-5.1_p16-r4.ebuild} | 26 ++++++++------ ...1_p16-r3.ebuild => bash-5.1_p16-r5.ebuild} | 26 ++++++++------ ...2_p15-r2.ebuild => bash-5.2_p15-r3.ebuild} | 30 ++++++++++------ .../app-shells/bash/bash-9999.ebuild | 36 ++++++++++++------- 6 files changed, 78 insertions(+), 46 deletions(-) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.0_p18.ebuild => bash-5.0_p18-r1.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.1_p16-r2.ebuild => bash-5.1_p16-r4.ebuild} (91%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.1_p16-r3.ebuild => bash-5.1_p16-r5.ebuild} (91%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.2_p15-r2.ebuild => bash-5.2_p15-r3.ebuild} (91%) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild index d560deaae1..47f6a05f86 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild @@ -54,7 +54,7 @@ fi LICENSE="GPL-3" SLOT="${MY_PV}" -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild index 23ec36757d..8634159cb1 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild @@ -54,7 +54,7 @@ fi LICENSE="GPL-3" SLOT="0" -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -218,7 +218,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r4.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r4.ebuild index a9b7b120cc..25028ea0a9 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/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 )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + # 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_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" @@ -73,7 +79,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 ~arm64-macos ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -250,7 +256,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r5.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r5.ebuild index 9ff113498a..230aaaf033 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/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 )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + # 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_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" @@ -73,7 +79,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 ~arm64-macos ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -252,7 +258,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild index 6d741db845..4d0dbeb387 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild @@ -53,17 +53,24 @@ elif is_release ; then 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 + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + 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_pn patch_url my_patch_index + 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" @@ -77,7 +84,7 @@ 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 ~arm64-macos ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" @@ -165,6 +172,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 } @@ -292,7 +302,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild index 7d9c7837f3..af8066bbfd 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.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" @@ -53,17 +53,24 @@ elif is_release ; then 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 + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + 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_pn patch_url my_patch_index + 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" @@ -77,7 +84,7 @@ 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 ~arm64-macos ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" @@ -92,8 +99,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 +113,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 +170,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 } @@ -290,7 +300,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' )