From 122316da2203d7c67a5ec312e3afd64aed7d9f24 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 17 Feb 2006 12:20:23 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.1_pre4-r1 --- app-shells/bash/ChangeLog | 7 +- app-shells/bash/Manifest | 24 ++-- app-shells/bash/bash-3.1_p8.ebuild | 150 +++++++++++++++++++++++ app-shells/bash/files/digest-bash-3.1_p8 | 30 +++++ 4 files changed, 201 insertions(+), 10 deletions(-) create mode 100644 app-shells/bash/bash-3.1_p8.ebuild create mode 100644 app-shells/bash/files/digest-bash-3.1_p8 diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 436864aad20f..a0ed6a60379e 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-shells/bash # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.86 2006/02/04 20:01:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.87 2006/02/17 12:20:23 vapier Exp $ + +*bash-3.1_p8 (17 Feb 2006) + + 17 Feb 2006; Mike Frysinger +bash-3.1_p8.ebuild: + Version bump. *bash-3.1_p7 (04 Feb 2006) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 9c9e582ff0cd..1fb1495bf37e 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 28e2eeb1b7a1993bb1c04338cecd4d3f ChangeLog 17618 -RMD160 f38d36c1f0024b43542d8f2859ec803468838857 ChangeLog 17618 -SHA256 c27146e6d6fa90b65dc24bca7200e1c6c33b098a51084118faee87d1cddc8c4f ChangeLog 17618 +MD5 5ba3f4bd9b3fb580f6288dbc7797e2c9 ChangeLog 17734 +RMD160 79a4aa1b7622f1c54a4bb39412f13f48cb4d6437 ChangeLog 17734 +SHA256 bc237da46f16eb20ed90539d0eaa75ae0ac0987fb20e4ba9a245a6d7461e2786 ChangeLog 17734 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715 RMD160 6e1dd7bb036df1cf01047ece5680f339c4710b01 bash-2.05b-r11.ebuild 3715 SHA256 5fe858f7ac8dfa5ef013a9d3161affb61eed8e24d0e73a45175c471fa673a115 bash-2.05b-r11.ebuild 3715 @@ -25,6 +25,9 @@ SHA256 4a76712a6ea41bd92b1032191d1538d1eba1dec14ee20b05b37469ea3f5e8dc1 bash-3.1 MD5 f6cecf3fbf049ea3a7060f2adeb58316 bash-3.1_p7.ebuild 4570 RMD160 497b0a730482785896c6443f1d48570da5ce4d78 bash-3.1_p7.ebuild 4570 SHA256 0b2bea3d1421c4512f46cca17533fb91532d341cf2a4f3a4dcd54f6bfc1d0792 bash-3.1_p7.ebuild 4570 +MD5 e5d6ed7d7035e0fe23c45d04d4181565 bash-3.1_p8.ebuild 4570 +RMD160 0064a69fec6e18aece9f9aa01c466e13d610fd38 bash-3.1_p8.ebuild 4570 +SHA256 721586c9edcb4716b08928a8b81ab344388d613b8c1c7e90c26adaf45a77ee36 bash-3.1_p8.ebuild 4570 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 files/bash-2.05b-empty-herestring.patch 836 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae files/bash-2.05b-empty-herestring.patch 836 @@ -157,9 +160,9 @@ SHA256 dfa4445169b8603e91bd0f9fec5d04e4f2408c561b343dbf188fe02500cd5fc4 files/ba MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 files/bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d files/bash_logout 205 -MD5 1f2890881a3a8c96772d60974d06fd42 files/bashrc 1709 -RMD160 07c50f8860fad9338c6f59c4335842094d4736bd files/bashrc 1709 -SHA256 733538df042624e5a490f9b80daceb77749211413220a0c5bf01eb5428dc3166 files/bashrc 1709 +MD5 addd22b9c7174a5220a350dc84cb738f files/bashrc 1680 +RMD160 1dfdb7eeff2472d704ba501da788f73bc279df3c files/bashrc 1680 +SHA256 1f09fdc8861d1d68753f40391d2f48b984ff4e2a3572742dbd176eb5965f0cce files/bashrc 1680 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461 RMD160 6a4a8794e2627f5bb30599ead9dbc0973ab3aa85 files/digest-bash-2.05b-r11 461 SHA256 a9db7d9ad9ebcbdd48183c02a14babe94598a4dc4f3f1baaddfab63281141fb1 files/digest-bash-2.05b-r11 461 @@ -181,6 +184,9 @@ SHA256 9fc092f9ea8a9407064ddde7abbc3fc492970339e506bba45810f836acacc117 files/di MD5 81258900e7f0c194a6bb45e2e5b8fef1 files/digest-bash-3.1_p7 1881 RMD160 49e6dbaeba2542add58b6dc72ab76608e2677bd8 files/digest-bash-3.1_p7 1881 SHA256 ce807d1a7875164c828bcbac4a463285b7dd7c2b4e1b5249d80a1c6060774460 files/digest-bash-3.1_p7 1881 +MD5 26bbafb0967d0878cf6699dfdb357d70 files/digest-bash-3.1_p8 2086 +RMD160 0d6af634b079529b801755ae988c5e1f752c9084 files/digest-bash-3.1_p8 2086 +SHA256 99fc985568db3f47b1eba8a5de5d83521e9b9c441c78415e86c30fb410f35419 files/digest-bash-3.1_p8 2086 MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 files/dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 files/dot-bash_logout 127 @@ -199,7 +205,7 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFD7myG2+ySkm8kpY0RArr7AJ9R0r0k3cqej2BJVfHqEgA7R13GZwCfRr6g -PrpSJ/jZ/f0wsZW5OmUy/JQ= -=a7Ya +iD8DBQFD9b+X2+ySkm8kpY0RAq5uAKCNP4arLtBnrDAWC6gvtOqsTIswCwCeLI// +V/zYzvjw4TxlP6KkfD8dusA= +=aygn -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-3.1_p8.ebuild b/app-shells/bash/bash-3.1_p8.ebuild new file mode 100644 index 000000000000..83e0dfb44ab7 --- /dev/null +++ b/app-shells/bash/bash-3.1_p8.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p8.ebuild,v 1.1 2006/02/17 12:20:23 vapier Exp $ + +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_P=${PN}-${MY_PV} +READLINE_VER=5.1 +READLINE_PLEVEL=1 + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" +# Hit the GNU mirrors before hitting Chet's site +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz + ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz + $(for ((i=1; i<=PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + done) + $(for ((i=1; i<=READLINE_PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \ + ${READLINE_VER} ${READLINE_VER/\.} ${i} + printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \ + ${READLINE_VER} ${READLINE_VER/\.} ${i} + done)" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="afs nls build bashlogger unicode" + +DEPEND=">=sys-libs/ncurses-5.2-r2" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch + + # Include official patches + local i + for ((i=1; i<=PLEVEL; i++)); do + epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i}) + done + cd lib/readline + for ((i=1; i<=READLINE_PLEVEL; i++)); do + epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i}) + done + cd ../.. + + # Fall back to /etc/inputrc + epatch "${FILESDIR}"/${PN}-3.0-etc-inputrc.patch + # Add more ulimit options (from Fedora) + epatch "${FILESDIR}"/${MY_P}-ulimit.patch + # Fix a memleak in read_builtin (from Fedora) + epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch + # Don't barf on handled signals in scripts + epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch + # Fix -/bin/bash login shell #118257 + epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch +# # Fix generation of signals list when cross-compiling +# epatch "${FILESDIR}"/${PN}-3.0-cross-signals.patch + # Log bash commands to syslog #91327 + if use bashlogger ; then + echo + 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 + + epatch "${FILESDIR}"/${PN}-3.0-configs.patch + + sed -i 's:-lcurses:-lncurses:' configure || die "sed configure" +} + +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. + #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 use 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 + export bash_cv_termcap_lib=libcurses + myconf="${myconf} --with-ncurses" + + econf \ + $(use_with afs) \ + --disable-profiling \ + --without-gnu-malloc \ + ${myconf} || die + emake -j1 || die "make failed" # see bug 102426 +} + +src_install() { + einstall || die + + dodir /bin + mv "${D}"/usr/bin/bash "${D}"/bin/ + [[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh + 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 + + if use build ; then + rm -rf "${D}"/usr + else + doman doc/*.1 + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO + dosym bash.info.gz /usr/share/info/bashref.info.gz + fi +} + +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 + + # our bash_logout is just a place holder so dont + # force users to go through etc-update all the time + if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then + rm -f "${D}"/etc/bash/bash_logout + fi +} diff --git a/app-shells/bash/files/digest-bash-3.1_p8 b/app-shells/bash/files/digest-bash-3.1_p8 new file mode 100644 index 000000000000..9bdd931d78f0 --- /dev/null +++ b/app-shells/bash/files/digest-bash-3.1_p8 @@ -0,0 +1,30 @@ +MD5 ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz 2533934 +RMD160 cbeda56312b3f623684b2099b711bb7592e0eda1 bash-3.1.tar.gz 2533934 +SHA256 d6952b2c38f9bf417559dd3b071860e1099ddfb8a12c0228f22afaf47f79d3b9 bash-3.1.tar.gz 2533934 +MD5 c0d33bdfed6e4e6a9ae9200b77cd5c99 bash31-001 2708 +RMD160 0d071aeade45c1706f4061774bb486d9a2ba7dae bash31-001 2708 +SHA256 3b6d9151ca7a45dbcf43ebd1c6a647ef90c4b8eb54a245936fd6ffadc61fe727 bash31-001 2708 +MD5 0c9be3bad344d04b79c4eac9eb39624c bash31-002 7169 +RMD160 9b03b62c9eb1ba2a574467c6a2950b3b933794e1 bash31-002 7169 +SHA256 ecd248b1ca027368dae967502af5b28019eeee8fa3ee8d6a0210677789658f08 bash31-002 7169 +MD5 04750485f335972f7a980a1bfe048dba bash31-003 1324 +RMD160 1ee18374c2416407d1fa997ed99c5fc7f295cd62 bash31-003 1324 +SHA256 96cb8a42162a5876b2392b76fbfc78d073f50735e1e8a14e67e03b6e9c2b215d bash31-003 1324 +MD5 0c2856794ab16a4c224223c1964140c2 bash31-004 1470 +RMD160 b8182116ca8efc0bec9054694cac54045245a704 bash31-004 1470 +SHA256 a50ecd3f51e9a79f34855c68c61c9523fccb66da0870eade936cc1f64ba04415 bash31-004 1470 +MD5 943233d7227071fa040c8b9eb016fa0c bash31-005 1322 +RMD160 3e2583ebf0e4fc546cdcf8ccf8b987a100f71a7e bash31-005 1322 +SHA256 3b057498f01cb2b528a154b9043261cb059846b23222409f7de95a7971dc6664 bash31-005 1322 +MD5 68a41a9da7c669b4358837d06556a06f bash31-006 1561 +RMD160 608f650ef96c6f0e46395a21d9e30aba42fb33f9 bash31-006 1561 +SHA256 d155030ed49de27812d9ae01211283f7afe5e718ea4ed9babe1f121d25acf778 bash31-006 1561 +MD5 f6ca4950256fefd88d49c5702338e501 bash31-007 3254 +RMD160 ae865a7f4e0cbeb2022004d385c7c9d29dfe07a5 bash31-007 3254 +SHA256 fa89a6c808490e07cd7350ecb3390ce0ae6dc71d634c61c62991aafab97962c4 bash31-007 3254 +MD5 4fd01140cb5875fe020939aab02791f0 bash31-008 1422 +RMD160 9ec2f72649a1955593ab4ad98605ba323747367a bash31-008 1422 +SHA256 c30fe9da56261c7100c5b6794d4341b6b1fb6aa0ecc25b1010ac4ac25b07d1c7 bash31-008 1422 +MD5 63faf622820ca0828131c8b5aeac1e6a readline51-001 2042 +RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 readline51-001 2042 +SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 readline51-001 2042 -- 2.26.2