diff options
author | 2009-07-25 05:43:04 +0000 | |
---|---|---|
committer | 2009-07-25 05:43:04 +0000 | |
commit | f639accfdc7106a07b1a1d7eab5988a9a1064753 (patch) | |
tree | 6dd0fb692cf9f063642ba187aa1e6b41effda59a /app-shells | |
parent | Version bump. (diff) | |
download | historical-f639accfdc7106a07b1a1d7eab5988a9a1064753.tar.gz historical-f639accfdc7106a07b1a1d7eab5988a9a1064753.tar.bz2 historical-f639accfdc7106a07b1a1d7eab5988a9a1064753.zip |
Version bump #278907 by Lars Wendler.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 7 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 15 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p28.ebuild | 188 |
3 files changed, 204 insertions, 6 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 86df5915ab2b..9f1bd7b0a0a4 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-shells/bash # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.218 2009/05/29 23:07:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.219 2009/07/25 05:43:04 vapier Exp $ + +*bash-4.0_p28 (25 Jul 2009) + + 25 Jul 2009; Mike Frysinger <vapier@gentoo.org> +bash-4.0_p28.ebuild: + Version bump #278907 by Lars Wendler. 29 May 2009; Mike Frysinger <vapier@gentoo.org> bash-4.0_p24.ebuild, +files/bash-4.0-parallel-build.patch: diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 10a39bfdb7c6..0867d57af707 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -124,6 +124,10 @@ DIST bash40-021 1547 RMD160 057becc706b90a5c55d51baa425ee9546e3fa092 SHA1 a1c785 DIST bash40-022 1592 RMD160 a9c134b260cd4bde1d2c3352b52dcf5e0f333476 SHA1 7060344931a866b07754eb0b9d49039df4132053 SHA256 045a1dc71aa1863f73ad7be00ec4e18ee3c43c20fafe58d9e2c6c51592359012 DIST bash40-023 2148 RMD160 dbf73ebe9b63aceb61068a9f133a6d4a946af795 SHA1 e6ccdbc145f81209c04541cbfcb6ba561e7fe8ea SHA256 580b522375f762ca5ddf9dedb6431ef4a9b6e887ea25fc0ce152d747ae5ddc86 DIST bash40-024 3049 RMD160 484c6ef4e0bbe887ecff754db18aa25e62075529 SHA1 3471e683167980dcb297bebe17f34646df560ce6 SHA256 a59ebac47efe31b951e1732e4223cc725b2748c331bec98248355c5ac53717ab +DIST bash40-025 3435 RMD160 3fd64c752c3e9f32472455247de52fd08bee1182 SHA1 ccd98dbb09f13b240ca95986ec55ae5f43e359b3 SHA256 f77900d636033474bc15d39c4948515fdfe718164ea668edd64d8d4d5a8f6a08 +DIST bash40-026 1433 RMD160 5edce83d4910e1fadc004f0b35b1a84d624a2dfc SHA1 39a9e0233efd5828f92ec7625643557fe628fe06 SHA256 a9bdf4409c6625561884be58026a52ccb47600407f3d5b8d0889f0585040f6cb +DIST bash40-027 2010 RMD160 99a2ba5a9b13d80039982966f7d18533387f66b1 SHA1 50976ef737ce3c01957a058ef5b496e152ebe7ac SHA256 f65dc26bb1bacc8a66610cd5f6f2b8e70be8d8c4e397e7a5ad6f3306224b77f2 +DIST bash40-028 5567 RMD160 bc99e904e251a1f30a94359afc42ca2225fb4f29 SHA1 bb3d83b79ed357c86bf75fc41eaf06e913e84c10 SHA256 5b222cbaf3ab1c1d9b4c5956a0e28cad49660f5746af08efe174e7b474022d1a DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 EBUILD bash-3.1_p17.ebuild 4645 RMD160 245995f2f904f40713448e8be3677bc631eeb445 SHA1 3e6dd73b339da296b13188c54577aeb5573ebc2a SHA256 08c3ac21cb84e82d7d07d8e21a47e0551e5f771d7723cbc1e7a9eae3b380c881 EBUILD bash-3.2_p39.ebuild 5977 RMD160 c053f7f72dbbc9831794da77d4b93c52c1aab8f3 SHA1 f65b817fa66d0c8f9e125291b5a0c1efa66ab2b2 SHA256 ca54172de85e0834ea52d81db2471d1e6d993eb17705191e0ca9e3107c1c45ee @@ -134,12 +138,13 @@ EBUILD bash-4.0_p10.ebuild 6230 RMD160 0cbd5c35482c601757ac4a73710a675fd3f6351b EBUILD bash-4.0_p17-r1.ebuild 5648 RMD160 c83adb9c8b3c8cd4ff2ee9b56797c992cc4e86e6 SHA1 61bd4ddefb0145d685145bd33ec2264e3fc3dce7 SHA256 6a33af89e89548c0671ec416ebe41b9cd707164c17b4bccac6779ebe36445086 EBUILD bash-4.0_p17.ebuild 5532 RMD160 7fc209d153ffeeb0e29e1f12bbfe71748e69f5d8 SHA1 140a2ec331f365c22cc1ab0ce7b6990dd464a8af SHA256 b712cfde5fa006a7d67130db7ebe50bba4b1535163c50bbb6226d748f5eb4561 EBUILD bash-4.0_p24.ebuild 5660 RMD160 efa4a9be39b74879792a39138d52fce6f7d969c2 SHA1 38d57779acf3e3f9ea77463fca422c86020f441b SHA256 bcf9a6c93480b2a54bc23d45354a0fbbbfc86854bd9413d49e188a902a08ecfe -MISC ChangeLog 35666 RMD160 3bd4041549ebe5e77908232335666a5890e45ac3 SHA1 f18d73a387f7958ce737c4b71cbc0dae32ffeef2 SHA256 6f5c05d6fa1c46f42115e87a27a2620c86a02f763a168893baf7d6b48ee85743 +EBUILD bash-4.0_p28.ebuild 5660 RMD160 95781bd4c79d7e068c8c25816a0b3ada02fcd399 SHA1 34f17d5be7dcbec6b4e295a8d05dfff919397540 SHA256 6c89bb2554833828fb7d10aae34ff777aa70d58e273d52d0b3069f4c4d023840 +MISC ChangeLog 35808 RMD160 0ccfac27d5fbf1000ab45da798ea0100cd43358a SHA1 d3332c39c6aee5005250fc5751a59c50a4e6612c SHA256 f81d96969995628df6c5b88ab9c8d583c5b78c34f201c9d5fddd747091379910 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.12 (GNU/Linux) -iEYEARECAAYFAkogatQACgkQn/5bYzqsSmFYLwCdGNeqPCY/0bAU2Gy98kUeb311 -OcEAnAhgiFWb1lZpIXgZhsm7bqbV7qHL -=KOae +iEYEARECAAYFAkpqm28ACgkQlPl3HsVfCDrmAQCeMZQ4yihBId4q2UiadI6Y/BVW +3sMAmgOyeKnCaHQM3X+NWm/Gj30OqJNY +=/EbG -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.0_p28.ebuild b/app-shells/bash/bash-4.0_p28.ebuild new file mode 100644 index 000000000000..6b65c2c1f676 --- /dev/null +++ b/app-shells/bash/bash-4.0_p28.ebuild @@ -0,0 +1,188 @@ +# 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_p28.ebuild,v 1.1 2009/07/25 05:43:04 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 +} |