From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-shells/bash/Manifest | 7 +- app-shells/bash/bash-5.1_p12.ebuild | 265 ++++++++++++++++++++++++++++++++++++ app-shells/bash/bash-5.1_p8.ebuild | 2 +- 3 files changed, 272 insertions(+), 2 deletions(-) create mode 100644 app-shells/bash/bash-5.1_p12.ebuild (limited to 'app-shells/bash') diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 299487e7dc09..5765d3fa1735 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -401,6 +401,10 @@ DIST bash51-005 2577 BLAKE2B 573dafdff4a0d11cf6c458d6a3c9087b728542000fce5e16266 DIST bash51-006 1412 BLAKE2B 3b32c69cef9438f66afaad0279627567d6aac32fabbec5af899552427489f2a87b148a3886bc30139647ec4204241c2e77cad83cdae1251176b7ec54699e1445 SHA512 b9b6e3d71f7b7718e2e8598ec8e337dcc675571fb233c29e5230ebf14eab2249204531f2fe8c4d1459c5fed10acb679048588d1e457e98dbc00ffc4d2cd227e3 DIST bash51-007 2621 BLAKE2B f2802bc7267efe69abecb5c4d0cf5879bb57219e9e972d4c74f86ca88f99ba4dd3d9314beaca9c426351ffe429ddb4a03615776f569bad9962df7c5094d52a28 SHA512 e4ebdc47e780ddc2588ecdfcfe00cb618039c7044e250ab2b836b0735c461ebacd15beaf2145e277c70b7f51cded55bd8dde7757df810f33f8dae306ee5ba571 DIST bash51-008 1821 BLAKE2B 9820066c99c8ed5f6322fceb2346f8900ac77b6c50c75de39c9ff7472c33f78b054f8bd0493ce7a4b8e17c70456d867aa6791e892246bce64624549a95c3211d SHA512 97f9558a08a66cc9da62c285bf9118b39328e25ed3b9277728e0539b1ac0adef176a090e39cd96dc03d6fd900d8155bd58040cb3390a09f637bab1de8af3faf6 +DIST bash51-009 1627 BLAKE2B 95e47909080c9c8d11f08db6a9fa764b1422f11a55183ee773837c79898db318d997ca6634cc7134245c88231b30245bd5dbd0e5be93528d89544afc1170da1f SHA512 2d3c65162ec4e5c3dfeb439891950ef2c43973a84122fcdf6b56c388466c7e671dbc9b236d2253f01411b668c365855263995dbacb8e6f9e9dbcb7e6c2cc518c +DIST bash51-010 1700 BLAKE2B d391ac7fa3124f001bb06f3020a531b786ce601e8756ac853872420b82a002cfe744f6ba3c0db869b24eb456bbf571fc5ef869a6e4dd4e1c2ffdc3055c67692b SHA512 aac4a0b72b559566334f1029c52754f4c98185af99e09436e401d83ab81bab7882d0d8050674b30f171733f3628157777a264566e927e93db2ea5a18d26630f1 +DIST bash51-011 2229 BLAKE2B d439ffeef6b42c90d3817d8800a9e842327facb87ad0921313ba8071ae6720a10a79f259b1c8373afba4c1d28b9c2257aa325a160dd9ce9df6c34d31cc33c1b4 SHA512 bb9e47a570bb9758c365831f9650b9379b60862b8cef572edc3cd833df96ebb8b9612de474bdc2a03ff4efc2275f871d55962295385e38f3658874488e974b81 +DIST bash51-012 6372 BLAKE2B e2a650ef81333eb4d257b97e63ed215e777f6960f31248930e8f34acdd5f1e8f9b79e636ecad3e14a4fa6b5d3227865e0757ff2b5d8f982eb589cdca753df393 SHA512 59819914b6821d9f4af0aade7b9b7ea92368c2b8eb8407cea11dfeee7208905dd06bdef7a049d7b1c4fac41c44d9a130b95a061957a9649050b37471b3044cf1 EBUILD bash-2.05b_p13.ebuild 4601 BLAKE2B dd5c081b218d969026ab192cb9f295b39830c164b2fc91d8bcd22143f917dfb9bc3a35a6de666563b1d83f658ba443ee58e818563554fe412272b6e4624a9a2b SHA512 65f3c824802a0b515d3e0834f5a5e3982074536389711fa68de71996cc5094284a5431b4d58d0c0758b634ac1f8d0c5dabf3768127cc1186241834af8d65d645 EBUILD bash-3.0_p22.ebuild 4673 BLAKE2B e5eeb7d1c397954a1167a42f2f882acc062cf9402b3db2f8210082dc66534f119e962b4b916fa05d6b98a1973daa9fc3bfc72d289ca9aa4028374afce3158bf1 SHA512 f7e3bb3a7945c6df97eda66577eb7bbec63f438376799feded831dc8d5494ddea4d0ef3d7808b8645920efd94fdee5e9a22d4b779bf223768a9cc99901759314 EBUILD bash-3.1_p23.ebuild 4416 BLAKE2B aad2ca16c61480523627b10111ead6e7cbb7bba83f315bc548e948767a343220375ff72b79c42a0f7891d22fb776bd0aeac2fd48ad1edb16e263aa1cadd12790 SHA512 06ddf406ed4dcf08462257c157449d016c8f64bb79d7bdf60dca7f5359987b3c3edc38f302db031b669eec493a6397e77d2362999a1529b6becd46be09f4b437 @@ -411,5 +415,6 @@ EBUILD bash-4.2_p53.ebuild 4345 BLAKE2B 4a872160fef38f2eb94a625060a637c2e66e01b8 EBUILD bash-4.3_p48-r2.ebuild 5624 BLAKE2B 4d4056a9a6ee1b0602f106caf0798820953f4d2d0e7bcf6f54923e1edebedb6ea24ccb3dcbb42b3229967e08e162fa89253ae2a03fd7cbe0829ac315616a1681 SHA512 c74853e84737bcc4fbf745e0c49d77d156e69106b2b66fd67885b16cfdb3e59ab84648b03cdf35274402d89a725b79f0da83fe4ab16f9c17a7938da45853692d EBUILD bash-4.4_p23-r2.ebuild 5709 BLAKE2B 533de68a81792479a0da8e18a7700d5b29f78370ebaaf582069cfc21177c4cf94754afa5328ec2ee4dbd3807db37cb5e01f40d28d10ffd71e3c62c8f81a62d2d SHA512 d8fe7e91ccf16f972a91263d485d299b5cf79f7676f18f6027d9f808961a3647e6db6b978c7617658b185cc89ebd70de7c25dba318a27ed21bb1310881da0a8c EBUILD bash-5.0_p18.ebuild 7009 BLAKE2B a89c8fe825839b3308a78ff398a6389c2e1586231eb99e7b25c61fdb4e12c2b4ba715ec6ef5e98e5423e7f5855de2472c6e69673a6886f22acd160f525b297e9 SHA512 8bee7a015cee324276d8a3d7814da8515540fd7d4a4d85ee63525628a2d21714a84f261694a2d45a11e494183e9ec467edf3173b6f9b22130ff959cea8131ee8 -EBUILD bash-5.1_p8.ebuild 7003 BLAKE2B 8cbd144d9f53b360ad296be4ce926e7b92aff8f168eabeb9d8721916e978c7436e3d4ebbaf19dae8582898d3a13f29059db8164364ec795eab5d3d4e23934e84 SHA512 7be24042c0322ecedfab3cf15fd381eec9fa5568111656faaa26532dda5fe4c0115249bb2327929e05772407d6e25ca89d496e5a5dc1ba0d373e4afe05c0e990 +EBUILD bash-5.1_p12.ebuild 7022 BLAKE2B ffb84641fde8da1d9a44f918f845f2623739b2fa5d72c0689da2f9da9ed3b850605af41c91c9c412df6e2d1592a2bd6454769759da157e212af2c49fee478f60 SHA512 f7770233eb94c63016d7afbb53612b3e2d688783327ab4c526d9d7360c3d270904ebca8ffc229bb86ad03f670a981290e7c804de29f49198a9fe3563cb51c397 +EBUILD bash-5.1_p8.ebuild 7003 BLAKE2B c6860995249381a11798527e00144a9efa812459cbf6bafa03719a490600cb1689ff13cbdba317076dd3dd89e9da8b19c93809bbeb55399208941b2395d85842 SHA512 4dbee0c26c0eef3456f6355bea6557f87a544742402b4d1d9ce1c1cdd45655c08a76dc31091a738a52d3f006f39fa6ee701e1a9eb62ee57871cab8f97ffea9c1 MISC metadata.xml 735 BLAKE2B fb066d2f79f6b109d949f711d97a1446d3399b16aa2ed6934ba953179d0f6239ce677f5d887e49d7f5a9cf0680f31b560437e9b4399209ba8a7d2e09f05d864d SHA512 91b1f9e7c6419c3a7165180140fbc9754686fcd31f726b52a990a4dcddd290b049f3b681242ddf06f8e6ce0b2fafb7915052fa55c5fe205488361aa61dbc3b57 diff --git a/app-shells/bash/bash-5.1_p12.ebuild b/app-shells/bash/bash-5.1_p12.ebuild new file mode 100644 index 000000000000..7d7bced3fec0 --- /dev/null +++ b/app-shells/bash/bash-5.1_p12.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs prefix + +# 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 ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do + printf "${u}/${pn}-${pv}-patches/%s " "$@" + done + fi +} + +# The version of readline this bash normally ships with. +READLINE_VER="8.1" + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" +if is_release ; then + SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" +else + SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" +fi + +LICENSE="GPL-3" +SLOT="0" +[[ "${PV}" == *_rc* ]] || \ +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" +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="virtual/yacc" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # 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() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) + + # Clean out local libs so we know we use system ones w/releases. + if is_release ; then + rm -rf lib/{readline,termcap}/* || die + touch lib/{readline,termcap}/Makefile.in || die # for config.status + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die + fi + + # Prefixify hardcoded path names. No-op for non-prefix. + hprefixify pathnames.h.in + + # Avoid regenerating docs after patches, bug #407985 + sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die + touch -r . doc/* || die + + eapply -p0 "${PATCHES[@]}" + eapply_user +} + +src_configure() { + local myconf=( + --disable-profiling + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses. For the most part, ncurses + # is here because readline needs it. But bash itself calls + # ncurses in one or two small places :(. + --with-curses + + $(use_enable mem-scramble) + $(use_enable net net-redirections) + $(use_enable readline) + $(use_enable readline bang-history) + $(use_enable readline history) + $(use_with afs) + $(use_with mem-scramble bash-malloc) + ) + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ + -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) + + # Don't even think about building this statically without + # reading bug #7714 first. If you still build it statically, + # don't come crying to us with bugs ;). + #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 + # Use system readline only with released versions. + myconf+=( --with-installed-readline=. ) + fi + + if use plugins ; then + append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash + else + # Disable the plugins logic by hand since bash doesn't + # provide a way of doing it. + export ac_cv_func_dl{close,open,sym}=no \ + ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no + + sed -i \ + -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ + configure || die + fi + + # bug #444070 + tc-export AR + + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use plugins ; then + emake -C examples/loadables all others + fi +} + +src_install() { + local d f + + default + + dodir /bin + mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die + dosym bash /bin/rbash + + insinto /etc/bash + doins "${FILESDIR}"/bash_logout + doins "$(prefixify_ro "${FILESDIR}"/bashrc)" + + keepdir /etc/bash/bashrc.d + + insinto /etc/skel + for f in bash{_logout,_profile,rc} ; do + newins "${FILESDIR}"/dot-${f} .${f} + done + + local sed_args=( + -e "s:#${USERLAND}#@::" + -e '/#@/d' + ) + + if ! use readline ; then + # bug #432338 + sed_args+=( + -e '/^shopt -s histappend/s:^:#:' + -e 's:use_color=true:use_color=false:' + ) + fi + + sed -i \ + "${sed_args[@]}" \ + "${ED}"/etc/skel/.bashrc \ + "${ED}"/etc/bash/bashrc || die + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') + + insinto /usr/include/bash-plugins + doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,startup-files} ; do + exeinto /usr/share/doc/${PF}/${d} + docinto ${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + dodoc ${f} + fi + done + done + fi + + doman doc/*.1 + newdoc CWRU/changelog ChangeLog + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then + mkdir -p "${EROOT}"/etc/bash + mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ + fi +} + +pkg_postinst() { + # If /bin/sh does not exist, provide it + if [[ ! -e ${EROOT}/bin/sh ]] ; then + ln -sf bash "${EROOT}"/bin/sh + fi +} diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild index 5f26b4a7e3ab..28c7c04fafe6 100644 --- a/app-shells/bash/bash-5.1_p8.ebuild +++ b/app-shells/bash/bash-5.1_p8.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit flag-o-matic toolchain-funcs prefix # Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/ +# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/ PLEVEL="${PV##*_p}" MY_PV="${PV/_p*}" MY_PV="${MY_PV/_/-}" -- cgit v1.2.3