From daef178a757896661be3453c45ec7a81d3e67869 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 1 Oct 2014 20:47:24 +0000 Subject: Finally the official patch to fix CVE-2014-7186 and CVE-2014-7187 is out (bug #523742). Committed straight to stable where previous -r1 version was stable (Portage version: 2.2.14_rc1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC) --- app-shells/bash/ChangeLog | 18 +- app-shells/bash/bash-3.1_p19.ebuild | 146 ------------ app-shells/bash/bash-3.1_p21.ebuild | 146 ++++++++++++ app-shells/bash/bash-3.2_p53.ebuild | 146 ------------ app-shells/bash/bash-3.2_p55.ebuild | 146 ++++++++++++ app-shells/bash/bash-4.0_p40.ebuild | 140 ------------ app-shells/bash/bash-4.0_p42.ebuild | 140 ++++++++++++ app-shells/bash/bash-4.1_p13.ebuild | 137 ------------ app-shells/bash/bash-4.1_p14-r1.ebuild | 138 ------------ app-shells/bash/bash-4.1_p15.ebuild | 137 ++++++++++++ app-shells/bash/bash-4.2_p49.ebuild | 226 ------------------- app-shells/bash/bash-4.2_p50-r1.ebuild | 227 ------------------- app-shells/bash/bash-4.2_p51.ebuild | 226 +++++++++++++++++++ app-shells/bash/bash-4.3_p27-r1.ebuild | 247 --------------------- app-shells/bash/bash-4.3_p28.ebuild | 246 ++++++++++++++++++++ .../bash/files/bash-redir-stack-overflow.patch | 140 ------------ 16 files changed, 1058 insertions(+), 1548 deletions(-) delete mode 100644 app-shells/bash/bash-3.1_p19.ebuild create mode 100644 app-shells/bash/bash-3.1_p21.ebuild delete mode 100644 app-shells/bash/bash-3.2_p53.ebuild create mode 100644 app-shells/bash/bash-3.2_p55.ebuild delete mode 100644 app-shells/bash/bash-4.0_p40.ebuild create mode 100644 app-shells/bash/bash-4.0_p42.ebuild delete mode 100644 app-shells/bash/bash-4.1_p13.ebuild delete mode 100644 app-shells/bash/bash-4.1_p14-r1.ebuild create mode 100644 app-shells/bash/bash-4.1_p15.ebuild delete mode 100644 app-shells/bash/bash-4.2_p49.ebuild delete mode 100644 app-shells/bash/bash-4.2_p50-r1.ebuild create mode 100644 app-shells/bash/bash-4.2_p51.ebuild delete mode 100644 app-shells/bash/bash-4.3_p27-r1.ebuild create mode 100644 app-shells/bash/bash-4.3_p28.ebuild delete mode 100644 app-shells/bash/files/bash-redir-stack-overflow.patch (limited to 'app-shells/bash') diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 7a17f327d6af..0b3d70bcaf78 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for app-shells/bash # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.403 2014/10/01 16:41:27 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.404 2014/10/01 20:47:24 polynomial-c Exp $ + +*bash-4.3_p28 (01 Oct 2014) +*bash-4.2_p51 (01 Oct 2014) +*bash-4.1_p15 (01 Oct 2014) +*bash-4.0_p42 (01 Oct 2014) +*bash-3.2_p55 (01 Oct 2014) +*bash-3.1_p21 (01 Oct 2014) + + 01 Oct 2014; Lars Wendler -bash-3.1_p19.ebuild, + +bash-3.1_p21.ebuild, -bash-3.2_p53.ebuild, +bash-3.2_p55.ebuild, + -bash-4.0_p40.ebuild, +bash-4.0_p42.ebuild, -bash-4.1_p13.ebuild, + -bash-4.1_p14-r1.ebuild, +bash-4.1_p15.ebuild, -bash-4.2_p49.ebuild, + -bash-4.2_p50-r1.ebuild, +bash-4.2_p51.ebuild, -bash-4.3_p27-r1.ebuild, + +bash-4.3_p28.ebuild, -files/bash-redir-stack-overflow.patch: + Finally the official patch to fix CVE-2014-7186 and CVE-2014-7187 is out (bug + #523742). Committed straight to stable where previous -r1 version was stable. 01 Oct 2014; Sergey Popov bash-4.2_p50-r1.ebuild: s390 stable, wrt bug #523742 diff --git a/app-shells/bash/bash-3.1_p19.ebuild b/app-shells/bash/bash-3.1_p19.ebuild deleted file mode 100644 index 2614883b6c34..000000000000 --- a/app-shells/bash/bash-3.1_p19.ebuild +++ /dev/null @@ -1,146 +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-3.1_p19.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-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 -} - -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)" - -LICENSE="GPL-2" -SLOT="${MY_PV}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs +net nls +readline" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -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 -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones - 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 - - epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch - epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 - epatch "${FILESDIR}"/${PN}-3.1-ulimit.patch - epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch - epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch - epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch #118257 - epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch #131875 - - epatch_user -} - -src_configure() { - local myconf=() - - # Force pgrp synchronization - # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 - export bash_cv_pgrp_pipe=yes - - # 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 - - # 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=6.2 - - # 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 :(. - - tc-export AR #444070 - econf \ - --with-installed-readline=. \ - --with-curses \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - --without-gnu-malloc \ - $(use_enable readline) \ - $(use_enable readline history) \ - $(use_enable readline bang-history) \ - "${myconf[@]}" -} - -src_compile() { - emake -j1 #102426 -} - -src_install() { - into / - newbin bash bash-${SLOT} - - newman doc/bash.1 bash-${SLOT}.1 - newman doc/builtins.1 builtins-${SLOT}.1 - - insinto /usr/share/info - newins doc/bashref.info bash-${SLOT}.info - dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info - - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO -} diff --git a/app-shells/bash/bash-3.1_p21.ebuild b/app-shells/bash/bash-3.1_p21.ebuild new file mode 100644 index 000000000000..2210b80f3b82 --- /dev/null +++ b/app-shells/bash/bash-3.1_p21.ebuild @@ -0,0 +1,146 @@ +# 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-3.1_p21.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-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 +} + +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)" + +LICENSE="GPL-2" +SLOT="${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="afs +net nls +readline" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-6.2 ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND}" + +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 +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + + # Clean out local libs so we know we use system ones + 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 + + epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch + epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 + epatch "${FILESDIR}"/${PN}-3.1-ulimit.patch + epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch + epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch + epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch #118257 + epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch #131875 + + epatch_user +} + +src_configure() { + local myconf=() + + # Force pgrp synchronization + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 + export bash_cv_pgrp_pipe=yes + + # 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 + + # 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=6.2 + + # 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 :(. + + tc-export AR #444070 + econf \ + --with-installed-readline=. \ + --with-curses \ + $(use_with afs) \ + $(use_enable net net-redirections) \ + --disable-profiling \ + --without-gnu-malloc \ + $(use_enable readline) \ + $(use_enable readline history) \ + $(use_enable readline bang-history) \ + "${myconf[@]}" +} + +src_compile() { + emake -j1 #102426 +} + +src_install() { + into / + newbin bash bash-${SLOT} + + newman doc/bash.1 bash-${SLOT}.1 + newman doc/builtins.1 builtins-${SLOT}.1 + + insinto /usr/share/info + newins doc/bashref.info bash-${SLOT}.info + dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info + + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO +} diff --git a/app-shells/bash/bash-3.2_p53.ebuild b/app-shells/bash/bash-3.2_p53.ebuild deleted file mode 100644 index eda678b7db43..000000000000 --- a/app-shells/bash/bash-3.2_p53.ebuild +++ /dev/null @@ -1,146 +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-3.2_p53.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-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 -} - -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)" - -LICENSE="GPL-2" -SLOT="${MY_PV}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs +net nls +readline" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -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 -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones - 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 - - epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040 - epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch - epatch "${FILESDIR}"/${PN}-3.2-loadables.patch - epatch "${FILESDIR}"/${PN}-3.2-protos.patch - epatch "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775 - epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 - epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947 - epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch - epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch - epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch - epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875 - - epatch_user -} - -src_configure() { - local myconf=() - - # Force pgrp synchronization - # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 - export bash_cv_pgrp_pipe=yes - - # 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 - - # 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=6.2 - - # 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 :(. - - tc-export AR #444070 - econf \ - --with-installed-readline=. \ - --with-curses \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - --without-gnu-malloc \ - $(use_enable readline) \ - $(use_enable readline history) \ - $(use_enable readline bang-history) \ - "${myconf[@]}" -} - -src_install() { - into / - newbin bash bash-${SLOT} - - newman doc/bash.1 bash-${SLOT}.1 - newman doc/builtins.1 builtins-${SLOT}.1 - - insinto /usr/share/info - newins doc/bashref.info bash-${SLOT}.info - dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info - - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO -} diff --git a/app-shells/bash/bash-3.2_p55.ebuild b/app-shells/bash/bash-3.2_p55.ebuild new file mode 100644 index 000000000000..09c04b7f3893 --- /dev/null +++ b/app-shells/bash/bash-3.2_p55.ebuild @@ -0,0 +1,146 @@ +# 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-3.2_p55.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-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 +} + +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)" + +LICENSE="GPL-2" +SLOT="${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="afs +net nls +readline" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-6.2 ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND}" + +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 +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + + # Clean out local libs so we know we use system ones + 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 + + epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040 + epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch + epatch "${FILESDIR}"/${PN}-3.2-loadables.patch + epatch "${FILESDIR}"/${PN}-3.2-protos.patch + epatch "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775 + epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 + epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947 + epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch + epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch + epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch + epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875 + + epatch_user +} + +src_configure() { + local myconf=() + + # Force pgrp synchronization + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 + export bash_cv_pgrp_pipe=yes + + # 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 + + # 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=6.2 + + # 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 :(. + + tc-export AR #444070 + econf \ + --with-installed-readline=. \ + --with-curses \ + $(use_with afs) \ + $(use_enable net net-redirections) \ + --disable-profiling \ + --without-gnu-malloc \ + $(use_enable readline) \ + $(use_enable readline history) \ + $(use_enable readline bang-history) \ + "${myconf[@]}" +} + +src_install() { + into / + newbin bash bash-${SLOT} + + newman doc/bash.1 bash-${SLOT}.1 + newman doc/builtins.1 builtins-${SLOT}.1 + + insinto /usr/share/info + newins doc/bashref.info bash-${SLOT}.info + dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info + + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO +} diff --git a/app-shells/bash/bash-4.0_p40.ebuild b/app-shells/bash/bash-4.0_p40.ebuild deleted file mode 100644 index 507cd04d2971..000000000000 --- a/app-shells/bash/bash-4.0_p40.ebuild +++ /dev/null @@ -1,140 +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.0_p40.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-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 -} - -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)" - -LICENSE="GPL-3" -SLOT="${MY_PV}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs mem-scramble +net nls +readline" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -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 -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones - 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 - - epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901 - epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch - sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl - 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 - sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613 - - 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 - - # 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=6.2 - - # 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 :(. - - tc-export AR #444070 - econf \ - --with-installed-readline=. \ - --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_install() { - into / - newbin bash bash-${SLOT} - - newman doc/bash.1 bash-${SLOT}.1 - newman doc/builtins.1 builtins-${SLOT}.1 - - insinto /usr/share/info - newins doc/bashref.info bash-${SLOT}.info - dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info - - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO -} diff --git a/app-shells/bash/bash-4.0_p42.ebuild b/app-shells/bash/bash-4.0_p42.ebuild new file mode 100644 index 000000000000..3695b2fa9fc8 --- /dev/null +++ b/app-shells/bash/bash-4.0_p42.ebuild @@ -0,0 +1,140 @@ +# 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.0_p42.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-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 +} + +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)" + +LICENSE="GPL-3" +SLOT="${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="afs mem-scramble +net nls +readline" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-6.2 ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND}" + +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 +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + + # Clean out local libs so we know we use system ones + 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 + + epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901 + epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch + sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl + 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 + sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613 + + 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 + + # 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=6.2 + + # 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 :(. + + tc-export AR #444070 + econf \ + --with-installed-readline=. \ + --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_install() { + into / + newbin bash bash-${SLOT} + + newman doc/bash.1 bash-${SLOT}.1 + newman doc/builtins.1 builtins-${SLOT}.1 + + insinto /usr/share/info + newins doc/bashref.info bash-${SLOT}.info + dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info + + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO +} diff --git a/app-shells/bash/bash-4.1_p13.ebuild b/app-shells/bash/bash-4.1_p13.ebuild deleted file mode 100644 index 90a13f733db6..000000000000 --- a/app-shells/bash/bash-4.1_p13.ebuild +++ /dev/null @@ -1,137 +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.1_p13.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-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 -} - -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)" - -LICENSE="GPL-3" -SLOT="${MY_PV}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs mem-scramble +net nls +readline" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -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 -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones - 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 - - epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411 - sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl - epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch - - epatch_user -} - -src_configure() { - local myconf=() - - myconf+=( --without-lispdir ) #335896 - - # 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 - - # 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=6.2 - - # 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 :(. - - tc-export AR #444070 - econf \ - --with-installed-readline=. \ - --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_install() { - into / - newbin bash bash-${SLOT} - - newman doc/bash.1 bash-${SLOT}.1 - newman doc/builtins.1 builtins-${SLOT}.1 - - insinto /usr/share/info - newins doc/bashref.info bash-${SLOT}.info - dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info - - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO -} diff --git a/app-shells/bash/bash-4.1_p14-r1.ebuild b/app-shells/bash/bash-4.1_p14-r1.ebuild deleted file mode 100644 index 6a2d1dddd2d3..000000000000 --- a/app-shells/bash/bash-4.1_p14-r1.ebuild +++ /dev/null @@ -1,138 +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.1_p14-r1.ebuild,v 1.3 2014/10/01 16:06:56 ago Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-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 -} - -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)" - -LICENSE="GPL-3" -SLOT="${MY_PV}" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs mem-scramble +net nls +readline" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -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 -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones - 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 - - epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411 - sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl - epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch - epatch "${FILESDIR}"/${PN}-redir-stack-overflow.patch #523742 - - epatch_user -} - -src_configure() { - local myconf=() - - myconf+=( --without-lispdir ) #335896 - - # 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 - - # 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=6.2 - - # 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 :(. - - tc-export AR #444070 - econf \ - --with-installed-readline=. \ - --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_install() { - into / - newbin bash bash-${SLOT} - - newman doc/bash.1 bash-${SLOT}.1 - newman doc/builtins.1 builtins-${SLOT}.1 - - insinto /usr/share/info - newins doc/bashref.info bash-${SLOT}.info - dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info - - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO -} diff --git a/app-shells/bash/bash-4.1_p15.ebuild b/app-shells/bash/bash-4.1_p15.ebuild new file mode 100644 index 000000000000..dda5157787ad --- /dev/null +++ b/app-shells/bash/bash-4.1_p15.ebuild @@ -0,0 +1,137 @@ +# 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.1_p15.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-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 +} + +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)" + +LICENSE="GPL-3" +SLOT="${MY_PV}" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="afs mem-scramble +net nls +readline" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-6.2 ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND}" + +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 +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + + # Clean out local libs so we know we use system ones + 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 + + epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411 + sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl + epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch + + epatch_user +} + +src_configure() { + local myconf=() + + myconf+=( --without-lispdir ) #335896 + + # 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 + + # 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=6.2 + + # 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 :(. + + tc-export AR #444070 + econf \ + --with-installed-readline=. \ + --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_install() { + into / + newbin bash bash-${SLOT} + + newman doc/bash.1 bash-${SLOT}.1 + newman doc/builtins.1 builtins-${SLOT}.1 + + insinto /usr/share/info + newins doc/bashref.info bash-${SLOT}.info + dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info + + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO +} diff --git a/app-shells/bash/bash-4.2_p49.ebuild b/app-shells/bash/bash-4.2_p49.ebuild deleted file mode 100644 index b1fcd7a04653..000000000000 --- a/app-shells/bash/bash-4.2_p49.ebuild +++ /dev/null @@ -1,226 +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.2_p49.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-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 -} - -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)" - -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-6.2 ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !!= HEREDOC_MAX) -+ { -+ last_command_exit_value = EX_BADUSAGE; -+ need_here_doc = 0; -+ report_syntax_error (_("maximum here-document count exceeded")); -+ reset_parser (); -+ exit_shell (last_command_exit_value); -+ } -+ redir_stack[need_here_doc++] = r; -+ } -+ - void - gather_here_documents () -- cgit v1.2.3-65-gdbad