| 1 |
commit: 902a9997cdea0855955d3323d461d8c3d3575153 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 7 09:04:56 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 7 09:05:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902a9997 |
| 7 |
|
| 8 |
app-shells/bash: Removed rc version. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
app-shells/bash/Manifest | 1 - |
| 14 |
app-shells/bash/bash-4.4_rc2.ebuild | 245 ---------------------- |
| 15 |
app-shells/bash/files/bash-4.4-assign-crash.patch | 36 ---- |
| 16 |
3 files changed, 282 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest |
| 19 |
index 1bbb754..5b7a936 100644 |
| 20 |
--- a/app-shells/bash/Manifest |
| 21 |
+++ b/app-shells/bash/Manifest |
| 22 |
@@ -6,7 +6,6 @@ DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956d |
| 23 |
DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f |
| 24 |
DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a |
| 25 |
DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f |
| 26 |
-DIST bash-4.4-rc2.tar.gz 8937485 SHA256 199ec0166d50a765eec74dc258b006b06cf6b59901d7ff40510c82aae37ad994 SHA512 e47cf16c98d2a22373d61ed4e8bae9951c10e04d9aefbcf3b2b8189db6f71314025ad73b6a93a1135a9714011f0e3517911c8e68a39e4a92bda4811441062b2f WHIRLPOOL ead4840dc6313be760f51be7fe611673c9a0e5ddcd76c3817fd173bfe41e213a4d73f4a41f2556023974a7880738f98c30f8f7bb4fd520f10d62a838aef6b650 |
| 27 |
DIST bash-4.4.tar.gz 9377313 SHA256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 WHIRLPOOL cb88bb6f565d66346f5eb358a179e52637a2ede2fda3358899730795f1ac6f9540d116202f2d0d1ebb9d983ad7054c5fbf9be8b06a1ca0b4fe1eb62bb30a15ce |
| 28 |
DIST bash205b-001 1132 SHA256 bf7a055e0916b7899e7429e36e35d009db445b942b34520a601ea5a8fa634fdd SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 WHIRLPOOL 90ba36843bbf2e0b7279d3bd197ddaa04e03e113be32051e5a77280cda6d43dcbf339780c57322fc0835a54c82e0095f0d3f2a13f13fec8c0b8da38e7e9b253a |
| 29 |
DIST bash205b-002 755 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 WHIRLPOOL 7333910e98e517306077937881d4c5569ddd85552203b3ec833f0fda13822e388ce85f007d60e4ab4b1ef15abb66fa40dc4356ca01367463d179a6a23bcff8e7 |
| 30 |
|
| 31 |
diff --git a/app-shells/bash/bash-4.4_rc2.ebuild b/app-shells/bash/bash-4.4_rc2.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 30a5023..00000000 |
| 34 |
--- a/app-shells/bash/bash-4.4_rc2.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,245 +0,0 @@ |
| 37 |
-# Copyright 1999-2016 Gentoo Foundation |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Id$ |
| 40 |
- |
| 41 |
-EAPI="5" |
| 42 |
- |
| 43 |
-inherit eutils flag-o-matic toolchain-funcs multilib |
| 44 |
- |
| 45 |
-# Official patchlevel |
| 46 |
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ |
| 47 |
-PLEVEL=${PV##*_p} |
| 48 |
-MY_PV=${PV/_p*} |
| 49 |
-MY_PV=${MY_PV/_/-} |
| 50 |
-MY_P=${PN}-${MY_PV} |
| 51 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
| 52 |
-patches() { |
| 53 |
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} |
| 54 |
- [[ ${plevel} -eq 0 ]] && return 1 |
| 55 |
- eval set -- {1..${plevel}} |
| 56 |
- set -- $(printf "${pn}${pv/\.}-%03d " "$@") |
| 57 |
- if [[ ${opt} == -s ]] ; then |
| 58 |
- echo "${@/#/${DISTDIR}/}" |
| 59 |
- else |
| 60 |
- local u |
| 61 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do |
| 62 |
- printf "${u}/${pn}-${pv}-patches/%s " "$@" |
| 63 |
- done |
| 64 |
- fi |
| 65 |
-} |
| 66 |
- |
| 67 |
-# The version of readline this bash normally ships with. |
| 68 |
-READLINE_VER="7.0_rc2" |
| 69 |
- |
| 70 |
-DESCRIPTION="The standard GNU Bourne again shell" |
| 71 |
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" |
| 72 |
-case ${PV} in |
| 73 |
-*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; |
| 74 |
-*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;; |
| 75 |
-esac |
| 76 |
- |
| 77 |
-LICENSE="GPL-3" |
| 78 |
-SLOT="0" |
| 79 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 80 |
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" |
| 81 |
- |
| 82 |
-DEPEND=">=sys-libs/ncurses-5.2-r2:0= |
| 83 |
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) |
| 84 |
- nls? ( virtual/libintl )" |
| 85 |
-RDEPEND="${DEPEND} |
| 86 |
- !<sys-apps/portage-2.1.6.7_p1 |
| 87 |
- !<sys-apps/paludis-0.26.0_alpha5" |
| 88 |
-# we only need yacc when the .y files get patched (bash42-005) |
| 89 |
-DEPEND+=" virtual/yacc" |
| 90 |
- |
| 91 |
-S=${WORKDIR}/${MY_P} |
| 92 |
- |
| 93 |
-pkg_setup() { |
| 94 |
- if is-flag -malign-double ; then #7332 |
| 95 |
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this" |
| 96 |
- eerror "as it breaks LFS (struct stat64) on x86." |
| 97 |
- die "remove -malign-double from your CFLAGS mr ricer" |
| 98 |
- fi |
| 99 |
- if use bashlogger ; then |
| 100 |
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." |
| 101 |
- ewarn "This will log ALL output you enter into the shell, you have been warned." |
| 102 |
- fi |
| 103 |
-} |
| 104 |
- |
| 105 |
-src_unpack() { |
| 106 |
- unpack ${MY_P}.tar.gz |
| 107 |
-} |
| 108 |
- |
| 109 |
-src_prepare() { |
| 110 |
- # Include official patches |
| 111 |
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
| 112 |
- |
| 113 |
- # Clean out local libs so we know we use system ones w/releases. |
| 114 |
- if [[ ${PV} != *_rc* ]] ; then |
| 115 |
- rm -rf lib/{readline,termcap}/* |
| 116 |
- touch lib/{readline,termcap}/Makefile.in # for config.status |
| 117 |
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die |
| 118 |
- fi |
| 119 |
- |
| 120 |
- # Avoid regenerating docs after patches #407985 |
| 121 |
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die |
| 122 |
- touch -r . doc/* |
| 123 |
- |
| 124 |
- epatch_user |
| 125 |
-} |
| 126 |
- |
| 127 |
-src_configure() { |
| 128 |
- local myconf=() |
| 129 |
- |
| 130 |
- # For descriptions of these, see config-top.h |
| 131 |
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 |
| 132 |
- append-cppflags \ |
| 133 |
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ |
| 134 |
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ |
| 135 |
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ |
| 136 |
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ |
| 137 |
- -DNON_INTERACTIVE_LOGIN_SHELLS \ |
| 138 |
- -DSSH_SOURCE_BASHRC \ |
| 139 |
- $(use bashlogger && echo -DSYSLOG_HISTORY) |
| 140 |
- |
| 141 |
- # Don't even think about building this statically without |
| 142 |
- # reading Bug 7714 first. If you still build it statically, |
| 143 |
- # don't come crying to us with bugs ;). |
| 144 |
- #use static && export LDFLAGS="${LDFLAGS} -static" |
| 145 |
- use nls || myconf+=( --disable-nls ) |
| 146 |
- |
| 147 |
- # Historically, we always used the builtin readline, but since |
| 148 |
- # our handling of SONAME upgrades has gotten much more stable |
| 149 |
- # in the PM (and the readline ebuild itself preserves the old |
| 150 |
- # libs during upgrades), linking against the system copy should |
| 151 |
- # be safe. |
| 152 |
- # Exact cached version here doesn't really matter as long as it |
| 153 |
- # is at least what's in the DEPEND up above. |
| 154 |
- export ac_cv_rl_version=${READLINE_VER%%_*} |
| 155 |
- |
| 156 |
- # Force linking with system curses ... the bundled termcap lib |
| 157 |
- # sucks bad compared to ncurses. For the most part, ncurses |
| 158 |
- # is here because readline needs it. But bash itself calls |
| 159 |
- # ncurses in one or two small places :(. |
| 160 |
- |
| 161 |
- if [[ ${PV} != *_rc* ]] ; then |
| 162 |
- # Use system readline only with released versions. |
| 163 |
- myconf+=( --with-installed-readline=. ) |
| 164 |
- fi |
| 165 |
- |
| 166 |
- if use plugins; then |
| 167 |
- append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
| 168 |
- else |
| 169 |
- # Disable the plugins logic by hand since bash doesn't |
| 170 |
- # provide a way of doing it. |
| 171 |
- export ac_cv_func_dl{close,open,sym}=no \ |
| 172 |
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no |
| 173 |
- sed -i \ |
| 174 |
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ |
| 175 |
- configure || die |
| 176 |
- fi |
| 177 |
- tc-export AR #444070 |
| 178 |
- econf \ |
| 179 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
| 180 |
- --htmldir='$(docdir)/html' \ |
| 181 |
- --with-curses \ |
| 182 |
- $(use_with afs) \ |
| 183 |
- $(use_enable net net-redirections) \ |
| 184 |
- --disable-profiling \ |
| 185 |
- $(use_enable mem-scramble) \ |
| 186 |
- $(use_with mem-scramble bash-malloc) \ |
| 187 |
- $(use_enable readline) \ |
| 188 |
- $(use_enable readline history) \ |
| 189 |
- $(use_enable readline bang-history) \ |
| 190 |
- "${myconf[@]}" |
| 191 |
-} |
| 192 |
- |
| 193 |
-src_compile() { |
| 194 |
- emake |
| 195 |
- |
| 196 |
- if use plugins ; then |
| 197 |
- emake -C examples/loadables all others |
| 198 |
- fi |
| 199 |
-} |
| 200 |
- |
| 201 |
-src_install() { |
| 202 |
- local d f |
| 203 |
- |
| 204 |
- default |
| 205 |
- |
| 206 |
- dodir /bin |
| 207 |
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die |
| 208 |
- dosym bash /bin/rbash |
| 209 |
- |
| 210 |
- insinto /etc/bash |
| 211 |
- doins "${FILESDIR}"/bash_logout |
| 212 |
- doins "${FILESDIR}"/bashrc |
| 213 |
- keepdir /etc/bash/bashrc.d |
| 214 |
- insinto /etc/skel |
| 215 |
- for f in bash{_logout,_profile,rc} ; do |
| 216 |
- newins "${FILESDIR}"/dot-${f} .${f} |
| 217 |
- done |
| 218 |
- |
| 219 |
- local sed_args=( |
| 220 |
- -e "s:#${USERLAND}#@::" |
| 221 |
- -e '/#@/d' |
| 222 |
- ) |
| 223 |
- if ! use readline ; then |
| 224 |
- sed_args+=( #432338 |
| 225 |
- -e '/^shopt -s histappend/s:^:#:' |
| 226 |
- -e 's:use_color=true:use_color=false:' |
| 227 |
- ) |
| 228 |
- fi |
| 229 |
- sed -i \ |
| 230 |
- "${sed_args[@]}" \ |
| 231 |
- "${ED}"/etc/skel/.bashrc \ |
| 232 |
- "${ED}"/etc/bash/bashrc || die |
| 233 |
- |
| 234 |
- if use plugins ; then |
| 235 |
- exeinto /usr/$(get_libdir)/bash |
| 236 |
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g') |
| 237 |
- insinto /usr/include/bash-plugins |
| 238 |
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} |
| 239 |
- fi |
| 240 |
- |
| 241 |
- if use examples ; then |
| 242 |
- for d in examples/{functions,misc,scripts,startup-files} ; do |
| 243 |
- exeinto /usr/share/doc/${PF}/${d} |
| 244 |
- insinto /usr/share/doc/${PF}/${d} |
| 245 |
- for f in ${d}/* ; do |
| 246 |
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then |
| 247 |
- doexe ${f} |
| 248 |
- else |
| 249 |
- doins ${f} |
| 250 |
- fi |
| 251 |
- done |
| 252 |
- done |
| 253 |
- fi |
| 254 |
- |
| 255 |
- doman doc/*.1 |
| 256 |
- newdoc CWRU/changelog ChangeLog |
| 257 |
- dosym bash.info /usr/share/info/bashref.info |
| 258 |
-} |
| 259 |
- |
| 260 |
-pkg_preinst() { |
| 261 |
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then |
| 262 |
- mkdir -p "${EROOT}"/etc/bash |
| 263 |
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ |
| 264 |
- fi |
| 265 |
- |
| 266 |
- if [[ -L ${EROOT}/bin/sh ]] ; then |
| 267 |
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh |
| 268 |
- # missing even temporarily causes a fatal error with paludis. |
| 269 |
- local target=$(readlink "${EROOT}"/bin/sh) |
| 270 |
- local tmp=$(emktemp "${EROOT}"/bin) |
| 271 |
- ln -sf "${target}" "${tmp}" |
| 272 |
- mv -f "${tmp}" "${EROOT}"/bin/sh |
| 273 |
- fi |
| 274 |
-} |
| 275 |
- |
| 276 |
-pkg_postinst() { |
| 277 |
- # If /bin/sh does not exist, provide it |
| 278 |
- if [[ ! -e ${EROOT}/bin/sh ]] ; then |
| 279 |
- ln -sf bash "${EROOT}"/bin/sh |
| 280 |
- fi |
| 281 |
-} |
| 282 |
|
| 283 |
diff --git a/app-shells/bash/files/bash-4.4-assign-crash.patch b/app-shells/bash/files/bash-4.4-assign-crash.patch |
| 284 |
deleted file mode 100644 |
| 285 |
index 17089e9..00000000 |
| 286 |
--- a/app-shells/bash/files/bash-4.4-assign-crash.patch |
| 287 |
+++ /dev/null |
| 288 |
@@ -1,36 +0,0 @@ |
| 289 |
-http://lists.gnu.org/archive/html/bug-bash/2016-07/msg00066.html |
| 290 |
- |
| 291 |
-From: Andreas Schwab <schwab@××××.de> |
| 292 |
-To: bug-bash@×××.org |
| 293 |
-Subject: a=$* -> crash |
| 294 |
-Date: Wed, 27 Jul 2016 13:59:22 +0200 |
| 295 |
-Message-ID: <mvmbn1j2sx1.fsf@××××××××××××.de> |
| 296 |
- |
| 297 |
-(gdb) r |
| 298 |
-Starting program: /bin/bash -c a=\$\* |
| 299 |
- |
| 300 |
-Program received signal SIGSEGV, Segmentation fault. |
| 301 |
-quote_string (string=string@entry=0x0) at subst.c:3940 |
| 302 |
-3940 if (*string == 0) |
| 303 |
- |
| 304 |
-diff --git a/subst.c b/subst.c |
| 305 |
-index 37d96f9..16ae3f0 100644 |
| 306 |
---- a/subst.c |
| 307 |
-+++ b/subst.c |
| 308 |
-@@ -8575,7 +8575,7 @@ param_expand (string, sindex, quoted, expanded_something, |
| 309 |
- /* If we're not quoted but we still don't want word splitting, make |
| 310 |
- we quote the IFS characters to protect them from splitting (e.g., |
| 311 |
- when $@ is in the string as well). */ |
| 312 |
-- else if (quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS)) |
| 313 |
-+ else if (temp != 0 && quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS)) |
| 314 |
- { |
| 315 |
- temp1 = quote_string (temp); |
| 316 |
- free (temp); |
| 317 |
- |
| 318 |
-Andreas. |
| 319 |
- |
| 320 |
--- |
| 321 |
-Andreas Schwab, SUSE Labs, schwab@××××.de |
| 322 |
-GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 |
| 323 |
-"And now for something completely different." |
| 324 |
- |
Archives