diff options
author | 2009-03-14 18:12:59 +0000 | |
---|---|---|
committer | 2009-03-14 18:12:59 +0000 | |
commit | 932503a2e217142e18a1d3016273e57d0aa052d3 (patch) | |
tree | 115a63ccd60f5244558a9929520ee01be99574a8 /app-shells | |
parent | blinkensisters bump (diff) | |
download | gentoo-2-932503a2e217142e18a1d3016273e57d0aa052d3.tar.gz gentoo-2-932503a2e217142e18a1d3016273e57d0aa052d3.tar.bz2 gentoo-2-932503a2e217142e18a1d3016273e57d0aa052d3.zip |
Add some more patches from upstream bash.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 9 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p10-r1.ebuild | 187 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-amp-case-segv.patch | 21 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-bar-and-piping.patch | 18 |
4 files changed, 234 insertions, 1 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 23b0f80b23f7..29088d570b77 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-shells/bash # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.212 2009/03/10 19:05:02 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.213 2009/03/14 18:12:58 vapier Exp $ + +*bash-4.0_p10-r1 (14 Mar 2009) + + 14 Mar 2009; Mike Frysinger <vapier@gentoo.org> + +files/bash-4.0-amp-case-segv.patch, +files/bash-4.0-bar-and-piping.patch, + +bash-4.0_p10-r1.ebuild: + Add some more patches from upstream bash. 10 Mar 2009; Doug Goldstein <cardoe@gentoo.org> bash-4.0_p10.ebuild: fix licensing issue. bug #262015 diff --git a/app-shells/bash/bash-4.0_p10-r1.ebuild b/app-shells/bash/bash-4.0_p10-r1.ebuild new file mode 100644 index 000000000000..fca42ce559fe --- /dev/null +++ b/app-shells/bash/bash-4.0_p10-r1.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p10-r1.ebuild,v 1.1 2009/03/14 18:12:58 vapier Exp $ + +EAPI="1" + +inherit eutils flag-o-matic toolchain-funcs multilib + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} +[[ ${PV} != *_p* ]] && PLEVEL=0 +READLINE_VER=6.0 +READLINE_PLEVEL=0 # both readline patches are also released as bash patches +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 +} + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches) + $(patches ${READLINE_PLEVEL} readline ${READLINE_VER})" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="afs bashlogger examples +net nls plugins vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND="${DEPEND} + !<sys-apps/portage-2.1.5 + !<sys-apps/paludis-0.26.0_alpha5" + +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 +} + +src_unpack() { + unpack ${MY_P}.tar.gz + cd "${S}" + + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + cd lib/readline + [[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER}) + cd ../.. + + if ! use vanilla ; then + epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 + epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947 + epatch "${FILESDIR}"/${PN}-4.0-amp-case-segv.patch + epatch "${FILESDIR}"/${PN}-4.0-bar-and-piping.patch + epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch + # Log bash commands to syslog #91327 + 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." + ebeep + epause + epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch + fi + fi +} + +src_compile() { + 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 + + # Always use the buildin readline, else if we update readline + # bash gets borked as readline is usually not binary compadible + # between minor versions. + #myconf="${myconf} $(use_with !readline installed-readline)" + myconf="${myconf} --without-installed-readline" + + # 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="${myconf} --disable-nls" + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses + myconf="${myconf} --with-curses" + + use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash + econf \ + $(use_with afs) \ + $(use_enable net net-redirections) \ + --disable-profiling \ + --without-gnu-malloc \ + ${myconf} || die + emake || die "make failed" + + if use plugins ; then + emake -C examples/loadables all others || die + fi +} + +src_install() { + emake install DESTDIR="${D}" || die + + dodir /bin + mv "${D}"/usr/bin/bash "${D}"/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 + + sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; 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 + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then + mkdir -p "${ROOT}"/etc/bash + mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ + fi + + if [[ -L ${ROOT}/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 "${ROOT}"/bin/sh) + ln -sf "${target}" "${ROOT}"/bin/sh + fi +} + +pkg_postinst() { + # If /bin/sh does not exist, provide it + if [[ ! -e ${ROOT}/bin/sh ]]; then + ln -sf bash "${ROOT}"/bin/sh + fi +} diff --git a/app-shells/bash/files/bash-4.0-amp-case-segv.patch b/app-shells/bash/files/bash-4.0-amp-case-segv.patch new file mode 100644 index 000000000000..25bca0f8778d --- /dev/null +++ b/app-shells/bash/files/bash-4.0-amp-case-segv.patch @@ -0,0 +1,21 @@ +http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00129.html + +*** ../bash-4.0/execute_cmd.c 2009-02-14 05:41:41.000000000 +0800 +--- execute_cmd.c 2009-03-14 13:47:15.000000000 +0800 +*************** +*** 2930,2936 **** + retval = execute_command (clauses->action); + } + while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next)); +! if ((clauses->flags & CASEPAT_TESTNEXT) == 0) + EXIT_CASE (); + else + break; +--- 2930,2936 ---- + retval = execute_command (clauses->action); + } + while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next)); +! if (!clauses || (clauses->flags & CASEPAT_TESTNEXT) == 0) + EXIT_CASE (); + else + break; diff --git a/app-shells/bash/files/bash-4.0-bar-and-piping.patch b/app-shells/bash/files/bash-4.0-bar-and-piping.patch new file mode 100644 index 000000000000..788dfcdebd8f --- /dev/null +++ b/app-shells/bash/files/bash-4.0-bar-and-piping.patch @@ -0,0 +1,18 @@ +http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00098.html + +*** ../bash-4.0-patched/parse.y 2009-03-09 10:27:05.000000000 -0400 +--- parse.y 2009-03-12 09:02:31.000000000 -0400 +*************** +*** 1123,1127 **** + REDIRECT *r; + +! tc = $1; + rd.dest = 1; + r = make_redirection (2, r_duplicating_output, rd); +--- 1123,1127 ---- + REDIRECT *r; + +! tc = $1->type == cm_simple ? $1->value.Simple : $1; + rd.dest = 1; + r = make_redirection (2, r_duplicating_output, rd); + |