Version bump #320053 by Lars Wendler.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 208 insertions, 5 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index fa7a3a1295c0..19937078f944 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.259 2010/05/20 03:00:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.260 2010/05/20 03:01:41 vapier Exp $
+
+*bash-4.1_p7 (20 May 2010)
+
+  20 May 2010; Mike Frysinger <vapier@gentoo.org> +bash-4.1_p7.ebuild:
+  Version bump #320053 by Lars Wendler.
 
 *bash-3.2_p51 (20 May 2010)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index fdba4418f546..046751cecffb 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
@@ -99,6 +102,7 @@ DIST bash32-047 1981 RMD160 406bc2f474e60f8058eeb035d0dbdf2fed60edd0 SHA1 0a72e1
 DIST bash32-048 1948 RMD160 ff15dd3dea8e752607fc7002f8867bf5a26309ab SHA1 688d673603ec311866873675fc339ba689cadaec SHA256 74cb56764274f393676f68738eb22a3ed8fa388c0487feeadf0d78a45b549749
 DIST bash32-049 1663 RMD160 65cd444d886b66e5a07e4984904f00da60dfd802 SHA1 da7b29dd5d2e3c3a5d54b845180b587cc1995134 SHA256 b1217ed94bdb95dc878fa5cabbf8a164435eb0d9da23a392198f48566ee34a2f
 DIST bash32-050 1697 RMD160 db0fe488af6f9dbd6987f937d40459417112c06b SHA1 81e1345b708ee135c17fb409b566e8e38a5f8a3f SHA256 081bb03c580ecee63ba03b40beb3caf509eca29515b2e8dd3c078503609a1642
+DIST bash32-051 1371 RMD160 ed509c691badf75003ff1504501962e8433c315f SHA1 effda95017f03176d01cbdb69373dc6473abef73 SHA256 354886097cd95b4def77028f32ee01e2e088d58a98184fede9d3ce9320e218ef
 DIST bash40-001 5156 RMD160 b8f1c1000b5cd12ecee79e29a73f3d576d0ad368 SHA1 dc47d547bec938afcd7b382816fec84077f3412f SHA256 e3b514204e5da7bf1aecf7d0981514b2367d4b529da6d4a45d09dc29e2f0031b
 DIST bash40-002 1220 RMD160 bd361806bcfe324570638ebb1a127f197d5e3756 SHA1 21dc945126547df03e37a3b68cc4b80b788b9da6 SHA256 495117e566019b9cb0ab49504945b30cdda6e5b59597e43e18eae1f06b1d5cf4
 DIST bash40-003 1749 RMD160 bad695faa509341afa97f371dcbdbfee5844ed9b SHA1 e4c120bdfd0c5bf16889e737e2c69268252812d6 SHA256 e300c40611b1e3775b7d1fb73bd770ad19973c22d7016d126af3304bae797bd8
@@ -142,13 +146,21 @@ DIST bash41-002 1799 RMD160 1a579481f81953e7f1dede0aaf1a03e4aad29aaf SHA1 72a9ad
 DIST bash41-003 1407 RMD160 e267f796c3f4b446c36553dbe254f849573b3f24 SHA1 31ae7f511d99ea336ba2299c10e493c21512e3ad SHA256 91763dddbbb98c3ff7deb3faea3b3ad6e861e7bfd2e46c045c0d1d85d1b3256d
 DIST bash41-004 1705 RMD160 b8167b4b7fe272cca741c5e7ad67b9bb068e690e SHA1 469dff697b7ac1c157dcc625d9333a1dcdb88ae2 SHA256 78c063ba34c1f390a5bf2e5727624ca2e253bbef49ce187cabb240eee7f4ff9e
 DIST bash41-005 1626 RMD160 9a10c71f92c4107a3821f8e2b72a69c62faadc14 SHA1 c8400b7d3ddb2f8c7159bbbd238b22fc10504e12 SHA256 519639d8d1664be74d7ec15879d16337fe8c71af8d648b02f84ccdd4fb739c1a
+DIST bash41-006 2166 RMD160 1d06bb92b8726bf17d2e6aeb43e9737faef9d3a6 SHA1 9707fc6a92d4de907016584074187c1aaca25f2a SHA256 5986abcf33c0b087bd5670f1ae6a6400a8ce6ab7e7c4de18b9826d0ee10f2c49
+DIST bash41-007 1610 RMD160 6d62d0e3d596ad031cd5f386f3e9c2dc9076283f SHA1 614e46128d6f9867132b31765f60a514b395ae43 SHA256 74012a2c28ba4fb532c3eb69155ac870aac8d53990fa4e1e52cdc173d4c205a7
 DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774
 EBUILD bash-3.1_p17.ebuild 4643 RMD160 46f3d1fe569cc0b5f23cb3f1c06244caf090fbd6 SHA1 9d90d18bfc54f10c7309694931cf9dc3557346ba SHA256 277165a62442284edc34bad6e47721e451b1e1b6db21d6a16c5ba9cb61df27ed
-EBUILD bash-3.2_p50.ebuild 6146 RMD160 13f3957af7bc8763d431846802dfcdd8455f14cf SHA1 283ec5975998e5cf7128a9a0e889d6f54d506922 SHA256 703287cd42028c99c5a4f610042732f9af27a971d5728878fba12f8a25020515
-EBUILD bash-4.0_p35.ebuild 5784 RMD160 0d3f12c317794f751da33ab6e51926aafde10694 SHA1 120e55091bc67363214967fbf02fcb373905aef7 SHA256 be228bea883c3b952851959f27f206777bfe571a575ee3b6202f9db5b4517ac8
+EBUILD bash-3.2_p51.ebuild 6146 RMD160 6fe3b6f58b7aae7a3aa7b57036331aa51e7d273a SHA1 1ed726715ba09dca282d95b58aa6056f7525917d SHA256 f1dccf86c0f1afb87290bbd96fb2dfffa646c731c4d158478f44f3f014bbfb2c
 EBUILD bash-4.0_p37.ebuild 5878 RMD160 18ecf399ecf093c95be7123d31765a3494eb318c SHA1 4b2244963756d23b873bbb4beedde9edd4c34d75 SHA256 09d09e592cc1da61891cbdebaa331fb9c95641e934af029a6d7778829ed2aa1c
 EBUILD bash-4.0_p38.ebuild 5906 RMD160 e4bb3f4cbde3e52393b7e63615a227b4e5e506b7 SHA1 b6e0561430b43bfac633ab11e46baf9d532d3cd1 SHA256 028319572ba6b6825eb33b2b67340831fc007fc7f1a1b5b2e52153d2a28a569a
-EBUILD bash-4.1_p2-r1.ebuild 5617 RMD160 9cf3322d0e1dda3c37fff0004acb9c1c952fc40d SHA1 2679e9d767d69b01f0165247fc879545189d5ffd SHA256 481813c62a6c1ede289aca9006b82ebc7bd96a66f98317d8df89db25ba42d28b
 EBUILD bash-4.1_p5.ebuild 5612 RMD160 9b046bcad68b2933b6afb1b7c29a0c6041afb958 SHA1 fe1709060fb6f5be1a3f3049b054cdee5bf0da4b SHA256 1cc4ea9c2b2d93d9ed94cba2deb14302a135aa1a0e60e53b9d676c9ca0ea3fa0
-MISC ChangeLog 40772 RMD160 a776233c9e19f96501c8f380975b9186876c0fe7 SHA1 ae04df8be57565fa1b95b355cdc16b8ba6b34dab SHA256 b9938f6300b4f7ed87b29e2019c836ca131c72ed709cbba16e0ae382d1b7692c
+EBUILD bash-4.1_p7.ebuild 5551 RMD160 68e31354805c98ff7c471d8880706853257f94fb SHA1 7944f608a13a8e8977d48b777e556d16037a60f7 SHA256 1e28a3844c4abd8d545a49470bb83b895963f0c439cb8bba524043b0ed5ae868
+MISC ChangeLog 41029 RMD160 73602313c3c7493d2367daa9a332c2ba81c17b76 SHA1 ddff788a5f1f49a66430c19bebf3f44631cbcb07 SHA256 7739b6aa87a423833983b99765ba36859b8417f3ec0151c2c28e5da5280c753e
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkv0phoACgkQTwhj9JtAlp6PFAD/cqbbRFYQMsU/rWz1Nmnvfs12
+YGC7/VXWfO7SEIUcRqoA/0gMwqDa882TV3/TJuG7/Eix1dV6LM/Aak+nh73hZ+4G
+=Ciy1
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.1_p7.ebuild b/app-shells/bash/bash-4.1_p7.ebuild
new file mode 100644
index 000000000000..66291797fd8e
--- /dev/null
+++ b/app-shells/bash/bash-4.1_p7.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p7.ebuild,v 1.1 2010/05/20 03:01:41 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_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
+	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)
+	$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})"
+
+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
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.7.16
+	!<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
+	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)
+	cd lib/readline
+	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
+	cd ../..
+
+	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
+
+	if ! use vanilla ; then
+		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
+		epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	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 \
+		$(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"
+
+	# 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 \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-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
+}