diff options
author | 2015-01-21 11:54:53 +0000 | |
---|---|---|
committer | 2015-01-21 11:54:53 +0000 | |
commit | a296499a874c49a6851ccbe36fee03693bd74a44 (patch) | |
tree | 0191a2325278f5866b49537c720c0564c06ae443 /app-shells | |
parent | Added a fix from upstream (diff) | |
download | historical-a296499a874c49a6851ccbe36fee03693bd74a44.tar.gz historical-a296499a874c49a6851ccbe36fee03693bd74a44.tar.bz2 historical-a296499a874c49a6851ccbe36fee03693bd74a44.zip |
Added fixes from upstream. Removed old
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 11 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 34 | ||||
-rw-r--r-- | app-shells/bash/bash-4.3_p30.ebuild | 246 | ||||
-rw-r--r-- | app-shells/bash/bash-4.3_p33-r1.ebuild (renamed from app-shells/bash/bash-4.3_p30-r1.ebuild) | 7 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.3-arrayfunc.patch | 15 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch | 13 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.3-term-cleanup.patch | 47 |
7 files changed, 59 insertions, 314 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 25c27f0f331c..5512fb582ca5 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,15 @@ # 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.427 2015/01/01 07:27:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.428 2015/01/21 11:54:51 polynomial-c Exp $ + +*bash-4.3_p33-r1 (21 Jan 2015) + + 21 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p30.ebuild, + -bash-4.3_p30-r1.ebuild, +bash-4.3_p33-r1.ebuild, + +files/bash-4.3-arrayfunc.patch, + +files/bash-4.3-mapfile-improper-array-name-validation.patch, + -files/bash-4.3-term-cleanup.patch: + Added fixes from upstream. Removed old. *bash-4.3_p33 (01 Jan 2015) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 34de5ab8d258..c21d1fd9cb3d 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -53,9 +53,10 @@ AUX bash-4.2-parallel-build.patch 4448 SHA256 1c5f7fb5c324d6f2b786ad259cc35bfdd3 AUX bash-4.2-read-retry.patch 932 SHA256 37d60b456efd563960a9f1f3f40f0e7f6ef2f9aeb63d8dafabf13853f3d41987 SHA512 b8c9524a1385f8a66b964bc629ed62a1c825415e3388ac4204709440d3feedd5ffa92dd0fb54eab85283b0de49ce24a76836512b737612c0a4c45eb4ab40f8cb WHIRLPOOL b88a33ea5dd903f6049f79d96bd5975074e9b43bf21e5491cd8ccffc1649f4afcf48456b80bb99c3bc576c553c9bb99ca8ca831a85e936e82aef4aa39509a652 AUX bash-4.2-speed-up-read-N.patch 2858 SHA256 8547d32535ed4e2fe5cb7b3503e6044c3f5df3772079509bd02cec4177059dcf SHA512 6b7f611ac35746c5ce8caad49def25d060397d81844c0dda2ba7c73f4b0318a28b3fb89f356695c8a7799b70ab0591d9612619403b7d4ade8aba1e60a933fdae WHIRLPOOL da9647b199f090b358b8186187d9ceff6cc5dd7cb20885f7963c1a1b445bf833093c2db931763a9c05f2e4b87e9e1c201bd34a441c49a39703eca7f3c61b2d49 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-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.3-term-cleanup.patch 2152 SHA256 9f2d0faac988273dd1d838e8904325d524c996c1560e805c184c5387e31ed28d SHA512 3c13505e292532f10f4ac98ffd0044438b4d77f76d199018f1ff914ed1eb454c2ca12c6ef6996746c6300e37a78a4a0d111ac65f1c8d6897cfbc70bea457adf3 WHIRLPOOL 1db7ca7f51f3ed040a25f24d24221f024baf3a786dbb0477ba62e94f8c64b12d7266045df76ca316e63c0af62232cdd8b77028a86708fe4877b3ff52bec40fe3 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 @@ -340,25 +341,24 @@ EBUILD bash-3.2_p57.ebuild 4591 SHA256 bdb294f5741c71afa3543643a4a45110fb236b91a EBUILD bash-4.0_p44.ebuild 4465 SHA256 27dbd1c269c97b40cd829cfc3e9050acbfe5960c16f51739ea75421c4d9c1e3d SHA512 431771ab2d4d8f6281e65f7bdc91f14474244bd0bfbac4d200a89cef4b032a18df626ab85e19490ba47ae830a50b8d6621738cc06f299fd3f980727c797fbac2 WHIRLPOOL de45d0a3917de3e5879750a70a5be36351f21ace5086923ac36ff73b23fb34845fd577fb3b6e575a217eb30f7a6e2bdcfe9dd60df94752636baa852b2ed5bef9 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_p30-r1.ebuild 7206 SHA256 e056cb8254f804c08c144121e4455f1e3db73029223023b82b807f6f2aa7810f SHA512 8741ebe078a4b0f5b9dfdd5df52d4b1f590e33155f6ac7dcc4a5fbbf0556e4d546a60b2f437fefc446ccfdb4275ec5b9cb2246f3d023f5c58af19d31a68119df WHIRLPOOL 828d503e5b444837fd49b64970738ac2491230661818816ff4123e003a885039cb6da7b83920a78ce9cb261c3cfefc08d71b94effedecfe0e0332e0c60863725 -EBUILD bash-4.3_p30.ebuild 7145 SHA256 8feca632295298ec93314ce158427e9e5a0c699334dacd2f0017bd378703c071 SHA512 10a359f9b798ed4e6aa6396226ac2f64fd618c06156318dc3fe62f59988b36003f8dad36c12749431cb1f18d9479c8d6babede3e50ee2570fa8ce7c0705b6772 WHIRLPOOL 9fe6042dbb71b21e47cddbc21e5515a4e9a16acf86b2da89d1c8e0c2ee903905eda57014f930fe3af4b6431c8bbedbfa78b623a85f3b7d57cc76e18862c0269a +EBUILD bash-4.3_p33-r1.ebuild 7286 SHA256 dbeb216603a012f6b95fbea1092143c58687810aab66fff85e0bd61187f34608 SHA512 2767b5d63ba637f45a89c4308f65e45ab8c15e8ab922608b93f8bc5d6685d584eff13a3462ef05ce28620653701af5130df8368f81cb4f6d86277a54d49d92bc WHIRLPOOL cd912f960d5c80a1a762ef1fa8b09b242b65da9d92558c87807ab0a9936fc4bd790e22858eb26e4f0019d578747f263fa16e255017323cd377e5cf62f3a9b0b9 EBUILD bash-4.3_p33.ebuild 7152 SHA256 4144c3a9c6ada95ede64af25633bd697aaf52701e887dc2a7361d2b02e840b8e SHA512 09d9844e29c195bc56649f75910118eec36eadd3e032d54893c0586066acfcc33436f81c9140f9ccb902b18f9fc594d4a3857d89093562d82c578a2a2bdeb9b3 WHIRLPOOL c193bcfff32b370aeeb4a8c87c28beb829d30001b0b534e49570b95f9f6181b1cd48f6f544b99dc4e6a0eee2de16156304057e72369de7372f679a68fcbd17e2 -MISC ChangeLog 72817 SHA256 cafc715014c9a0abd0f8be6f53f86d1e556d5708b6be403797e6ba8a4ff9509c SHA512 39302667ea328148d639a49424d9451c8e69d1b3261b75c66581242082b6c0f00ea9a6d8095786c78bc800587f72b60cc4637b119c380035b6ecfc6289c249d6 WHIRLPOOL 34a194bf62b79d6f414a858f5ea7bb68d6cf1e2463c01c14bcd5883342d53e40dd3048ab14079de04bda440774a2d2fcc7fffd59e2f0d46702cb21e3ab1753a7 +MISC ChangeLog 73163 SHA256 746e3d96960872749cd105cd3bd1769dfee4a7d2ceb9b265708d1462e12f180b SHA512 5645d1fb4a920de8aae686714959d920dbf311133ec9a149f6c8d47a1512d12825b5e04342ba8175b09a1d1fbddf4b7525ed5bf364e2c739b6bed9ff32f48d4f WHIRLPOOL 03ae7abf58bf190b5fa0250ba4a2b3c9bbe373fd7ea4f408fd8e70ffa16adb61cb710fe02925f288c8467d6baf8227ada7d6a440a9c47c74466df0bfc4f8fddd MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUpPbYAAoJEPGu1DbS6WIA0MEP/RP/M/3lX3bxGsuxI1//gm3X -VDMXFPgrjuGuUyaLbp+pwOgrbgv0UAFj2dVzAZUYECKHoFD4KStEI5ohhRRTERNj -CcyT5yGnA5kzNUbzv6uEgj+PcNnLsTlFiVIZmcGdZIUBV7gyM/harFs4n+XJn808 -vftaY2P5cWUYvd00wrsHbiwSgNh+vb7rHb7UU7cq7a1qluqpiMadGT6HLZ5fZ+bl -E1DdBOhqaSQrrGnmKxCZfgsEbZK44whBNRz7biV1ZWhPjQBrsqZa0+LcWxBpBoAk -Qp0Z6l9HrD7cQwf/+rQ44jn1pg51r8h7Nhnsu21imAan8B4dZmumot8bLK4Z/+is -3dVYRkQLMHWnbnVaIyG15g7hxNWA8pWXIzDRPzhNEGLyKxBsN/f3MwZOwo8aMy69 -Zy8S/5hVkDWJqHF4UQndBoVMggAKiMdB9GVh3a8dptUU/gvIq0c2N7tGtD8MaVce -n1irCzZ3d5A9tdAlBlowwsp3sMtYh6qeZgyuyzmvUWMkfk9nn55vD7eT1PaeAEcb -0F5cIJ6UPKuRbFq7M8gIgzrhXKsZeJcaEerXk+dGPOMCTqU81o8NuCMU+fUchXmB -DyK4fAiYdeSNhBRsSaFS0pOSifa5WsDmhOg/HqtNdF+oJuBNN4aM8uDTmHkgziM/ -y83FRzIvnTQ4hDqSNAk5 -=3fid +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 -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.3_p30.ebuild b/app-shells/bash/bash-4.3_p30.ebuild deleted file mode 100644 index e0e41d0330ba..000000000000 --- a/app-shells/bash/bash-4.3_p30.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p30.ebuild,v 1.3 2014/10/20 05:14:35 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-term-cleanup.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}"/{bashrc,bash_logout} - 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/bash-4.3_p30-r1.ebuild b/app-shells/bash/bash-4.3_p33-r1.ebuild index 6b18603f3447..e59aca4a2602 100644 --- a/app-shells/bash/bash-4.3_p30-r1.ebuild +++ b/app-shells/bash/bash-4.3_p33-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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_p30-r1.ebuild,v 1.1 2014/11/09 20:41:28 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p33-r1.ebuild,v 1.1 2015/01/21 11:54:51 polynomial-c Exp $ EAPI="4" @@ -86,7 +86,8 @@ src_prepare() { 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-term-cleanup.patch + epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch + epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch epatch_user } diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch new file mode 100644 index 000000000000..f44d18478454 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-arrayfunc.patch @@ -0,0 +1,15 @@ +http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html + +diff --git a/arrayfunc.c b/arrayfunc.c +index 804e6da..0f900aa 100644 +--- a/arrayfunc.c ++++ b/arrayfunc.c +@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags) + + for (list = nlist; list; list = list->next) + { +- iflags = flags; ++ iflags = (flags & ~ASS_APPEND); + w = list->word->word; + + /* We have a word of the form [ind]=value */ diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch new file mode 100644 index 000000000000..20bf340fdbd3 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch @@ -0,0 +1,13 @@ +http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html + +--- bash-4.3/builtins/mapfile.def ++++ bash-4.3/builtins/mapfile.def +@@ -339,7 +339,7 @@ + else + array_name = list->word->word; + +- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0) ++ if (legal_identifier (array_name) == 0) + { + sh_invalidid (array_name); + return (EXECUTION_FAILURE); diff --git a/app-shells/bash/files/bash-4.3-term-cleanup.patch b/app-shells/bash/files/bash-4.3-term-cleanup.patch deleted file mode 100644 index be7a5def76d5..000000000000 --- a/app-shells/bash/files/bash-4.3-term-cleanup.patch +++ /dev/null @@ -1,47 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html - -*** ../bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400 ---- bashline.c 2014-09-08 11:28:56.000000000 -0400 -*************** -*** 203,206 **** ---- 203,207 ---- - extern int array_needs_making; - extern int posixly_correct, no_symbolic_links; -+ extern int sigalrm_seen; - extern char *current_prompt_string, *ps1_prompt; - extern STRING_INT_ALIST word_token_alist[]; -*************** -*** 4209,4214 **** - /* If we're going to longjmp to top_level, make sure we clean up readline. - check_signals will call QUIT, which will eventually longjmp to top_level, -! calling run_interrupt_trap along the way. */ -! if (interrupt_state) - rl_cleanup_after_signal (); - bashline_reset_event_hook (); ---- 4262,4268 ---- - /* If we're going to longjmp to top_level, make sure we clean up readline. - check_signals will call QUIT, which will eventually longjmp to top_level, -! calling run_interrupt_trap along the way. The check for sigalrm_seen is -! to clean up the read builtin's state. */ -! if (terminating_signal || interrupt_state || sigalrm_seen) - rl_cleanup_after_signal (); - bashline_reset_event_hook (); -*** ../bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500 ---- sig.c 2014-09-08 11:26:33.000000000 -0400 -*************** -*** 533,538 **** - /* Set the event hook so readline will call it after the signal handlers - finish executing, so if this interrupted character input we can get -! quick response. */ -! if (interactive_shell && interactive && no_line_editing == 0) - bashline_set_event_hook (); - #endif ---- 533,540 ---- - /* Set the event hook so readline will call it after the signal handlers - finish executing, so if this interrupted character input we can get -! quick response. If readline is active or has modified the terminal we -! need to set this no matter what the signal is, though the check for -! RL_STATE_TERMPREPPED is possibly redundant. */ -! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED)) - bashline_set_event_hook (); - #endif |