summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-10-12 23:50:21 +0000
committerMike Frysinger <vapier@gentoo.org>2006-10-12 23:50:21 +0000
commit851a8cb5c82ea9207136158603d18572afc8dc47 (patch)
treed366dd14a6bc35012463332c26809554a82dd24d /app-shells/bash
parentBlock version 0.7 against ghc-6.6. Version 0.8 is ok with ghc-6.6 (diff)
downloadhistorical-851a8cb5c82ea9207136158603d18572afc8dc47.tar.gz
historical-851a8cb5c82ea9207136158603d18572afc8dc47.tar.bz2
historical-851a8cb5c82ea9207136158603d18572afc8dc47.zip
Version bump.
Package-Manager: portage-2.1.2_pre2-r5
Diffstat (limited to 'app-shells/bash')
-rw-r--r--app-shells/bash/ChangeLog9
-rw-r--r--app-shells/bash/Manifest32
-rw-r--r--app-shells/bash/bash-3.2.ebuild140
-rw-r--r--app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch14
-rw-r--r--app-shells/bash/files/bash-3.2-ulimit.patch13
-rw-r--r--app-shells/bash/files/digest-bash-3.23
6 files changed, 202 insertions, 9 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 76ecab651eab..50949bd49ea9 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.118 2006/09/27 17:44:10 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.119 2006/10/12 23:50:21 vapier Exp $
+
+*bash-3.2 (12 Oct 2006)
+
+ 12 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/bash-3.2-dev-fd-test-as-user.patch, +files/bash-3.2-ulimit.patch,
+ +bash-3.2.ebuild:
+ Version bump.
27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> bash-3.1_p17.ebuild:
Stable on alpha as per bug #149047
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 4e7d0962d691..2ce9c8cb6ce3 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -177,6 +177,14 @@ AUX bash-3.1-ulimit.patch 3736 RMD160 c68da557d0797c6e6a1b41ba1a6451011ae00a44 S
MD5 a36e38d7b45d6b50583f257b75106b90 files/bash-3.1-ulimit.patch 3736
RMD160 c68da557d0797c6e6a1b41ba1a6451011ae00a44 files/bash-3.1-ulimit.patch 3736
SHA256 e27d41117dab8814e3812833d2038ca4f5d5fde8a0da2322eb3111a6a6245443 files/bash-3.1-ulimit.patch 3736
+AUX bash-3.2-dev-fd-test-as-user.patch 442 RMD160 c17fcd3def83b7271b5cbcc8ae2c3ecad3de6075 SHA1 0de31f05336f897188ff0864fe634b294d3fe360 SHA256 c223cb0de8dd9fcd7fab2c88ad92f22de253c2f5cb132f9b159f25b7085b568f
+MD5 07dd14671aa29bef9f56904d77adb199 files/bash-3.2-dev-fd-test-as-user.patch 442
+RMD160 c17fcd3def83b7271b5cbcc8ae2c3ecad3de6075 files/bash-3.2-dev-fd-test-as-user.patch 442
+SHA256 c223cb0de8dd9fcd7fab2c88ad92f22de253c2f5cb132f9b159f25b7085b568f files/bash-3.2-dev-fd-test-as-user.patch 442
+AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
+MD5 d192d33c34972e9120bc3f40e555b11c files/bash-3.2-ulimit.patch 449
+RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db files/bash-3.2-ulimit.patch 449
+SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381 files/bash-3.2-ulimit.patch 449
AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
RMD160 fa6064b67bd02cf66dc490759442a0127770d420 files/bash_logout 205
@@ -202,6 +210,7 @@ DIST bash-2.05b.tar.gz 1956216 RMD160 d9826db03c5d38e6175af5b3ef0bc07fafa14add S
DIST bash-3.0-gentoo.diff.bz2 2423 RMD160 133b6338fd320b9cac0cddeeafff27680c8d8a17 SHA1 d13eaa166c8fce9607213ccbf204d8741a38b047 SHA256 13b0c1e426914093b7fcbc57e4901945512ebc73f737f21a01e150843a699a84
DIST bash-3.0.tar.gz 2418293 RMD160 abe76200003a9dc441ce34650a439cd968f643d4 SHA1 3acf1ff4910d4bc863620c7533cbf4858370017b SHA256 72d3f9d80fb4622e79ee5019314668b7bd6747182fa0928c8742002b7568586f
DIST bash-3.1.tar.gz 2533934 RMD160 cbeda56312b3f623684b2099b711bb7592e0eda1 SHA1 766e3fd9384616d8a103f812f662fd8ec791c129 SHA256 d6952b2c38f9bf417559dd3b071860e1099ddfb8a12c0228f22afaf47f79d3b9
+DIST bash-3.2.tar.gz 2529838 RMD160 a73f790817d98be375a36def567737498e33aaf1 SHA1 fe6466c7ee98061e044dae0347ca5d1a8eab4a0d SHA256 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
DIST bash205b-002 755 RMD160 6ba57c79aae23fafe5209b6d3f2fabcaad8b391f SHA1 c2809872dbe8e30cd7dd4011af4cf53e03df6c21 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b
DIST bash205b-003 2356 RMD160 1e52a102f29d9b08fcd04b8c3affe106b9bc47ad SHA1 f050ea2c9fc1c8e809264e44266c8130587d881b SHA256 604972eaafe69f44413d429e0a826b0eae209ca74b14eeeccdf0d502bbabb340
DIST bash205b-004 1110 RMD160 d08341477b97f76d50920240f363ead469f157c3 SHA1 f7a69347cdf4e2e330ec6f3220ced263925022af SHA256 fab91e9742ca4e990666441e91821742e6dff78e8e388ba55205cf7b1cd8e8e1
@@ -270,10 +279,14 @@ EBUILD bash-3.1_p17.ebuild 4598 RMD160 7fded624071a966232bd8d5ca91a315513c4d546
MD5 b0b9563a76c37c870a7cc3003bb8b975 bash-3.1_p17.ebuild 4598
RMD160 7fded624071a966232bd8d5ca91a315513c4d546 bash-3.1_p17.ebuild 4598
SHA256 5b9d06c3bebc12c13f98e679b41054c972864c48d934be765cf75adeaf8e3889 bash-3.1_p17.ebuild 4598
-MISC ChangeLog 21386 RMD160 ffc5e391baded887df2741d14c686650f6597a17 SHA1 5843ad214b37d66645478117a65ec9d335cdeb5a SHA256 1f8788d5ef79538cd9354a3f294fd27d7257572a133cc5502cb5f93f05200540
-MD5 d4eddb0038782b0a4e5dfa8d19aea4f9 ChangeLog 21386
-RMD160 ffc5e391baded887df2741d14c686650f6597a17 ChangeLog 21386
-SHA256 1f8788d5ef79538cd9354a3f294fd27d7257572a133cc5502cb5f93f05200540 ChangeLog 21386
+EBUILD bash-3.2.ebuild 4248 RMD160 6bcafd3450f6d0491631e378101c8fa092605cda SHA1 8744b81bcc4e45c793ef467b99694dddc3ff391f SHA256 17067cb10aba2f92244ac1540df091a563f995b25d3c58392945d024fecb6dd9
+MD5 5a785aa016aa9831a467b6473a6ef331 bash-3.2.ebuild 4248
+RMD160 6bcafd3450f6d0491631e378101c8fa092605cda bash-3.2.ebuild 4248
+SHA256 17067cb10aba2f92244ac1540df091a563f995b25d3c58392945d024fecb6dd9 bash-3.2.ebuild 4248
+MISC ChangeLog 21574 RMD160 eeaf136f8f5f3eb4fcc81694f2c99046f8f10f98 SHA1 68b6cd0223e9ff7c0c1bb5b369e466460be1aefd SHA256 85b3b2d4d2a9ba7b073d0d8ed20e6283e96518ff71a895c379781b9a273b4944
+MD5 b8cce7b4cbe98c78a0065b13b32bc25c ChangeLog 21574
+RMD160 eeaf136f8f5f3eb4fcc81694f2c99046f8f10f98 ChangeLog 21574
+SHA256 85b3b2d4d2a9ba7b073d0d8ed20e6283e96518ff71a895c379781b9a273b4944 ChangeLog 21574
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -299,10 +312,13 @@ SHA256 1a25ed9d1fa648442a32e3bc60706b427718809325cf030c5acc5ea51aecc443 files/di
MD5 341b816c5acf74ac16bf443d156e9719 files/digest-bash-3.1_p17 3931
RMD160 607c556f7fd1528c64beb33828d95a31e22077ab files/digest-bash-3.1_p17 3931
SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/digest-bash-3.1_p17 3931
+MD5 b94c53c9a7c09646a87366a1894d04fb files/digest-bash-3.2 229
+RMD160 544a64d6a70ea419b7ebc96859df23e099b181f8 files/digest-bash-3.2 229
+SHA256 78e50eebee5a4cb365bda9ab6386797d017119f57e1dfcd01fe867b956880918 files/digest-bash-3.2 229
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFGrh9ViELBEf1JB0RAiYJAJ4ivzeEY2CWJCm5Utoejchd3WoQYACfbPZD
-ZTdXp3b1cDjtthash4jhdkI=
-=m3JZ
+iD8DBQFFLtTSamhnQswr0vIRAkpeAJ4pP5Vg1CrgGC1dTVg5tbrjfavVvACeNlfX
+zOIV0RYi4pMlX/L34sBOdlI=
+=aQRB
-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2.ebuild b/app-shells/bash/bash-3.2.ebuild
new file mode 100644
index 000000000000..a32b6a1454f9
--- /dev/null
+++ b/app-shells/bash/bash-3.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2.ebuild,v 1.1 2006/10/12 23:50:21 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
+PLEVEL=0 #${PV##*_p}
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+READLINE_VER=5.2
+READLINE_PLEVEL=0
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
+# Hit the GNU mirrors before hitting Chet's site
+# printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
+# ${MY_PV} ${MY_PV/\.} ${i}
+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}
+ 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="afs bashlogger nls vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
+
+ # 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}"/${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() {
+ filter-flags -malign-double
+
+ 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"
+
+ econf \
+ $(use_with afs) \
+ --disable-profiling \
+ --without-gnu-malloc \
+ ${myconf} || die
+ emake -j1 || die "make failed" # see bug 102426
+}
+
+src_install() {
+ einstall || die
+
+ dodir /bin
+ mv "${D}"/usr/bin/bash "${D}"/bin/
+ [[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
+ 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
+
+ doman doc/*.1
+ dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+ dosym bash.info.gz /usr/share/info/bashref.info.gz
+}
+
+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
+}
diff --git a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
new file mode 100644
index 000000000000..ec1299c30c10
--- /dev/null
+++ b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
@@ -0,0 +1,14 @@
+Fix the /dev/fd test when running as a non root user
+after logging in as a root user #131875
+
+--- bash-3.2/configure
++++ bash-3.2/configure
+@@ -23098,7 +23098,7 @@
+ if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
+ # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
+ exec 3</dev/null
+- if test -r /dev/fd/3; then
++ if test -e /dev/fd/3; then
+ bash_cv_dev_fd=standard
+ else
+ bash_cv_dev_fd=absent
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
new file mode 100644
index 000000000000..a0975cb6e9a8
--- /dev/null
+++ b/app-shells/bash/files/bash-3.2-ulimit.patch
@@ -0,0 +1,13 @@
+add missing docs for -e and -r options
+
+--- builtins/ulimit.def
++++ builtins/ulimit.def
+@@ -24,7 +24,7 @@
+ $BUILTIN ulimit
+ $FUNCTION ulimit_builtin
+ $DEPENDS_ON !_MINIX
+-$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
++$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit]
+ Ulimit provides control over the resources available to processes
+ started by the shell, on systems that allow such control. If an
+ option is given, it is interpreted as follows:
diff --git a/app-shells/bash/files/digest-bash-3.2 b/app-shells/bash/files/digest-bash-3.2
new file mode 100644
index 000000000000..17654839744b
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.2
@@ -0,0 +1,3 @@
+MD5 00bfa16d58e034e3c2aa27f390390d30 bash-3.2.tar.gz 2529838
+RMD160 a73f790817d98be375a36def567737498e33aaf1 bash-3.2.tar.gz 2529838
+SHA256 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4 bash-3.2.tar.gz 2529838