diff options
author | 2012-03-12 14:57:40 +0000 | |
---|---|---|
committer | 2012-03-12 14:57:40 +0000 | |
commit | 9829b5b1889955e015db217344dde203a6bf9795 (patch) | |
tree | 26007bf40e96006073ea9ad2c168b2fe93c67d8b /app-shells/bash | |
parent | x86 stable wrt bug #407549 (diff) | |
download | historical-9829b5b1889955e015db217344dde203a6bf9795.tar.gz historical-9829b5b1889955e015db217344dde203a6bf9795.tar.bz2 historical-9829b5b1889955e015db217344dde203a6bf9795.zip |
Version bump #407927 by Lars Wendler (Polynomial-C).
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'app-shells/bash')
-rw-r--r-- | app-shells/bash/ChangeLog | 10 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 27 | ||||
-rw-r--r-- | app-shells/bash/bash-4.2_p20.ebuild | 41 | ||||
-rw-r--r-- | app-shells/bash/bash-4.2_p24.ebuild | 189 |
4 files changed, 240 insertions, 27 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 329b1267b74a..60c3dcb88fa3 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-shells/bash -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.294 2011/11/24 00:06:53 vapier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.295 2012/03/12 14:57:40 vapier Exp $ + +*bash-4.2_p24 (12 Mar 2012) + + 12 Mar 2012; Mike Frysinger <vapier@gentoo.org> bash-4.2_p20.ebuild, + +bash-4.2_p24.ebuild: + Version bump #407927 by Lars Wendler (Polynomial-C). *bash-4.2_p20 (24 Nov 2011) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 12fbb84eef38..2d6fd7f719ee 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f @@ -176,6 +176,10 @@ DIST bash42-017 1399 RMD160 b352a79b20d8cc6bc80b65b30ce36e4c456780e9 SHA1 f80797 DIST bash42-018 1929 RMD160 06e93430b076de51e68f679054540d202ad241c5 SHA1 3624c31ed7d8c613b566e3d465480beed34bdaba SHA256 e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d DIST bash42-019 1415 RMD160 7dc05011b79f37553c4a669ba929c55a18727ea9 SHA1 21a75dadb1398775b48718e94785642f5fad9777 SHA256 a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56 DIST bash42-020 1825 RMD160 4a66e21e8288322b1aed7f0698a684f10f4934bb SHA1 5c4afeef6ef7321fcc5a08f2d3024c484868fa59 SHA256 494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f +DIST bash42-021 1532 RMD160 5e04fb17e658ccdbc9d5639a9db3469f8d08bd8f SHA1 55aabc84fdac1f3b26312f478fb9b7f14c81f2be SHA256 a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc +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 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 @@ -185,14 +189,25 @@ EBUILD bash-4.1_p11.ebuild 5660 RMD160 307a3558a0b42808eacdd776841833cc40606d3d EBUILD bash-4.1_p7.ebuild 5647 RMD160 d304c9b6eeb384f9baa4a84e262f4725a2fad7b0 SHA1 7bbd8c7145bd494ff86fde53b9ba63a9aa1dd3de SHA256 f5d0f3136170e346cd97f30cc735f1e007183c5ae73bedb12b596c5b26323feb EBUILD bash-4.1_p9.ebuild 5647 RMD160 a4735eb85dacda84c5e616c40b18d3bd6090c2b8 SHA1 fb124d72adcab6e86240cfc991c18eb0681333a1 SHA256 9dfe8f46a4e24aa1a994e886fae5a80228449b0471e0856368e521ad2fd36588 EBUILD bash-4.2_p10.ebuild 5604 RMD160 82d81068ca21f03dfa36e3f8e4b1506e91ef4a4d SHA1 65ae606556415c0cd82d1a8373aeb8574447650a SHA256 f0359ff78cd7c8b62e6e613779d83da25c158d430f2c54dee9c3d5fc2e1baf40 -EBUILD bash-4.2_p20.ebuild 5604 RMD160 0353a35bc0aa0d0f53697539525e18d93fa56949 SHA1 dbd29d2c0461e1c9cb5d93bd482a92d9e5806b9c SHA256 77c1ceba76e957a0f98a5a50599baf1b56408f05212429bed0ce29da337b562e +EBUILD bash-4.2_p20.ebuild 5701 RMD160 f488703c42fb33f1f5e1d629e46d7008f789f1de SHA1 f8193db20e9129cc3b6888ebb53a7c864e66718f SHA256 02146b8059ca1034e4cf5299c26a64b9a839ea00cfb8d072b42374b948c8b802 +EBUILD bash-4.2_p24.ebuild 5701 RMD160 f264ef16ce6df8f4e886662ed4c007b0266366b1 SHA1 8c3ae67017cbbc14477238125dd8e2ebecb37987 SHA256 ec64de8bf7a779fc71d86d6b76008654b7ea19ba9f9e1354ab1cc36223cfcb98 EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105 -MISC ChangeLog 45678 RMD160 9ff244b46464948928b62e0047c6c09b66d42aef SHA1 76f02a24ddd75eb55d6e3334a3e7423f6015d222 SHA256 d508caea0304d010bd2269958ad96991cea024fa9367280f509ccfc49fde3066 +MISC ChangeLog 45858 RMD160 9e571585bc2f285666301ad27b6fcc647cb5959e SHA1 1968cf1f6282d96c22a7e598f5719645fbac7c3f SHA256 a855e7ef17bcc842936e68377051dada61266d657e85f4050d2cc68696e23571 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7NiqwACgkQaC/OocHi7JbqgwD/RNj9XkQfTboqjSEVcm8TMDYI -umhsjwX/0j66ZuHe/tUA/iMfPMlz/pi7VH7BPy12FtvlAi9UNkwuICAY4x0HLJYc -=g88j +iQIcBAEBAgAGBQJPXg7uAAoJELEHsLL7fEFWQbsP/2tbBBLcUtucJpOMPLW9odCz +1VfCF/ElyCa/E/9eKxIQOmiPSr0oT6Ozwiiewhh2XSJL88jJeb9IDvt1QWZyj3Uh +HbfEOGUzM5JWgLMc13k9IVNxe/N/7gZ/lx/VdnSUN7SodnkwuwsWK9K0oQtv+Weh +y58MbgAtooX3uDXoO1JhdoenOGHtwXeiiSdaTyF1Povi3N10sQtP0/K7lkNn0rZ2 +z0ntb+TgNgsJEmTO4n2cmZTHiHZ+icAVjs+dSku0u0Xxo+h5IKCZEkgWcwty0rHh +KFglROMFtLlmJSjNj0l4n30dlXHDujNSSGraTsytPyB/hSmroIdMoyyND6JqLs1t +5zmEA/Ow2aWGqdsCGf62oIJk9B3EzVOru/Gu6dZJnn4bQSxqlsCxVyGLAotqtY14 +/Azko8eg1SizhdKxWvzwaY5/D4d03PhSuief64kB7XRoZwjO1p5vcFXEePd7qe3V +QToNeNn4+zFaQvf4ar8pOtDU7ly24zdgSLVnpxQ+72Oft2YMZGFUtxUeaj8y9tty +SrasflV9EQHjnIHHuv5F6UypcSH3spGr6oPDa4kAlD/XLHU4Yb1AjtysRjvqA6++ +UdGCPuJGQkG/l1sB/csqWbYEwqk0PorYS6/pLivcjp3uZaiFe9KLB9cXG7xEzn/J +hd1z/w7NH/7gmHeQpKv5 +=lyV6 -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild index 3fbd3c2986c4..c08ffc7cb639 100644 --- a/app-shells/bash/bash-4.2_p20.ebuild +++ b/app-shells/bash/bash-4.2_p20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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_p20.ebuild,v 1.1 2011/11/24 00:06:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.2 2012/03/12 14:57:40 vapier Exp $ EAPI="1" @@ -13,8 +13,6 @@ MY_PV=${PV/_p*} MY_PV=${MY_PV/_/-} MY_P=${PN}-${MY_PV} [[ ${PV} != *_p* ]] && PLEVEL=0 -READLINE_VER=6.1 -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 @@ -32,8 +30,7 @@ patches() { 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) - $(patches ${READLINE_PLEVEL} readline ${READLINE_VER})" +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" LICENSE="GPL-3" SLOT="0" @@ -41,6 +38,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla" DEPEND=">=sys-libs/ncurses-5.2-r2 + >=sys-libs/readline-6.2 nls? ( virtual/libintl )" RDEPEND="${DEPEND} !<sys-apps/portage-2.1.7.16 @@ -68,9 +66,11 @@ src_unpack() { # 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 ../.. + + # 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[)]/[a-z]*.h::g' Makefile.in || die epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237 epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch @@ -90,31 +90,34 @@ src_compile() { -DSSH_SOURCE_BASHRC \ $(use bashlogger && echo -DSYSLOG_HISTORY) - # 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" + # 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. + # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses - myconf="${myconf} --with-curses" + # 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) \ - ${myconf} || die - emake || die "make failed" + ${myconf} + emake || die if use plugins ; then emake -C examples/loadables all others || die diff --git a/app-shells/bash/bash-4.2_p24.ebuild b/app-shells/bash/bash-4.2_p24.ebuild new file mode 100644 index 000000000000..00dc265b2fa4 --- /dev/null +++ b/app-shells/bash/bash-4.2_p24.ebuild @@ -0,0 +1,189 @@ +# 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_p24.ebuild,v 1.1 2012/03/12 14:57:40 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 ~sparc-fbsd ~x86-fbsd" +IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + >=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[)]/[a-z]*.h::g' Makefile.in || die + + epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237 + epatch "${FILESDIR}"/${PN}-4.2-parallel-build.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. + + # 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) \ + ${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 +} |