diff options
author | 2012-05-03 15:57:10 +0000 | |
---|---|---|
committer | 2012-05-03 15:57:10 +0000 | |
commit | 147672a3a55e713904ae1b86402d367f35605442 (patch) | |
tree | 73b3f584f0c6fdb53416fa86b39eac8bd44645bb /app-shells | |
parent | [bump] dev-perl/Statistics-Descriptive-3.50.0 (diff) | |
download | historical-147672a3a55e713904ae1b86402d367f35605442.tar.gz historical-147672a3a55e713904ae1b86402d367f35605442.tar.bz2 historical-147672a3a55e713904ae1b86402d367f35605442.zip |
Version bump #414449 by Lars Wendler (Polynomial-C).
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 7 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 23 | ||||
-rw-r--r-- | app-shells/bash/bash-4.2_p28.ebuild | 200 |
3 files changed, 225 insertions, 5 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 9cf3d8263229..ba3aa4eb5797 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-shells/bash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.310 2012/04/26 13:22:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.311 2012/05/03 15:57:10 vapier Exp $ + +*bash-4.2_p28 (03 May 2012) + + 03 May 2012; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p28.ebuild: + Version bump #414449 by Lars Wendler (Polynomial-C). 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> bash-4.2_p24-r1.ebuild: keyword ~amd64-fbsd diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 61eb8cb5aea3..e020cccce51b 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -182,6 +182,10 @@ DIST bash42-021 1532 RMD160 5e04fb17e658ccdbc9d5639a9db3469f8d08bd8f SHA1 55aabc DIST bash42-022 1395 RMD160 489afe20e2aaa93fe9c1643bd782f5f69b34de63 SHA1 f2e7ff4050dce9ff5893cd027716caf22d17f369 SHA256 9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b DIST bash42-023 1699 RMD160 017b54aed0d5f054bc0d279400117bda5a0f37fe SHA1 16224bc48c89df4dff22b8365e7d1d295f4adc9b SHA256 5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf DIST bash42-024 1363 RMD160 438fd0bff89a439ce0fea1a128abf6c836c30e87 SHA1 a78b4c48d0f372280ebe137b15bc3ef8807f7f8b SHA256 99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6 +DIST bash42-025 3969 RMD160 538e9f2f6e9e6315d4fcfb3bc08d1aee9618c9f5 SHA1 c1362e8405fe09773f189488e9fae5f3e2b0a0d0 SHA256 0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515 +DIST bash42-026 1577 RMD160 32dd5da47a149bc9369272e1e792c35e9d4a84c4 SHA1 d976cd03a3d6a0006b498dd3531a85dfe88b57c0 SHA256 e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2 +DIST bash42-027 1461 RMD160 bb7546341f7c65b016cf20d164f5ebf69107c8f0 SHA1 baad3c5f1f3c20c96bf7cd6cf932b4e8abc1f0c5 SHA256 0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42 +DIST bash42-028 1834 RMD160 71071124dd5124341bd01f8c10d577d477a731a9 SHA1 c63104992b8f95ef966dc8604f89b0bc595d0d08 SHA256 204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 EBUILD bash-3.1_p17.ebuild 4642 RMD160 c3b239d492a873c3727f743d3cd6011439863de6 SHA1 8c93c595193c4ef909c008b0aff39459184f802c SHA256 e8178f2c3a8505e11390721a552c28173adca3250c8195f4ad63a05a794f02a6 EBUILD bash-3.2_p51.ebuild 5862 RMD160 c87e550711c01672fd2f99da2d1ae38ccad33008 SHA1 b4a0219bab848ea9090134f862257370b97650fe SHA256 2ded1efa635872ac5f01e27b390bd2d67b4e4867d52680074214ae8c3cac04ae @@ -194,13 +198,24 @@ EBUILD bash-4.2_p10.ebuild 5604 RMD160 82d81068ca21f03dfa36e3f8e4b1506e91ef4a4d EBUILD bash-4.2_p20.ebuild 5965 RMD160 5bf3f3fa892d5490c8dec13518ebaa9d573b2d89 SHA1 e2fd1482e2c21be4f57ca78cd761b684cc5a88b3 SHA256 3c9e66d81250a771e0334626cb760da2b4c980f5338dfec24bc27f378009d0f9 EBUILD bash-4.2_p24-r1.ebuild 6233 RMD160 ce672ded63c0e5425b9b27dcca63eb0e3457d0cc SHA1 35b76dccc7ce6f8f41c9d01e12d63f502d8b801a SHA256 43f04b00dc64076bc51c26f0c8042b8a3929f118f08a796d6c38a16fb8f49275 EBUILD bash-4.2_p24.ebuild 6152 RMD160 d2be7aa161ce2aa2ae8e291374576faa71be0690 SHA1 e7dcab1502f6ad69738129a913b5e7649512baa9 SHA256 166ea998731dc9e06d4f56358b7cd3d0c5dc8a6e596c2efead28c9c5abbb6dec +EBUILD bash-4.2_p28.ebuild 6164 RMD160 f0d6479150079c1b896d646dab4f3d83d7770ede SHA1 39073758a479466be232e3de28efed4263a85a3e SHA256 60f0fb6072f8bfe680ed385c9e137eea0a89181b8920e802d19d1a2072783030 EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105 -MISC ChangeLog 47636 RMD160 e4a1fe9ded21323ff1ca43ddb6c30a3ddf06fa41 SHA1 bca5d162e2fa08d6cfe41d9c2c231dc9e5f163a3 SHA256 4b6998ac2013b396d3fa2588b8f3395d6deafaf73ddd53984fea02c38237aad2 +MISC ChangeLog 47791 RMD160 dc6746b6e895ba351d435e7e49cf72a94e7f8ddb SHA1 8fb16c017671475ce791af884280a7ea14a14bec SHA256 045e0087709dff2be6024b9d4715868daec70293511543841268924080d43a1c MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+ZTAkACgkQvFcC4BYPU0qlKQCfSYiELBDEcjjIIYSLWIWEwSXZ -7U0An3T0Y8UBtFrNr8qKOc5a4GrGXSlA -=FUbB +iQIcBAEBAgAGBQJPoqsQAAoJELEHsLL7fEFWVxIP/2EKHjTNI39QsI+ly/Mv9bO+ ++YVbBcK+U80ijY5b+BzdX5fEonA2pf7W9ap4VAWI9e5EN8CiNsLb5koAujKMwFGq +V4NLPU9GTjUmq3ZluxWFZZ90p3weeXo1IuedqUqusyAtpaZiE1b4qZTs3xuc/5/f +zPxs1Znkxh7fzBm9oSSQGfYUl75vAp6h38qRiXREmgDK7Uz+cjj44tobdfo/JpV3 +/K5pHQiQp0DLk7sdj9YzIBvwIgOvqvC7imYwh9HVdzRoPS7Tew1BtRDBLmFXZESM +Xq1x4WrZKGUN6YzeWHv+SbGZP6nvIwDCBJOvilI4hJtUwpzeUvZ8bdJ0Lba3tG+l +EhNmab9xt7WNxyCxk677/xYMoOMGuJ+GaGURv2jWyAz6MIbzpYcjxElJ0zFgD1TU +qsjguHoKvn46PuNegTkob18UVaXeGCPWggpK8EWWleomiOEyxGrV1PbUkOhfCD/i +N3Nlr7SQQBFiWeAcvnTB3zLIp9FWe0ot65s3JtNs4R+Chqxq+fqufR0rxU4GnV/z +F0EvVreNFyopiE9KMZjS05KCrFN1dqeKFc+9hb6lSTxEnFJfw+6ZD9pZkIcpGIgx +Mx2GRB6RIOIikt5WBy+/Dcbs8Y2OFiK1u/3IYg4g1hIkeNBylrwnVZB/grkrVgqE +2ms4T0PctXU1pDoNdHkX +=kkNd -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p28.ebuild b/app-shells/bash/bash-4.2_p28.ebuild new file mode 100644 index 000000000000..7677072c71e7 --- /dev/null +++ b/app-shells/bash/bash-4.2_p28.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p28.ebuild,v 1.1 2012/05/03 15:57:10 vapier Exp $ + +EAPI="1" + +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 ~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} + !<sys-apps/portage-2.1.7.16 + !<sys-apps/paludis-0.26.0_alpha5" +# we only need yacc when the .y files get patched (bash42-005) +DEPEND+=" virtual/yacc" + +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 + 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." + fi +} + +src_unpack() { + unpack ${MY_P}.tar.gz + cd "${S}" + + # 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 + + # Avoid regenerating docs after patches #407985 + sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die + touch -r . doc/* + + epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237 + epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch + epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch +} + +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 \ + $(use bashlogger && echo -DSYSLOG_HISTORY) + + # 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" + + # 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 :(. + + use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash + 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} + emake || die + + 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) + local tmp=$(emktemp "${ROOT}"/bin) + ln -sf "${target}" "${tmp}" + mv -f "${tmp}" "${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 +} |