diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-07-19 17:58:23 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-07-19 17:58:23 +0000 |
commit | 144712a57342aa65b8fc17ce564ea40cf9bf6a21 (patch) | |
tree | 22a9fc0a459f00aefeab9e168faa7ded6018ae67 /app-shells | |
parent | marked x86 per bug 427198 (diff) | |
download | historical-144712a57342aa65b8fc17ce564ea40cf9bf6a21.tar.gz historical-144712a57342aa65b8fc17ce564ea40cf9bf6a21.tar.bz2 historical-144712a57342aa65b8fc17ce564ea40cf9bf6a21.zip |
Version bump #427168 by Lars Wendler.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 7 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 30 | ||||
-rw-r--r-- | app-shells/bash/bash-4.2_p37.ebuild | 200 |
3 files changed, 222 insertions, 15 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 081b293c6f61..5c3c896b3e50 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.314 2012/07/11 13:18:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.315 2012/07/19 17:58:23 vapier Exp $ + +*bash-4.2_p37 (19 Jul 2012) + + 19 Jul 2012; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p37.ebuild: + Version bump #427168 by Lars Wendler. *bash-4.2_p36 (11 Jul 2012) diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 4ad56598cfbd..077144d48150 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -194,6 +194,7 @@ DIST bash42-033 1634 SHA256 f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38df DIST bash42-034 1345 SHA256 01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8 SHA512 d59a4a67a241d262de5fb27b96af0f15b0f6e7e922b2d61ea86e037dcd07ea77ec3c1ef6b289e5bbccd011b632538f264bb6426c3a07dba1946c094be56e0b16 WHIRLPOOL e2a2310a55db78a4d668235a4a70d266c28108ac4a04b50864704f7ba745d3e1cf080cf34544b426c1a2d6067adedc32d7491163f0ef5d09df3d51c99451b5cf DIST bash42-035 1920 SHA256 cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df SHA512 9f294177e91600f65cfee1b9dbf59b3ad7db449a99cc1013b7c97ef6c814b51afa7a2d2516a37fcc110ff3f0b25c4b06e42094f4665e03e41650bfa69c15eaf7 WHIRLPOOL e8806743da1f16375ffd29fb7c9ae78d8966d6f7faa833025e57fb59bd290a2afdf94777e9ac51917f378312fc8ce05d72ee14525352412c5826e8a2a9909fed DIST bash42-036 3123 SHA256 fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa SHA512 7e114b99d8f5b210b826715c77adfdbb115e86ace35f7ff331fc6f595a4d0f689a055ccf7adfbafc057c7549f5597e4de455ab9e18a6ffeb5b4fd1d3a2aab99c WHIRLPOOL 6f4e9e9e8251b5a703bad2202301edb45546d94f452669ef681786ff5882269b70791456c7c2040731b5b7cff27c4028823592a61d46204a1271218f7e6c7b8c +DIST bash42-037 3483 SHA256 c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674 SHA512 4466990dc3499ccde5940ddfb383052fa345d4e53fff7c8963ac7482fa280658b4516a1583486175cab2f3a5c8afbbedda8461e3cb1802031bce8db386404608 WHIRLPOOL 918dd53aea5ba7c5da2b6ef3325289d80d5c9e01aa57bd5bf9b9e6a22302865929a670ed7b20a5916237e2078aa69223c681e00c79c5db40dcf4d9ffa455b603 DIST readline51-001 2042 SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 SHA512 94dbe326f551099aac9658e80cf5489cdecf0a06f4986b1ebf0f6b678f1e2e50e31353e459e1b71a186f17c933180bf30a821cb262708ef6425c5987eb6d66e0 WHIRLPOOL 10546875add30ab9d2c9b60f6d90dd9cc6745e02cbec1ab8913517c6bdbc3d894d97652d04de148e6423fd8666831255996d9862e8e532ad06390757859a8f64 EBUILD bash-3.1_p17.ebuild 4642 SHA256 e8178f2c3a8505e11390721a552c28173adca3250c8195f4ad63a05a794f02a6 SHA512 4300d33061c34fcb57ee2e79bbcd57c13e024ed8a286e19d222531d89c56f3e3d5a12693aa4310c6e033ab910f78d8630abe2c46f74b614e7de4e47adb5ac3e2 WHIRLPOOL aa707d3010db8ee6670807fb19e2402b3446cde78bd2479a15ea1f514666a296ba3417bc1d065b5f38ee273e813a01c6ba88160748032b786760c142734b8b67 EBUILD bash-3.2_p51.ebuild 5862 SHA256 2ded1efa635872ac5f01e27b390bd2d67b4e4867d52680074214ae8c3cac04ae SHA512 007f4ca53813f2e05bbe7665a8523ab5c76c1d6ad51e0b54c6f2f69e3d06430c154050257ccba648e239d233eab1c867f0f3d3d6f920b4fa8bb20d85d7976524 WHIRLPOOL 94cb8b3a0cb0d91d584957126a73b35b8bc2453e140d19b9f36e431d3fdff348347c10aa529c8b74f582a92c64da58e25ab18a1268a6f64c901287c38419a96a @@ -209,23 +210,24 @@ EBUILD bash-4.2_p24.ebuild 6155 SHA256 02d1f7d7e6e78219dba763c661a50b90c731b7e8f EBUILD bash-4.2_p28.ebuild 6167 SHA256 9ce516ae7fbe2315e35b071c91e9a72ab43f5c1a50d90697aa673b306bcf9598 SHA512 eb83366dc44db6b2b1f4f71ffa7a600d364375b962e778915717233b0fd8f519a352646e8da58e672a66cdd037dd7a6e5a3d405980cfb0cac008d8e8e647cb4f WHIRLPOOL 86ba65db80f305eae6a7858fc9f3141606f96973d8c017d12afd91a609ebdac475b8d52e5618e900fffe176a7fe9d10aa7620c93e6cc6e3b04053dc28824938f EBUILD bash-4.2_p29.ebuild 6166 SHA256 57928687bafac92b8aeb0f3598a026242c04aa24e733883b738e3a65d080f1bc SHA512 4ddd3ba367df595d7b7481806c72d37d408a5484fba890eab0c3c8e912676f99f81aa5a9a71a0afe11db1d389186e15c6c0ddb2e59a37d0150a9194c23c510f0 WHIRLPOOL 9c544145c2bffcbdc5ab9b5e1d8a974f693a2f79e3ef392207c5a8a1df81bc1bfced419dbac408cbd518a6976aad748eae472edb8945255313be004443c14541 EBUILD bash-4.2_p36.ebuild 6166 SHA256 ba80733c8fc50b4958820b5fe779cc4df4dfe6ce5b65b7b5bb3a332e46914715 SHA512 109a3231f9d13412286910547d34eb272ec64502c797428f5e9ede23a0edaa0865366250e216bbf69fd5bc67a651978b5a7fbae22e11a10d872cefd3e2c414a9 WHIRLPOOL b22ecca12116d0fe430ab1331a2e507e7d48a322c72acfc3586edaa0e939c51d834c921f083071f9430a4c60ae362f33fb055abdffdc91990eb2e6d1c69044cc +EBUILD bash-4.2_p37.ebuild 6166 SHA256 7a81ff3e4ab9ca3d465c446e476268c41c9b0fe5790553b55b3c1dea621fc450 SHA512 26faa4b2ce95c115021e109f5224a36dbfcecb289bfdc25964ae309c141e9193903bb347a22f989f3ccaeb6205056674126c0881ac87b1ea62b1d0f3319a5fca WHIRLPOOL 18033455e13e765b5d66a82e8f28d41d4fda0f4b18f9deb8c31dc93950009c7170de8047829d96c8a1a89a499cc73bd68ebfb318dca72ceb84c9b19c738f597e EBUILD bash-4.2_p8-r1.ebuild 5549 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178 SHA512 8e2c73a5e11fefc54696b4d66d0a362ded3ce5b21787b4f5fca158b36ee8d90a8344dbd44bcff66a204184b34d332b8d30bc2bf8729c4331fdd864f1c0308bcc WHIRLPOOL 97e01220b6fe2e6ccd79b1b1bada4ae554b6418b916570ea17d2b4b751c1739a7b1aba3cc2b767ac9f4e75728c569d5e51dc8dfd387e7181de430e3422da51ad -MISC ChangeLog 48619 SHA256 60b560459c2ab45ac2ebb809c82bd37dc1cdd5b620cfc005fb6816dd158d6284 SHA512 4cdb0e463de0e660a4cd1f043ec8c5ca9d2a5ad0d9b8bab9814e40d46eb20b95cbfc09e9aa2769b260bc70db35df022c742f02edebafeb2f0accb85154e9f554 WHIRLPOOL 9879fa987e73a422128093cf77727e6e56e6e0c7c1432c17c7909335bac8cd7fe4a2d2ee745086885f2c802a268d4f37bdf10535785d600fef533161cef98be7 +MISC ChangeLog 48761 SHA256 e093c00147d7abcbfadeced7d9e040fff552fc8703f367a37be25f4ba0d782c9 SHA512 a78d4e95d5b954f8b6f117fc35113e40e614768036763334a375d5e81d8eb2f37c57cd10664a5fc421ec98f14ce7ab4942df0504098cce36ec0a7036d5e40667 WHIRLPOOL 4316706a3d8cdc7008addb58f31b1265519a30e9c44fec7525218311c830c06c999403ca8bcee31410bf5860cdf6743f529a7e44bfdaef3713de1285ed02f4c9 MISC metadata.xml 568 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 SHA512 e50fd93498123511ac7460795687e694d368aaa2e7001ad752aae7bb6b67ed4746c8e171e4d5ff42e6aade0fd29d001330afdb593b8446046a98b27b113b7c5e WHIRLPOOL 83ad81f6ec56c7deaaa1d6cd18ee73621f02bedb62201d59ac44676120251e040f73c9ef238d91abf0c8c7d115a8b4b8df6ea22b533102c8daadfad755de51d6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJP/X1EAAoJELEHsLL7fEFWB10QALMfbbRthR+TxvJ/Lijl3mgI -OU4sWhtv2SBSXKBcANV99lhX6ElzwnODq8ayyYrtnPKNkTrHycNJrVEGn1Win+we -dzKbBPtfiTWD3kh1lguoNVItKlLXevQFLMJkooccI1W4ylEAU65Rpu6J0MAdDzWT -w1TZMVX0Fs9cYsYKTENSNlGC28uootL41mBSQhWrpzG1jz8ogUHneBMARd9O51ST -c7L7JbKs1ib1HQIqW27e6JNy3drU0a2PZ7pcV9B3xXIbuAGa41yzHz5rQTBvMAth -JtR05tB3xUtKx2nx4EKeWM30NAPk/aMoesCk2iXe7sPqT8osFGaiC0/CUt13b+RF -kxfHYRq4QacAt19QcfSoKGHu9M7VLUJM4ROAYqNg9j85tzqiAC13fVkziSF7NPB1 -4x5NaljVcsO41LJnjEsMuAe/JDOD0Yfo1or0tEEvLyFNGTF2oaa4hLhwo/+fzH8B -jgovo8eLPqpdbFTuO5OoImQVVyYnWM3FZjEd/e1OHrvfY8c2Dw0cig1gH45z2762 -lGJmQZUz/TJFHgovQBR2gQegsC87tTDmucIxMaFU2Ei/CRnwhWwlhWFlbgda/IYF -ToEbmi6vk0X652RbQVXcCvNwnMonD8GXC2hzOXZgzHkbLQfxcOFPSmitKD8nSZbg -DDwYDMljTFolReNGxErj -=6uM1 +iQIcBAEBAgAGBQJQCEriAAoJELEHsLL7fEFW9K0P/iszpa/wsH23ilq8wqjEw78Q +6fVV8rCwwPsz7C6UTDJcO2qw6fQScMkYrplLd+7DVvT/L3s3ASH0VPf9hvEVHM2D +PqljIi+pwuPJgyW1+qv/SafdmEqw5pfa/9fen0wGaFYiGUa5Fc8F7OHPbOmNkTCx +F4xwMeU8A1t83jExulynEQwFQj4oEh2W49hlVfVNSB0lx2fdydCBecDC4GjCFLsT +zJhDxrGj0cj4gYFKpXUOQ9nbiwALO8FOAF3+7+++NtQ5qGKZzLrveQLJ3fh1UkhU +uXHKPKU7hlzHeeZX+8ygGW2jDz+qXrPcT/sqtXA+m2KeO4+UcsFddElWj5klbVmg +CVcHhqL8CTUpM+2wu5oP2gormtK1DItEeKY3mETtCV5QVf67ysn62ztozeFNWlJa +pIZzVqGsG7kbi2uRqi+XimkCoviXKuygTbd70UH7QcffMpE0LGddev9ht7yb1Ug6 +Fw1RnQAIxWik0p+qskZ6ChmSkvjsJAFc//dquEDBHEs45N5ajzAs/U4y6SxTV8wP +0TYi8lTmmOmif3ynM0mNQC26PicImbVrwKZHq20DYjypLm13UnINL3TRXM/wPG1d +C5VnrQnChtVEEl+z+nZQE9ysqSUYyVcg2c0TcC74S4DxCTqw++iSVazagwRoi+dS +9F9R3ZEnge/P/u9v3LFh +=BR7h -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p37.ebuild b/app-shells/bash/bash-4.2_p37.ebuild new file mode 100644 index 000000000000..8e626cab78fa --- /dev/null +++ b/app-shells/bash/bash-4.2_p37.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_p37.ebuild,v 1.1 2012/07/19 17:58:23 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.6.7_p1 + !<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 +} |