diff options
author | Peter Alfredsen <loki_val@gentoo.org> | 2008-11-20 20:57:20 +0000 |
---|---|---|
committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-11-20 20:57:20 +0000 |
commit | 33d338d747cea7fe71d7781025ad68292331bb35 (patch) | |
tree | 48385598b37774cc0abab38e5498c0be94ca9fad /app-shells | |
parent | Version bump (diff) | |
download | historical-33d338d747cea7fe71d7781025ad68292331bb35.tar.gz historical-33d338d747cea7fe71d7781025ad68292331bb35.tar.bz2 historical-33d338d747cea7fe71d7781025ad68292331bb35.zip |
Bump for God, King and Country.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 7 | ||||
-rw-r--r-- | app-shells/bash/Manifest | 22 | ||||
-rw-r--r-- | app-shells/bash/bash-3.2_p48.ebuild | 199 |
3 files changed, 216 insertions, 12 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 34c0fc65ef72..19a217db9ef4 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-shells/bash # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.185 2008/11/17 20:26:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.186 2008/11/20 20:57:20 loki_val Exp $ + +*bash-3.2_p48 (20 Nov 2008) + + 20 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> +bash-3.2_p48.ebuild: + Bump for God, King and Country. 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> files/bash-3.0-darwin-conn.patch: diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index eeb6e783673b..57e0b1f87a3f 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba AUX bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 SHA1 fc34260611e395caee16930e66ec13e7aae63796 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae AUX bash-2.05b-jobs.patch 876 RMD160 1f23f16b72c18b6daa13631411cd216fc15032d9 SHA1 0150ee15228a9d34558737b16283b971b45ca23f SHA256 32ab1b54a4c48f9497ea7822e50234de28be9836606e62a0d237bb35f651fe61 @@ -142,6 +139,15 @@ DIST bash32-036 1264 RMD160 07f42b0bfe661b499291417ff3843b4c333a3037 SHA1 7c72c4 DIST bash32-037 3227 RMD160 98df5da6a324430c6f2260ded6e223bd6f4dae00 SHA1 e7f763bfbc77ebce2e597e275e0b93b92274a7e0 SHA256 9688a352c0fb23d2ce6e685ce39cda1c49f4aa7819bde2508ff8c90003f484df DIST bash32-038 2412 RMD160 26b446f510d56a85684f78e96952257c73d240bd SHA1 9a39ad3f3212f878e5515c9e844da42c8ca33532 SHA256 0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782 DIST bash32-039 5034 RMD160 38701818753e7bf5d7371609e0781ee000523028 SHA1 ab60404509d00c41429ad4a5350364662aef77d3 SHA256 46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817 +DIST bash32-040 1403 RMD160 2b38b82b1e7bc005e3b6bff3085e68c62c3e1663 SHA1 24d9923ee80f84a2d73e810b08f12c5594b447a8 SHA256 c9e0387eb4a2904126864d24de0699cdb6070789e1c02287a3b81ea96bf945aa +DIST bash32-041 4446 RMD160 8e7c8a177988e134ce4d523a4ea934891bc0ad24 SHA1 0d92adb7555be761123febbe34f3e216dab0ba1e SHA256 cc551fa57d613efea30ab2404fe724793a3d10f012b030e611d2c6449e463bcd +DIST bash32-042 1209 RMD160 a1f952be0552a6fa26ce5068800e5104172217d5 SHA1 bcdbf495aa7f7bd77d74bc03824b7511c8b25009 SHA256 fd0df54d03034e104b6377f249624bda0271aa874190a46e9d41fc49ad3caaef +DIST bash32-043 1658 RMD160 b4658baa080a57a5a34cdbb9465392e408d7440d SHA1 786470cba3e7108a3d063de6c5c32d54f7c1ba90 SHA256 43df7d2d7d61d3a8f0e14bc86d4f55b6d2e64829ba0829a78f5214d186087af7 +DIST bash32-044 5565 RMD160 ac3368eb8fbe988590a1cfb4874bd770907cc6fd SHA1 3e7f0f47b5c79bec47ffc35ca59e7643dd2f92cf SHA256 204b5ecaaa5de334c3cfbce6dfd8a9d3770b09024ab4724d86080fbf501ded69 +DIST bash32-045 1338 RMD160 385b233f3621b4ee6fa10a0c16e5876430d34c41 SHA1 e90992b1fef1579fc8312eb8c8dca598c884bca2 SHA256 3250e6c6d5d6884e31beaa2f521d2a1af9c2f701a4c0e67a7cd011b6ad8f082b +DIST bash32-046 1275 RMD160 414bde7580c7eace9bd006d02cd658bce4505b21 SHA1 571dac1d539da4a4be43d7edded0d7f2982bb4ac SHA256 fc829e92fa951c34368d83272d746f5c0ed345a7ad037f93322347eed00a1e1f +DIST bash32-047 1981 RMD160 406bc2f474e60f8058eeb035d0dbdf2fed60edd0 SHA1 0a72e1e645f0bcc614c29fe02fb9a397e7dcfa94 SHA256 623d4a958d2b022a15929a4de7403766ff07b295a185987b4d1e6cf3b70ea106 +DIST bash32-048 1948 RMD160 ff15dd3dea8e752607fc7002f8867bf5a26309ab SHA1 688d673603ec311866873675fc339ba689cadaec SHA256 74cb56764274f393676f68738eb22a3ed8fa388c0487feeadf0d78a45b549749 DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 EBUILD bash-2.05b-r11.ebuild 3408 RMD160 67bd104beb601e5cbf46d13bcd61e0b28c7590dc SHA1 6967480341932c50ed79c1d04e30d11abf2f8793 SHA256 672433e5a5364a9ea5dd226936e95af752a972be152a885b7141757ed1cdf8a6 EBUILD bash-3.0-r12.ebuild 5065 RMD160 894ed1b0e9c6e593c3c550a143d5466518d748e4 SHA1 71715200ed01da1f73045d226acd338eaa2ad954 SHA256 585d901228687d32d73f3df15ebe92fe66ec1960aea779c7ef48106cec7e963f @@ -151,12 +157,6 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab EBUILD bash-3.2_p33.ebuild 5653 RMD160 3033b2fd6068ab34362ea14ec90bc173e29343f3 SHA1 07a746960852d88592cee6874d53272cb720e31e SHA256 e8bb4d859e1ab631e9816d646b63ab19fbcce905d12ebceaf419beba5fae77f2 EBUILD bash-3.2_p39.ebuild 6156 RMD160 f0f3f9bbfb299a4c9c144f9ba97a4cb9a799fdea SHA1 d40bc8cb75d3bdc17f20794942db30ede80b19be SHA256 b6c7db8848819e3bb11d5c294577322706d24d23a4e8ef4a9cffddfa9ade03f7 -MISC ChangeLog 30226 RMD160 4746630d989af77e49907eeb1c39e8cf3dad63c3 SHA1 947b74dcabeff9398a553fcb19fe8d8f7fb7c96b SHA256 745c5eb12476c6b79713214b2dae704b82bc0efe3afa597e7d43bf9b0ec79afd +EBUILD bash-3.2_p48.ebuild 6156 RMD160 3c317539d13997bfed5d217e4c56874a9879628e SHA1 242d433f223b325a5452d2dfec2118e7803cb131 SHA256 5c7031eed9f766a687805dce50eb598f156a517e558d8620a9349095aa6ba8cb +MISC ChangeLog 30364 RMD160 a4fe2d67b318d4a4f47cd40c90be5ffa94eda32b SHA1 26300623eae6d3f8deaea6d8ded572c3df40a7f1 SHA256 6c33ff64a06d87c11a96c19004386b2df4ed3cf5724bb1a975fdcf4c80808cb1 MISC metadata.xml 404 RMD160 7b976f97a858dfb1fb6f22ebdf87883a64889126 SHA1 47fcf9c22f7dd52e2d8bdc9623fd1f3174467e7d SHA256 9a73cdde212504bf37663a429ae4ba2b3ca64173243e9bac29f17202010c435f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkkh02sACgkQAiZjviIA2Xi1AQCfYM+tAGg718udvju5Ea8xhzeo -TyMAoMw2Ox97Z5TJ+CbLxnQxgvMkMq9N -=lURr ------END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-3.2_p48.ebuild b/app-shells/bash/bash-3.2_p48.ebuild new file mode 100644 index 000000000000..d797a795d5c6 --- /dev/null +++ b/app-shells/bash/bash-3.2_p48.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p48.ebuild,v 1.1 2008/11/20 20:57:20 loki_val Exp $ + +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} +READLINE_VER=5.2 +READLINE_PLEVEL=0 # both readline patches are also released as bash patches + +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 + 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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="afs bashlogger examples nls plugins vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2" +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 + 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 ../.. + + if ! use vanilla ; then + epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040 + epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch + epatch "${FILESDIR}"/${PN}-3.2-loadables.patch + epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 + epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947 + + # Fix process substitution on BSD. + epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch + + epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch + # Don't barf on handled signals in scripts + epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch + epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875 + # 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 + fi + + epatch "${FILESDIR}"/${PN}-3.0-configs.patch +} + +src_compile() { + 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 + myconf="${myconf} --with-curses" + + # Default path is to use /usr/local/..... regardless. This little + # magic will set the default path to /usr/..... and keep us from + # worrying about the rest of the path getting out of sync with the + # ebuild code. + eval $(echo export $(ac_default_prefix=/usr; eval echo $(grep DEBUGGER_START_FILE= configure))) + + use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash + econf \ + $(use_with afs) \ + --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 + + # 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 + + 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 +} |