From 1462de4f2a522ea97d4e4427c090f9bb6ffc243b Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 24 Feb 2015 20:58:48 +0000 Subject: Do window title setup through PS1 #223641 by michael@smith-li.com. Add history -a to PROMPT_COMMAND #517342 by Paweł Hajdan, Jr.. Add fix from upstream for variable declare weirdness. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- app-shells/bash/ChangeLog | 10 +- app-shells/bash/Manifest | 31 +-- app-shells/bash/bash-4.3_p33-r2.ebuild | 250 +++++++++++++++++++++ .../bash/files/bash-4.3-declare-visibility.patch | 60 +++++ app-shells/bash/files/bashrc-r2 | 105 +++++++++ 5 files changed, 441 insertions(+), 15 deletions(-) create mode 100644 app-shells/bash/bash-4.3_p33-r2.ebuild create mode 100644 app-shells/bash/files/bash-4.3-declare-visibility.patch create mode 100644 app-shells/bash/files/bashrc-r2 (limited to 'app-shells') diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 5512fb582ca5..95607d0c94be 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-shells/bash # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.428 2015/01/21 11:54:51 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.429 2015/02/24 20:58:46 vapier Exp $ + +*bash-4.3_p33-r2 (24 Feb 2015) + + 24 Feb 2015; Mike Frysinger <vapier@gentoo.org> +bash-4.3_p33-r2.ebuild, + +files/bash-4.3-declare-visibility.patch, +files/bashrc-r2: + Do window title setup through PS1 #223641 by michael@smith-li.com. Add + history -a to PROMPT_COMMAND #517342 by Paweł Hajdan, Jr.. Add fix from + upstream for variable declare weirdness. *bash-4.3_p33-r1 (21 Jan 2015) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index c21d1fd9cb3d..aae6b367b623 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -55,12 +55,14 @@ AUX bash-4.2-speed-up-read-N.patch 2858 SHA256 8547d32535ed4e2fe5cb7b3503e6044c3 AUX bash-4.3-append-process-segfault.patch 675 SHA256 cadbc77924ce5e2ba3984263f1e5d5c877214f4b78bd7597c637aec059ee9592 SHA512 2c243f7ca4f689decb0171ae2f5b5babf6b37f8f0988ecfbcb952a8df22dde9a543719d48b64ce45d2308340e9c601c9bd2f14f3f11bd9b9374c0f6fccaf0c7a WHIRLPOOL e614268546796cafd1acc076c3b1212b3f047b809d62480392b0e41283be8decbf32f5db96f4b62fe8d21a61aa95b16b39b93be41e946311490ba198a222feb6 AUX bash-4.3-arrayfunc.patch 439 SHA256 9407d53d357166464c7c4e3341a72027faba295f416e73f7b5919e10ea15577a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867 WHIRLPOOL 038eb157225aadf2c7d57aa63b1ca7871986ceea982ae91d319b55551377e79b6023a1844c752586083056ae377813366f032e8c51df0f42e35bef0c037ed803 AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3d672cc2df734709b22a6d92d7 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286 WHIRLPOOL 066fbb358f4fb9e32a58b4c4edd10d9c47c50f6aa202e0197c6b6d86a0836d48677561b834e5642b9052e64077efe240cb27144e5032c3e5f4bd9cb62201736e +AUX bash-4.3-declare-visibility.patch 1332 SHA256 9a8d04e689944f11d0328635885ae36044cf35e94c77b9b49aa67b9839209154 SHA512 4fcfacafab04abc00f02bcaf372a08fb795cae008ac7982364aff923cd347a2ea2e4362fc4f080e81a6046087316a969a8f5cbac3acb01129969af7939a16083 WHIRLPOOL 0bdb8a7e3cb38ebe6f4cd201fd622a155d02a2d682afb2e56edcaef2e595b45ff72811bc6023f50b5e79686b1adbfa2f648af6d672d1334b881bd6ace8ecde22 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda AUX bash-4.3-parse-time-keyword.patch 790 SHA256 44c83641d4f8e7357b0b63b1a5095e751643c30f84fdf5dbc868c9d4a200c15d SHA512 070ab4a46adec60434ef45e04ca0d453fd02c40da8db7051800160c8fa8d3846a6e6bf57db02c583fd699eab69fa03b268107dc58e3332d2f7ed66f00432d6cd WHIRLPOOL ab37acf37bf497bc7c041f341b44dbd755d6e0170d8b74436d79aa63aac1c3cf35c13bd0c56a4eae071639bac27ea81a194c691c42fd4089de8df859745caf5c AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b AUX bashrc 2879 SHA256 72a0b0bf010e72667c229475961f56b3684e02bcf1ccb22da63564ea16c08b54 SHA512 cb89537d4f7bc03c0e05d339f0c6c63cbd61f7963d97d0af13fe3cc2e9ac74755573d8acb28f3c6133a7cbd8f9f6c6c745e0bc215702456b2892a9438876c8a2 WHIRLPOOL 2e6ca7bcb3c2fe0923320f43094f6a11729c128a2f78ba2d51adbb07eb477d3e0573a2af844939fbc8dc1aba52eaf9dce043592a8ceb893148ec855a852e7674 AUX bashrc-r1 2958 SHA256 e6ec6cc13a317b3262f17ae438052c7e8c193e13a5f5d7884007f0d6ec7bf386 SHA512 0180c09f17821ed7f6d0a9418163379c08793dd8b9a3818e03d1625e1ba4197f861b2bff3aeaaf8453203c10b685d1ee98d42e0212471f4bf9c028e7ab894976 WHIRLPOOL 520a15121fedf854c69f56510e7c54eb134069244fcc371a942425bffe41321265ffca99b8540617cca4f2d77b8d328c7f06fed4ab2d90c54970224f9697c50a +AUX bashrc-r2 3358 SHA256 02c67d0e671e7d0dd80dfcdb1657d6b079d78a6bedc7c4fdc471e5bcd4be2fb5 SHA512 9837941eda43b64d23e44b76a5fc20a1e3d41d2b53cbf72e026918e0dc9c7ae886b64883e6fb3b4084639f6b0cc54d638e7f33b313f6db7192be613cc1c82729 WHIRLPOOL d7aefe4039cde103dddbb1cbd4b22b3dea759bfd36a580715762badacf6595318a750cb6ab7f822c833feafa48f7154379dd3fda6d6535eae1df2c466eff4265 AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf AUX dot-bash_profile 193 SHA256 ae12206aaa35dc96273ed421f4e85ca26a1707455e3cc9f054c7f5e2e9c53df6 SHA512 064227bb7658f5ac0aaddd7ddda39daa0ffa924601445afa61c02aa19a990a5def377b125111e4817bf80ed80d33e1c111ee13034958b5de1ff8e50c093359a2 WHIRLPOOL cde8efc527122adbfa90d60a79fbdffd953c5573c5c6c5d499e56093517ceb7b48d9cfadd10b7c1d161b6d7f84276403fc233fca2d6798bcff2d0d052023672b AUX dot-bashrc 551 SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b WHIRLPOOL 27c53e3f59bd89d5517b5b22bcf04a9adddee0492c52d34d26a707062fb4c4fa853cdf2726d6ec2621a08f24c32a53651ce5693b6de1be764de3e088eb9f7ee6 @@ -342,23 +344,24 @@ EBUILD bash-4.0_p44.ebuild 4465 SHA256 27dbd1c269c97b40cd829cfc3e9050acbfe5960c1 EBUILD bash-4.1_p17.ebuild 4200 SHA256 51ef8ecaf92d851c4949c91456a5c0325a328ca3b32afcb2f42a09fde87a025e SHA512 2f55461af1796f5c4dd759b46b9d42cf8cda8fb3d912887460e2d4d36198dd58fbd04b6b60aefc25970442607012bbfa972a43911bba938ef7806e4ce93fc708 WHIRLPOOL 51af146187f894f65f68d8de3e9dd03970817bafe5fa4f9d4efed7da81024af19ff1e78717f7a144091955613818385ee08ed0a5c7e8bbacd523788edbeacd50 EBUILD bash-4.2_p53.ebuild 6629 SHA256 c6f50d54aebaede7c66c5090b4bd5d8b7ebb8e5a1064dfbd34d0d8b3cc00ccd5 SHA512 87a7b0b0afc63bb7bc60bf1a594368df6db7f0c5451ca9c04e558da5e4d28e673afbbb2186026d51e671ff958a421731af141a75f18a8714067df5eced79b716 WHIRLPOOL b8e488e8bbba07cf0de70720d0d0186eb133fe3ee1325901000cf7900aa8d0531b466cfb4d4c76789d1ee8156c0b14be6e4c60534e435303a361569416809602 EBUILD bash-4.3_p33-r1.ebuild 7286 SHA256 dbeb216603a012f6b95fbea1092143c58687810aab66fff85e0bd61187f34608 SHA512 2767b5d63ba637f45a89c4308f65e45ab8c15e8ab922608b93f8bc5d6685d584eff13a3462ef05ce28620653701af5130df8368f81cb4f6d86277a54d49d92bc WHIRLPOOL cd912f960d5c80a1a762ef1fa8b09b242b65da9d92558c87807ab0a9936fc4bd790e22858eb26e4f0019d578747f263fa16e255017323cd377e5cf62f3a9b0b9 +EBUILD bash-4.3_p33-r2.ebuild 7337 SHA256 4fdf9cf5b46741b41823653df3c6acc71243cf74da1149ed2331878e301ac0be SHA512 6955a7e402bb848a26637e6579c2a180ffa44189bf69138b0e0efd153d829439069415e01bd7e10782333b95f281e3ba2dd8d53e2ca4ed491acde2939399aac8 WHIRLPOOL 15af65175eb5bcc9622a9d5641687f704b195e5ceda4018baf693c84d42804d5f17e027766d8ef2a9d14e07a6eb6725d1a44ea4347fda16620d1a4ba0c0c8e81 EBUILD bash-4.3_p33.ebuild 7152 SHA256 4144c3a9c6ada95ede64af25633bd697aaf52701e887dc2a7361d2b02e840b8e SHA512 09d9844e29c195bc56649f75910118eec36eadd3e032d54893c0586066acfcc33436f81c9140f9ccb902b18f9fc594d4a3857d89093562d82c578a2a2bdeb9b3 WHIRLPOOL c193bcfff32b370aeeb4a8c87c28beb829d30001b0b534e49570b95f9f6181b1cd48f6f544b99dc4e6a0eee2de16156304057e72369de7372f679a68fcbd17e2 -MISC ChangeLog 73163 SHA256 746e3d96960872749cd105cd3bd1769dfee4a7d2ceb9b265708d1462e12f180b SHA512 5645d1fb4a920de8aae686714959d920dbf311133ec9a149f6c8d47a1512d12825b5e04342ba8175b09a1d1fbddf4b7525ed5bf364e2c739b6bed9ff32f48d4f WHIRLPOOL 03ae7abf58bf190b5fa0250ba4a2b3c9bbe373fd7ea4f408fd8e70ffa16adb61cb710fe02925f288c8467d6baf8227ada7d6a440a9c47c74466df0bfc4f8fddd +MISC ChangeLog 73519 SHA256 a71a9a923c9da1a39774e989941671e46b8fb27cebf9b789958649046654a736 SHA512 fa390d80c0c305df86b588b96167dabbf41804b7300f43de3e7f5f5d82fcac7aa823fba07065d0c7bd95a276a7628f4d48a479db61727b72cdea559adbbac3cf WHIRLPOOL 1f3cee356b639c6d1611b7d2a4c5df59ad773557e622fff60483d00bce24d9ae441adf04973a974bca2c86f7b209656c927a9375863f929e06ad5c60aab89bb7 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUv5OMAAoJEPiazRVxLXTF0eEQAIr3evivXnVnpPL62wLFVK9q -+/xiWiFRSm8m5BQnABEntInDYiKmpzKi8WymrZd8iSIQliq2xOxDd7gVKo5G+bAa -3iusmMmaejmh38c8lVp/xpefbhNriop8oR3PV7ncFQ6/UsuueAG0Fcs4dI/rj44V -zv7t5ESPPgn5/piUIqPYgISNm2oo1FWBdFjjtQpxNOtOgtzxQmatGMP3usEn/0nY -Bmwgs7pa7hOcHgpF54xMFBUmiU64gfwZjORs3z34/AZvp2N3rbrDLWcYGZ7fFBOh -tTDiN5Fdsk/gmcrvh+dYqp4hJ2F2G+M+WdU52l3Jlwy73VWqFUIvV7HLqWfjkLwu -YM05OodnTp6fnfajKfDdc2cMaEzJtwVJXJqxbU29q93wIBYPljKr8j/J7Cm/l6fP -1eaziIF0kc7zw30n2pwX/4w3QRImzRMzeLlcJ0uyp26DAgq6vOwqthOSduo0oZSA -AF34kQPg5jZ4WtktU8HQLpU/TNxZAc5eXtrP2yrNFuS6q1/Zvij15Tng2/68jsF7 -nUonQmrnpxXCF/nVyRi3PC1/1SqhkCuIjCNnJHSj9ggs6hJJcMWR1CeZt4Ht15AR -8qjxZchN2z2lteH2E7jBzd+4Ap9UJovicIh5Is4bMBL5fn7U5+ylEi0wN+Zgef4x -SwEkw4SNyp2NGAxl64ej -=jPc7 +iQIcBAEBCAAGBQJU7OYIAAoJEPGu1DbS6WIATacP+wRJdt4UQ8WgywpEl/2pPySp +xbwnJODHIuqxDeQYIxW3p4SRfMCIgXK2D0MRPwP8Eyz2NP95yjKrmv9Df1sYedu0 +aUG6qFJI7yn13NKt1RLracaPWHTR3QnaepnpaTPLMNmmjB30vnJ+OHoOMZbja7Hw +oLFx7z17Wpx/WMwRe6LzVPk77kKh56+hmK/gFYphviG7skUczCuUxS3eLLD+vBAj +/19sE+tMgzv3RoMP5a/WtNODYmBwlMiYbvuLzP4ubI86GPdsujRK9A0hZv2Wjoi2 +HdQgR9XdIr09dv2xTwuQgJwG1s7lYQnTIOPPtBGYLtD66Ag+Og1Ep+tPoHUY5JTo +QR9fcV1E0aEPtXbCWGovy2pHyyAFJu8ANq9G/mxVgElpHjgoNLsQUiLpV4oiyZOb +IE0X5r+CEykKPQGtnSHwhlPKGkSJ2YpzupxwZlGvyJcTBjCRI8Y846/L2EwZPOqk +YELzLcrqvyTOODoG2u8atgUZX078Zt0GLVVq1PGMh79bvyeeyzMJUu5+G+mu6a0/ +YB9qIC6hO37458+zjAu6fmQClBrSy9VtjtNTbX9GV0czZVASkAX0ggB5VnvJQ/bf +yW2WZygkXTjcmNxzsIeg5hRXaz2bpJxpPaap9sdLQWC7cgY308hflb43B1qKNSV6 +P1f0KTegICAwnPJgK/VV +=ZhNG -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.3_p33-r2.ebuild b/app-shells/bash/bash-4.3_p33-r2.ebuild new file mode 100644 index 000000000000..ac1b8d186c2d --- /dev/null +++ b/app-shells/bash/bash-4.3_p33-r2.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p33-r2.ebuild,v 1.1 2015/02/24 20:58:46 vapier Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs multilib + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} +MY_P=${PN}-${MY_PV} +[[ ${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="6.3" + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" +[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-${READLINE_VER} ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + !<sys-apps/portage-2.1.6.7_p1 + !<sys-apps/paludis-0.26.0_alpha5" +# we only need yacc when the .y files get patched (bash42-005) +DEPEND+=" virtual/yacc" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if is-flag -malign-double ; then #7332 + 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 ]] && epatch $(patches -s) + + # Clean out local libs so we know we use system ones w/releases. + if [[ ${PV} != *_rc* ]] ; then + rm -rf lib/{readline,termcap}/* + touch lib/{readline,termcap}/Makefile.in # for config.status + sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + fi + + # Avoid regenerating docs after patches #407985 + sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die + touch -r . doc/* + + epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch + epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch + epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch + epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch + epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch + epatch "${FILESDIR}"/${PN}-4.3-declare-visibility.patch + + epatch_user +} + +src_configure() { + local myconf=() + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ + -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ + -DSYS_BASH_LOGOUT=\'\"/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} + + # 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 :(. + + if [[ ${PV} != *_rc* ]] ; then + # Use system readline only with released versions. + myconf+=( --with-installed-readline=. ) + fi + + if use plugins; then + append-ldflags -Wl,-rpath,/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 + tc-export AR #444070 + econf \ + --docdir='$(datarootdir)'/doc/${PF} \ + --htmldir='$(docdir)/html' \ + --with-curses \ + $(use_with afs) \ + $(use_enable net net-redirections) \ + --disable-profiling \ + $(use_enable mem-scramble) \ + $(use_with mem-scramble bash-malloc) \ + $(use_enable readline) \ + $(use_enable readline history) \ + $(use_enable readline bang-history) \ + "${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 + newins "${FILESDIR}"/bashrc-r2 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 + sed_args+=( #432338 + -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} + insinto /usr/share/doc/${PF}/${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + doins ${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 + + if [[ -L ${EROOT}/bin/sh ]] ; then + # rewrite the symlink to ensure that its mtime changes. having /bin/sh + # missing even temporarily causes a fatal error with paludis. + local target=$(readlink "${EROOT}"/bin/sh) + local tmp=$(emktemp "${EROOT}"/bin) + ln -sf "${target}" "${tmp}" + mv -f "${tmp}" "${EROOT}"/bin/sh + 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/files/bash-4.3-declare-visibility.patch b/app-shells/bash/files/bash-4.3-declare-visibility.patch new file mode 100644 index 000000000000..034315570632 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-declare-visibility.patch @@ -0,0 +1,60 @@ +http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00075.html + +assign_array_var_from_word_list: after assignment, mark variable as no +longer invisible + +assign_array_var_from_string: after assignment, mark variable as no +longer invisible + +diff --git a/arrayfunc.c b/arrayfunc.c +index c2ea0e5..6dab71c 100644 +--- a/arrayfunc.c ++++ b/arrayfunc.c +@@ -407,6 +407,9 @@ assign_array_var_from_word_list (var, list, flags) + (*var->assign_func) (var, l->word->word, i, 0); + else + array_insert (a, i, l->word->word); ++ ++ VUNSETATTR (var, att_invisible); /* no longer invisible */ ++ + return var; + } + +@@ -639,6 +642,10 @@ assign_array_var_from_string (var, value, flags) + + if (nlist) + dispose_words (nlist); ++ ++ if (var) ++ VUNSETATTR (var, att_invisible); /* no longer invisible */ ++ + return (var); + } + + +bind_int_variable: make sure `v' is non-null before making it visible + +diff --git a/variables.c b/variables.c +index 2f07ebb..cbe7806 100644 +--- a/variables.c ++++ b/variables.c +@@ -2872,10 +2872,12 @@ bind_int_variable (lhs, rhs) + #endif + v = bind_variable (lhs, rhs, 0); + +- if (v && isint) +- VSETATTR (v, att_integer); +- +- VUNSETATTR (v, att_invisible); ++ if (v) ++ { ++ if (isint) ++ VSETATTR (v, att_integer); ++ VUNSETATTR (v, att_invisible); ++ } + + return (v); + } +-- +2.3.0 + diff --git a/app-shells/bash/files/bashrc-r2 b/app-shells/bash/files/bashrc-r2 new file mode 100644 index 000000000000..6622b84eb71d --- /dev/null +++ b/app-shells/bash/files/bashrc-r2 @@ -0,0 +1,105 @@ +# /etc/bash/bashrc +# +# 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 ! + + +# 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. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + +# Bash won't get SIGWINCH if another process is in the foreground. +# Enable checkwinsize so that bash will check the terminal size when +# it regains control. #65623 +# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) +shopt -s checkwinsize + +# Disable completion when the input buffer is empty. i.e. Hitting tab +# and waiting a long time for bash to expand all of $PATH. +shopt -s no_empty_cmd_completion + +# Enable history appending instead of overwriting when exiting. #139609 +shopt -s histappend + +# Save each command to the history file as it's executed. #517342 +# This does mean sessions get interleaved when reading later on, but this +# way the history is always up to date. History is not synced across live +# sessions though; that is what `history -n` does. +PROMPT_COMMAND='history -a' + +# Change the window title of X terminals +case ${TERM} in + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) + PS1='\[\033]0;\u@\h:\w\007\]' + ;; + screen*) + PS1='\[\033k\u@\h:\w\033\\\]' + ;; + *) + unset PS1 + ;; +esac + +use_color=false +#BSD#@# BSD doesn't typically come with dircolors so we need +#BSD#@# to hardcode some terminals in here. +#BSD#@case ${TERM} in +#BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;; +#BSD#@esac + +# Set colorful PS1 only on colorful terminals. +# dircolors --print-database uses its own built-in database +# instead of using /etc/DIR_COLORS. Try to use the external file +# first to take advantage of user additions. Use internal bash +# globbing instead of external grep binary. +safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM +match_lhs="" +[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" +[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)" +[[ -z ${match_lhs} ]] \ + && type -P dircolors >/dev/null \ + && match_lhs=$(dircolors --print-database) +[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true + +if ${use_color} ; then + # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 + if type -P dircolors >/dev/null ; then + if [[ -f ~/.dir_colors ]] ; then + eval $(dircolors -b ~/.dir_colors) + elif [[ -f /etc/DIR_COLORS ]] ; then + eval $(dircolors -b /etc/DIR_COLORS) + fi + fi + + if [[ ${EUID} == 0 ]] ; then + PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' + else + PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' + fi + + #BSD#@export CLICOLOR=1 + #GNU#@alias ls='ls --color=auto' + alias grep='grep --colour=auto' + alias egrep='egrep --colour=auto' + alias fgrep='fgrep --colour=auto' +else + if [[ ${EUID} == 0 ]] ; then + # show root@ when we don't have colors + PS1+='\u@\h \W \$ ' + else + PS1+='\u@\h \w \$ ' + fi +fi + +for sh in /etc/bash/bashrc.d/* ; do + [[ -r ${sh} ]] && source "${sh}" +done + +# Try to keep environment pollution down, EPA loves us. +unset use_color safe_term match_lhs sh -- cgit v1.2.3-65-gdbad