From 6a9b32386b34bfda9833aea3ba62ccfecf149529 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Mon, 2 Aug 2004 18:17:59 +0000 Subject: Add patch to use /etc/inputrc automatically as a last resort if ~/.inputrc is unavailable. This is better than using INPUTRC since that will override even after the user creates ~/.inputrc. #38955 --- app-shells/bash/ChangeLog | 11 +- app-shells/bash/Manifest | 23 ++-- app-shells/bash/bash-3.0-r1.ebuild | 124 --------------------- app-shells/bash/bash-3.0-r2.ebuild | 128 ---------------------- app-shells/bash/bash-3.0-r3.ebuild | 134 +++++++++++++++++++++++ app-shells/bash/bash-3.0.ebuild | 117 -------------------- app-shells/bash/files/bash-3.0-etc-inputrc.patch | 39 +++++++ app-shells/bash/files/digest-bash-3.0 | 2 - app-shells/bash/files/digest-bash-3.0-r1 | 2 - app-shells/bash/files/digest-bash-3.0-r2 | 2 - app-shells/bash/files/digest-bash-3.0-r3 | 2 + 11 files changed, 195 insertions(+), 389 deletions(-) delete mode 100644 app-shells/bash/bash-3.0-r1.ebuild delete mode 100644 app-shells/bash/bash-3.0-r2.ebuild create mode 100644 app-shells/bash/bash-3.0-r3.ebuild delete mode 100644 app-shells/bash/bash-3.0.ebuild create mode 100644 app-shells/bash/files/bash-3.0-etc-inputrc.patch delete mode 100644 app-shells/bash/files/digest-bash-3.0 delete mode 100644 app-shells/bash/files/digest-bash-3.0-r1 delete mode 100644 app-shells/bash/files/digest-bash-3.0-r2 create mode 100644 app-shells/bash/files/digest-bash-3.0-r3 (limited to 'app-shells') diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 0984bcf1274f..54e50361b99f 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-shells/bash # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.43 2004/08/02 15:38:01 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.44 2004/08/02 18:17:59 agriffis Exp $ + +*bash-3.0-r3 (02 Aug 2004) + + 02 Aug 2004; Aron Griffis + +files/bash-3.0-etc-inputrc.patch, -bash-3.0-r1.ebuild, -bash-3.0-r2.ebuild, + +bash-3.0-r3.ebuild, -bash-3.0.ebuild: + Add patch to use /etc/inputrc automatically as a last resort if ~/.inputrc is + unavailable. This is better than using INPUTRC since that will override even + after the user creates ~/.inputrc. #38955 *bash-3.0-r2 (02 Aug 2004) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index cd27034373b2..b4a7539eb4c9 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -1,20 +1,17 @@ -MD5 9686cc71303eca610100ddbea78c859d bash-3.0-r1.ebuild 3485 +MD5 777d4d3233bd8685305fbbb65b5cca23 bash-3.0-r3.ebuild 3904 +MD5 d5e93e2cdb862776b175667e7fc5a218 ChangeLog 9614 MD5 9b26b6899167a29ee4e9c1ad0d39b5a1 bash-2.05b-r9.ebuild 2909 -MD5 ffb7966e9e7658be35568b2d021a0442 bash-3.0.ebuild 3125 -MD5 653b2246feb89586b4f27df4d19caa95 bash-3.0-r2.ebuild 3629 -MD5 9a9d87c21a38812e62c2d4ba5db6fb7d ChangeLog 9212 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 6a2f5ace1a2dd30b1bee55eba1509027 bash-2.05b-r10.ebuild 3041 +MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836 +MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897 +MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804 -MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0 128 +MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487 MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789 +MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r3 128 +MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461 MD5 92f8f2d44177d92edd757366dbd261dc files/bashrc 761 -MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459 -MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487 -MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r1 128 -MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r2 128 -MD5 280727f35468e5deaadec039679ee5e8 files/bash-3.0-invisible.patch 601 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r10 461 -MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461 -MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836 -MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897 +MD5 280727f35468e5deaadec039679ee5e8 files/bash-3.0-invisible.patch 601 +MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223 diff --git a/app-shells/bash/bash-3.0-r1.ebuild b/app-shells/bash/bash-3.0-r1.ebuild deleted file mode 100644 index fec138bfca10..000000000000 --- a/app-shells/bash/bash-3.0-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r1.ebuild,v 1.2 2004/07/29 02:57:05 ciaranm Exp $ - -inherit eutils flag-o-matic gnuconfig - -# Official patches -PLEVEL="" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://www.gnu.org/software/bash/bash.html" -SRC_URI="ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz - mirror://gnu/bash/${P}.tar.gz - mirror://gentoo/${P}-gentoo.diff.bz2 - ${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sparc" -IUSE="nls build uclibc" - -DEPEND=">=sys-libs/ncurses-5.2-r2" - -src_unpack() { - unpack ${P}.tar.gz - - cd ${S} - epatch ${DISTDIR}/${P}-gentoo.diff.bz2 - - # Remove autoconf dependency - sed -i -e "/&& autoconf/d" Makefile.in - - # Readline is slow with multibyte locale, bug #19762 - # (No longer applies to bash-3.0) - #epatch ${FILESDIR}/${P}-multibyte-locale.patch - - # Segfault on empty herestring - # (Fixed in bash-3.0 with STRLEN instead of strlen) - #epatch ${FILESDIR}/${P}-empty-herestring.patch - - # Fix broken rbash functionality - # (Fixed in bash-3.0) - #epatch ${FILESDIR}/${P}-rbash.patch - - # Fix parallel make, bug #41002. - # (Added to bash-3.0-gentoo.diff.bz2) - #epatch ${FILESDIR}/${P}-parallel-build.patch - - # Revert trap behavior for the sake of autoconf-generated configure scripts. - # The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0' - # doesn't work because the bash developers are trying to adhere to POSIX in - # that case. Since all the configure scripts are #!/bin/sh, this breaks - # them - epatch ${FILESDIR}/${P}-posixtrap.patch - - # Enable SSH_SOURCE_BASHRC (#24762) - echo '#define SSH_SOURCE_BASHRC' >> config-top.h - - # Enable system-wide bashrc (#26952) - echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h - - # Force pgrp synchronization - # (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653) - # - # The session will hang cases where you 'su' (not 'su -') and - # then run a piped command in emacs. - # This problem seem to happen due to scheduler changes kernel - # side - although reproduceble with later 2.4 kernels, it is - # especially easy with 2.6 kernels. - echo '#define PGRP_PIPE 1' >> config-bot.h - - gnuconfig_update -} - -src_compile() { - filter-flags -malign-double - - local myconf= - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - # - # Martin Schlemmer (1 Sep 2002) - #use readline && myconf="--with-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 use with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - econf \ - --disable-profiling \ - --with-curses \ - --without-gnu-malloc \ - ${myconf} || die - - make || die -} - -src_install() { - einstall || die - - dodir /bin - mv ${D}/usr/bin/bash ${D}/bin - dosym bash /bin/sh - dosym bash /bin/rbash - - use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug* - - insinto /etc/bash - doins ${FILESDIR}/bashrc - - if use build; then - rm -rf ${D}/usr - else - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K - dodoc doc/FAQ doc/INTRO - - dosym bash.info.gz /usr/share/info/bashref.info.gz - fi -} diff --git a/app-shells/bash/bash-3.0-r2.ebuild b/app-shells/bash/bash-3.0-r2.ebuild deleted file mode 100644 index fab28664b1ef..000000000000 --- a/app-shells/bash/bash-3.0-r2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r2.ebuild,v 1.1 2004/08/02 15:38:01 agriffis Exp $ - -inherit eutils flag-o-matic gnuconfig - -# Official patches -PLEVEL="" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://www.gnu.org/software/bash/bash.html" -SRC_URI="ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz - mirror://gnu/bash/${P}.tar.gz - mirror://gentoo/${P}-gentoo.diff.bz2 - ${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sparc" -IUSE="nls build uclibc" - -DEPEND=">=sys-libs/ncurses-5.2-r2" - -src_unpack() { - unpack ${P}.tar.gz - - cd ${S} - epatch ${DISTDIR}/${P}-gentoo.diff.bz2 - - # Remove autoconf dependency - sed -i -e "/&& autoconf/d" Makefile.in - - # Readline is slow with multibyte locale, bug #19762 - # (No longer applies to bash-3.0) - #epatch ${FILESDIR}/${P}-multibyte-locale.patch - - # Segfault on empty herestring - # (Fixed in bash-3.0 with STRLEN instead of strlen) - #epatch ${FILESDIR}/${P}-empty-herestring.patch - - # Fix broken rbash functionality - # (Fixed in bash-3.0) - #epatch ${FILESDIR}/${P}-rbash.patch - - # Fix parallel make, bug #41002. - # (Added to bash-3.0-gentoo.diff.bz2) - #epatch ${FILESDIR}/${P}-parallel-build.patch - - # Revert trap behavior for the sake of autoconf-generated configure scripts. - # The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0' - # doesn't work because the bash developers are trying to adhere to POSIX in - # that case. Since all the configure scripts are #!/bin/sh, this breaks - # them - epatch ${FILESDIR}/${P}-posixtrap.patch - - # Patch display.c so that only invisible characters actually on the first - # line are counted in it - epatch ${FILESDIR}/${P}-invisible.patch - - # Enable SSH_SOURCE_BASHRC (#24762) - echo '#define SSH_SOURCE_BASHRC' >> config-top.h - - # Enable system-wide bashrc (#26952) - echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h - - # Force pgrp synchronization - # (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653) - # - # The session will hang cases where you 'su' (not 'su -') and - # then run a piped command in emacs. - # This problem seem to happen due to scheduler changes kernel - # side - although reproduceble with later 2.4 kernels, it is - # especially easy with 2.6 kernels. - echo '#define PGRP_PIPE 1' >> config-bot.h - - gnuconfig_update -} - -src_compile() { - filter-flags -malign-double - - local myconf= - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - # - # Martin Schlemmer (1 Sep 2002) - #use readline && myconf="--with-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 use with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - econf \ - --disable-profiling \ - --with-curses \ - --without-gnu-malloc \ - ${myconf} || die - - make || die -} - -src_install() { - einstall || die - - dodir /bin - mv ${D}/usr/bin/bash ${D}/bin - dosym bash /bin/sh - dosym bash /bin/rbash - - use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug* - - insinto /etc/bash - doins ${FILESDIR}/bashrc - - if use build; then - rm -rf ${D}/usr - else - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K - dodoc doc/FAQ doc/INTRO - - dosym bash.info.gz /usr/share/info/bashref.info.gz - fi -} diff --git a/app-shells/bash/bash-3.0-r3.ebuild b/app-shells/bash/bash-3.0-r3.ebuild new file mode 100644 index 000000000000..dbd7b0c3b25f --- /dev/null +++ b/app-shells/bash/bash-3.0-r3.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r3.ebuild,v 1.1 2004/08/02 18:17:59 agriffis Exp $ + +inherit eutils flag-o-matic gnuconfig + +# Official patches +PLEVEL="" + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://www.gnu.org/software/bash/bash.html" +SRC_URI="ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz + mirror://gnu/bash/${P}.tar.gz + mirror://gentoo/${P}-gentoo.diff.bz2 + ${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sparc" +IUSE="nls build uclibc" + +DEPEND=">=sys-libs/ncurses-5.2-r2" + +src_unpack() { + unpack ${P}.tar.gz + + cd ${S} + epatch ${DISTDIR}/${P}-gentoo.diff.bz2 + + # Remove autoconf dependency + sed -i -e "/&& autoconf/d" Makefile.in + + # Readline is slow with multibyte locale, bug #19762 + # (No longer applies to bash-3.0) + #epatch ${FILESDIR}/${P}-multibyte-locale.patch + + # Segfault on empty herestring + # (Fixed in bash-3.0 with STRLEN instead of strlen) + #epatch ${FILESDIR}/${P}-empty-herestring.patch + + # Fix broken rbash functionality + # (Fixed in bash-3.0) + #epatch ${FILESDIR}/${P}-rbash.patch + + # Fix parallel make, bug #41002. + # (Added to bash-3.0-gentoo.diff.bz2) + #epatch ${FILESDIR}/${P}-parallel-build.patch + + # Revert trap behavior for the sake of autoconf-generated configure scripts. + # The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0' + # doesn't work because the bash developers are trying to adhere to POSIX in + # that case. Since all the configure scripts are #!/bin/sh, this breaks + # them + epatch ${FILESDIR}/${P}-posixtrap.patch + + # Patch display.c so that only invisible characters actually on the first + # line are counted in it + epatch ${FILESDIR}/${P}-invisible.patch + + # Patch readline's bind.c so that /etc/inputrc is read as a last resort + # following ~/.inputrc. This is better than putting INPUTRC in + # the environment because INPUTRC will override even after the + # user creates a ~/.inputrc + epatch ${FILESDIR}/${P}-etc-inputrc.patch + + # Enable SSH_SOURCE_BASHRC (#24762) + echo '#define SSH_SOURCE_BASHRC' >> config-top.h + + # Enable system-wide bashrc (#26952) + echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h + + # Force pgrp synchronization + # (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653) + # + # The session will hang cases where you 'su' (not 'su -') and + # then run a piped command in emacs. + # This problem seem to happen due to scheduler changes kernel + # side - although reproduceble with later 2.4 kernels, it is + # especially easy with 2.6 kernels. + echo '#define PGRP_PIPE 1' >> config-bot.h + + gnuconfig_update +} + +src_compile() { + filter-flags -malign-double + + local myconf= + + # Always use the buildin readline, else if we update readline + # bash gets borked as readline is usually not binary compadible + # between minor versions. + # + # Martin Schlemmer (1 Sep 2002) + #use readline && myconf="--with-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 use with bugs ;). + #use static && export LDFLAGS="${LDFLAGS} -static" + use nls || myconf="${myconf} --disable-nls" + + econf \ + --disable-profiling \ + --with-curses \ + --without-gnu-malloc \ + ${myconf} || die + + make || die +} + +src_install() { + einstall || die + + dodir /bin + mv ${D}/usr/bin/bash ${D}/bin + dosym bash /bin/sh + dosym bash /bin/rbash + + use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug* + + insinto /etc/bash + doins ${FILESDIR}/bashrc + + if use build; then + rm -rf ${D}/usr + else + doman doc/*.1 + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K + dodoc doc/FAQ doc/INTRO + + dosym bash.info.gz /usr/share/info/bashref.info.gz + fi +} diff --git a/app-shells/bash/bash-3.0.ebuild b/app-shells/bash/bash-3.0.ebuild deleted file mode 100644 index f604c823ba22..000000000000 --- a/app-shells/bash/bash-3.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0.ebuild,v 1.3 2004/07/29 01:47:45 ciaranm Exp $ - -inherit eutils flag-o-matic gnuconfig - -# Official patches -PLEVEL="" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://www.gnu.org/software/bash/bash.html" -SRC_URI="ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz - mirror://gnu/bash/${P}.tar.gz - mirror://gentoo/${P}-gentoo.diff.bz2 - ${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390" -IUSE="nls build uclibc" - -DEPEND=">=sys-libs/ncurses-5.2-r2" - -src_unpack() { - unpack ${P}.tar.gz - - cd ${S} - epatch ${DISTDIR}/${P}-gentoo.diff.bz2 - - # Remove autoconf dependency - sed -i -e "/&& autoconf/d" Makefile.in - - # Readline is slow with multibyte locale, bug #19762 - # (No longer applies to bash-3.0) - #epatch ${FILESDIR}/${P}-multibyte-locale.patch - - # Segfault on empty herestring - # (Fixed in bash-3.0 with STRLEN instead of strlen) - #epatch ${FILESDIR}/${P}-empty-herestring.patch - - # Fix broken rbash functionality - # (Fixed in bash-3.0) - #epatch ${FILESDIR}/${P}-rbash.patch - - # Fix parallel make, bug #41002. - # (Added to bash-3.0-gentoo.diff.bz2) - #epatch ${FILESDIR}/${P}-parallel-build.patch - - # Enable SSH_SOURCE_BASHRC (#24762) - echo '#define SSH_SOURCE_BASHRC' >> config-top.h - - # Enable system-wide bashrc (#26952) - echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h - - # Force pgrp synchronization - # (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653) - # - # The session will hang cases where you 'su' (not 'su -') and - # then run a piped command in emacs. - # This problem seem to happen due to scheduler changes kernel - # side - although reproduceble with later 2.4 kernels, it is - # especially easy with 2.6 kernels. - echo '#define PGRP_PIPE 1' >> config-bot.h - - gnuconfig_update -} - -src_compile() { - filter-flags -malign-double - - local myconf= - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - # - # Martin Schlemmer (1 Sep 2002) - #use readline && myconf="--with-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 use with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - econf \ - --disable-profiling \ - --with-curses \ - --without-gnu-malloc \ - ${myconf} || die - - make || die -} - -src_install() { - einstall || die - - dodir /bin - mv ${D}/usr/bin/bash ${D}/bin - dosym bash /bin/sh - dosym bash /bin/rbash - - use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug* - - insinto /etc/bash - doins ${FILESDIR}/bashrc - - if use build; then - rm -rf ${D}/usr - else - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K - dodoc doc/FAQ doc/INTRO - - dosym bash.info.gz /usr/share/info/bashref.info.gz - fi -} diff --git a/app-shells/bash/files/bash-3.0-etc-inputrc.patch b/app-shells/bash/files/bash-3.0-etc-inputrc.patch new file mode 100644 index 000000000000..4331bd1da609 --- /dev/null +++ b/app-shells/bash/files/bash-3.0-etc-inputrc.patch @@ -0,0 +1,39 @@ +--- bash-3.0/lib/readline/bind.c.agriffis 2004-03-03 22:39:32.000000000 -0500 ++++ bash-3.0/lib/readline/bind.c 2004-08-02 13:53:02.365731918 -0400 +@@ -781,6 +781,7 @@ + 1. the filename used for the previous call + 2. the value of the shell variable `INPUTRC' + 3. ~/.inputrc ++ 4. /etc/inputrc + If the file existed and could be opened and read, 0 is returned, + otherwise errno is returned. */ + int +@@ -789,17 +790,20 @@ + { + /* Default the filename. */ + if (filename == 0) ++ filename = last_readline_init_file; ++ if (filename == 0) ++ filename = sh_get_env_value ("INPUTRC"); ++ if (filename == 0 || *filename == 0) + { +- filename = last_readline_init_file; +- if (filename == 0) +- filename = sh_get_env_value ("INPUTRC"); +- if (filename == 0) +- filename = DEFAULT_INPUTRC; ++ /* If there's trouble reading DEFAULT_INPUTRC then fall back to ++ * the system inputrc ++ */ ++ filename = DEFAULT_INPUTRC; ++ if (_rl_read_init_file (filename, 0) == 0) ++ return 0; ++ filename = "/etc/inputrc"; + } + +- if (*filename == 0) +- filename = DEFAULT_INPUTRC; +- + #if defined (__MSDOS__) + if (_rl_read_init_file (filename, 0) == 0) + return 0; diff --git a/app-shells/bash/files/digest-bash-3.0 b/app-shells/bash/files/digest-bash-3.0 deleted file mode 100644 index b3fb57628169..000000000000 --- a/app-shells/bash/files/digest-bash-3.0 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293 -MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423 diff --git a/app-shells/bash/files/digest-bash-3.0-r1 b/app-shells/bash/files/digest-bash-3.0-r1 deleted file mode 100644 index b3fb57628169..000000000000 --- a/app-shells/bash/files/digest-bash-3.0-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293 -MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423 diff --git a/app-shells/bash/files/digest-bash-3.0-r2 b/app-shells/bash/files/digest-bash-3.0-r2 deleted file mode 100644 index b3fb57628169..000000000000 --- a/app-shells/bash/files/digest-bash-3.0-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293 -MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423 diff --git a/app-shells/bash/files/digest-bash-3.0-r3 b/app-shells/bash/files/digest-bash-3.0-r3 new file mode 100644 index 000000000000..b3fb57628169 --- /dev/null +++ b/app-shells/bash/files/digest-bash-3.0-r3 @@ -0,0 +1,2 @@ +MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293 +MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423 -- cgit v1.2.3-65-gdbad