diff options
-rw-r--r-- | app-shells/bash/bash-4.0_p10-r1.ebuild | 188 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p10.ebuild | 197 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p17-r1.ebuild | 188 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p17.ebuild | 186 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p24.ebuild | 188 | ||||
-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 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-debug-trap-jobs.patch | 44 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch | 51 |
9 files changed, 0 insertions, 1081 deletions
diff --git a/app-shells/bash/bash-4.0_p10-r1.ebuild b/app-shells/bash/bash-4.0_p10-r1.ebuild deleted file mode 100644 index bc3e01388f3e..000000000000 --- a/app-shells/bash/bash-4.0_p10-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# 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.2 2009/03/23 18:34:21 grobian 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 - nls? ( virtual/libintl )" -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/bash-4.0_p10.ebuild b/app-shells/bash/bash-4.0_p10.ebuild deleted file mode 100644 index 0add8e1b8d74..000000000000 --- a/app-shells/bash/bash-4.0_p10.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# 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.ebuild,v 1.3 2009/03/23 18:34:21 grobian 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 - nls? ( virtual/libintl )" -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 -#2 epatch "${FILESDIR}"/${PN}-4.0-pcomplete-save-parser-state.patch -#1 epatch "${FILESDIR}"/${PN}-4.0-comsub-backslash-metacharacters.patch -#3 epatch "${FILESDIR}"/${PN}-4.0-save-current-token.patch -#4 epatch "${FILESDIR}"/${PN}-4.0-exit-checkjobs.patch -#5 epatch "${FILESDIR}"/${PN}-4.0-declare-identifier.patch -#3 epatch "${FILESDIR}"/${PN}-4.0-reset-parser-current-token.patch -#6 epatch "${FILESDIR}"/${PN}-4.0-pipeline-reserved-word.patch -#7 epatch "${FILESDIR}"/${PN}-4.0-associative-array-subscripts.patch -#8 epatch "${FILESDIR}"/${PN}-4.0-comsub-herestring.patch -#10 epatch "${FILESDIR}"/${PN}-4.0-comsub-comments.patch -#9 epatch "${FILESDIR}"/${PN}-4.0-read-timeout-reset.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/bash-4.0_p17-r1.ebuild b/app-shells/bash/bash-4.0_p17-r1.ebuild deleted file mode 100644 index f167a9b3a1f0..000000000000 --- a/app-shells/bash/bash-4.0_p17-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# 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_p17-r1.ebuild,v 1.1 2009/04/14 01:52:42 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 - nls? ( virtual/libintl )" -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-negative-return.patch - epatch "${FILESDIR}"/${PN}-4.0-redisplay-sigwinch.patch - epatch "${FILESDIR}"/${PN}-4.0-debug-trap-jobs.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/bash-4.0_p17.ebuild b/app-shells/bash/bash-4.0_p17.ebuild deleted file mode 100644 index 23f32fe3f490..000000000000 --- a/app-shells/bash/bash-4.0_p17.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# 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_p17.ebuild,v 1.1 2009/04/08 06:21:16 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 - nls? ( virtual/libintl )" -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-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/bash-4.0_p24.ebuild b/app-shells/bash/bash-4.0_p24.ebuild deleted file mode 100644 index 0c39b1cfd862..000000000000 --- a/app-shells/bash/bash-4.0_p24.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# 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_p24.ebuild,v 1.2 2009/05/29 23:07: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 - nls? ( virtual/libintl )" -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-negative-return.patch - epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613 - # 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 - sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613 - 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 deleted file mode 100644 index 25bca0f8778d..000000000000 --- a/app-shells/bash/files/bash-4.0-amp-case-segv.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 788dfcdebd8f..000000000000 --- a/app-shells/bash/files/bash-4.0-bar-and-piping.patch +++ /dev/null @@ -1,18 +0,0 @@ -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); - diff --git a/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch b/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch deleted file mode 100644 index facae42aa85e..000000000000 --- a/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch +++ /dev/null @@ -1,44 +0,0 @@ -*** ../bash-4.0-patched/jobs.c 2009-01-29 17:09:49.000000000 -0500 ---- jobs.c 2009-04-11 15:14:27.000000000 -0400 -*************** -*** 443,447 **** - the_pipeline = saved_pipeline; - already_making_children = saved_already_making_children; -! if (discard) - discard_pipeline (old_pipeline); - } ---- 443,447 ---- - the_pipeline = saved_pipeline; - already_making_children = saved_already_making_children; -! if (discard && old_pipeline) - discard_pipeline (old_pipeline); - } -*** ../bash-4.0-patched/trap.c 2009-01-16 17:07:53.000000000 -0500 ---- trap.c 2009-04-11 15:11:58.000000000 -0400 -*************** -*** 799,802 **** ---- 799,803 ---- - { - int trap_exit_value; -+ pid_t save_pgrp; - - /* XXX - question: should the DEBUG trap inherit the RETURN trap? */ -*************** -*** 804,808 **** ---- 805,820 ---- - if ((sigmodes[DEBUG_TRAP] & SIG_TRAPPED) && ((sigmodes[DEBUG_TRAP] & SIG_IGNORED) == 0) && ((sigmodes[DEBUG_TRAP] & SIG_INPROGRESS) == 0)) - { -+ #if defined (JOB_CONTROL) -+ save_pgrp = pipeline_pgrp; -+ pipeline_pgrp = shell_pgrp; -+ save_pipeline (1); -+ stop_making_children (); -+ #endif - trap_exit_value = _run_trap_internal (DEBUG_TRAP, "debug trap"); -+ #if defined (JOB_CONTROL) -+ pipeline_pgrp = save_pgrp; -+ restore_pipeline (1); -+ notify_and_cleanup (); -+ #endif - - #if defined (DEBUGGER) diff --git a/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch b/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch deleted file mode 100644 index e90e5552ea88..000000000000 --- a/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch +++ /dev/null @@ -1,51 +0,0 @@ -*** ../bash-4.0-patched/lib/readline/readline.h 2009-01-04 14:32:33.000000000 -0500 ---- lib/readline/readline.h 2009-04-13 08:47:00.000000000 -0400 -*************** -*** 815,820 **** - #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */ - #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */ - -! #define RL_STATE_DONE 0x800000 /* done; accepted line */ - - #define RL_SETSTATE(x) (rl_readline_state |= (x)) ---- 815,821 ---- - #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */ - #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */ -+ #define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */ - -! #define RL_STATE_DONE 0x1000000 /* done; accepted line */ - - #define RL_SETSTATE(x) (rl_readline_state |= (x)) -*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 -0500 ---- lib/readline/display.c 2009-04-13 08:29:54.000000000 -0400 -*************** -*** 513,516 **** ---- 513,517 ---- - data structures. */ - _rl_block_sigint (); -+ RL_SETSTATE (RL_STATE_REDISPLAYING); - - if (!rl_display_prompt) -*************** -*** 1237,1240 **** ---- 1238,1242 ---- - } - -+ RL_UNSETSTATE (RL_STATE_REDISPLAYING); - _rl_release_sigint (); - } -*** ../bash-4.0-patched/lib/readline/terminal.c 2009-01-04 14:32:34.000000000 -0500 ---- lib/readline/terminal.c 2009-04-13 08:43:00.000000000 -0400 -*************** -*** 356,360 **** - if (CUSTOM_REDISPLAY_FUNC ()) - rl_forced_update_display (); -! else - _rl_redisplay_after_sigwinch (); - } ---- 356,360 ---- - if (CUSTOM_REDISPLAY_FUNC ()) - rl_forced_update_display (); -! else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0) - _rl_redisplay_after_sigwinch (); - } |