Refresh the /dev/fd patch so configure correctly on FreeBSD
authorRoy Marples <uberlord@gentoo.org>
Sun, 31 Dec 2006 12:20:55 +0000 (12:20 +0000)
committerRoy Marples <uberlord@gentoo.org>
Sun, 31 Dec 2006 12:20:55 +0000 (12:20 +0000)
Package-Manager: portage-2.1.2_rc4-r3

app-shells/bash/ChangeLog
app-shells/bash/Manifest
app-shells/bash/bash-3.2_p9-r1.ebuild [new file with mode: 0644]
app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
app-shells/bash/files/digest-bash-3.2_p9-r1 [new file with mode: 0644]

index 25cbdff7b357723d15163e94e6784f06cce77905..b815eaf3c7c6f4b55dc3ff472983ae25709c095d 100644 (file)
@@ -1,6 +1,12 @@
 # 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.127 2006/12/30 01:50:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.128 2006/12/31 12:20:55 uberlord Exp $
+
+*bash-3.2_p9-r1 (31 Dec 2006)
+
+  31 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  files/bash-3.2-dev-fd-test-as-user.patch, +bash-3.2_p9-r1.ebuild:
+  Refresh the /dev/fd patch so configure correctly on FreeBSD
 
   30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/bashrc,
   files/dot-bashrc:
index f02ee85a185c567edc774f8099ec68ff46261d97..9754e0bdd247b779b8ae122719f39b05d58fa102 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 SHA1 fc34260611e395caee16930e66ec13e7aae63796 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 files/bash-2.05b-empty-herestring.patch 836
@@ -177,10 +174,10 @@ 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-dev-fd-test-as-user.patch 1130 RMD160 61ed85b1cc82b64fdd48378a2a835557044abed5 SHA1 65bc6464acbd9674845da43131a7e2d7f2ba91f0 SHA256 254315f93f59c70964dd7b740ca780c20c4be2f5d3e19931d4d13afa36dcc429
+MD5 6111599b7bfacf129e4424fc80c3b38d files/bash-3.2-dev-fd-test-as-user.patch 1130
+RMD160 61ed85b1cc82b64fdd48378a2a835557044abed5 files/bash-3.2-dev-fd-test-as-user.patch 1130
+SHA256 254315f93f59c70964dd7b740ca780c20c4be2f5d3e19931d4d13afa36dcc429 files/bash-3.2-dev-fd-test-as-user.patch 1130
 AUX bash-3.2-process-subst.patch 291 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 SHA1 1d374cf3f5dac6de77d32db927658ff8943e32fc SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98
 MD5 6a6536e68777ced16c9e66c086842cc0 files/bash-3.2-process-subst.patch 291
 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 files/bash-3.2-process-subst.patch 291
@@ -292,14 +289,18 @@ EBUILD bash-3.2_p5.ebuild 4349 RMD160 20855d757ae0aeadba9c78e161b7609fefb699bd S
 MD5 ae5f9524df0ce39ee9cf7a8375a83e8b bash-3.2_p5.ebuild 4349
 RMD160 20855d757ae0aeadba9c78e161b7609fefb699bd bash-3.2_p5.ebuild 4349
 SHA256 cf967008deb374cebd3251c7fcd6bd0e7e52b6db7286e160d2b685422a39d842 bash-3.2_p5.ebuild 4349
+EBUILD bash-3.2_p9-r1.ebuild 4354 RMD160 b368794cd68e21fc21c02ca7f0c1c5ac02dc4d08 SHA1 6687b01418ee40f0698895f5f111e6744141c22b SHA256 0fc1191409c7373bacca9d9e4b50f687813a60eabda885c317cef95de2576fcb
+MD5 81c91a19c4b3f96afcc56b5d76f38510 bash-3.2_p9-r1.ebuild 4354
+RMD160 b368794cd68e21fc21c02ca7f0c1c5ac02dc4d08 bash-3.2_p9-r1.ebuild 4354
+SHA256 0fc1191409c7373bacca9d9e4b50f687813a60eabda885c317cef95de2576fcb bash-3.2_p9-r1.ebuild 4354
 EBUILD bash-3.2_p9.ebuild 4349 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d SHA1 dd81e2115a3279efa37f45e0a89e298f952932ef SHA256 2f929739750214c01b34c4d936cdff7427db23e496e820a1de696233ba7489b3
 MD5 6a5b3c847e3c85dcd5599d35bb53ea33 bash-3.2_p9.ebuild 4349
 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d bash-3.2_p9.ebuild 4349
 SHA256 2f929739750214c01b34c4d936cdff7427db23e496e820a1de696233ba7489b3 bash-3.2_p9.ebuild 4349
-MISC ChangeLog 22648 RMD160 386659a25e727b68b3a344b7ca3f992e9e0e3653 SHA1 4c13c701c82d843d225d0dd81a1dc2cd7e5e1684 SHA256 c2a332033c49dd0d6d93cd206347f49ea208c8f9e742270cf68ef6a50424509a
-MD5 500b0781311d66aed416efa133c3501c ChangeLog 22648
-RMD160 386659a25e727b68b3a344b7ca3f992e9e0e3653 ChangeLog 22648
-SHA256 c2a332033c49dd0d6d93cd206347f49ea208c8f9e742270cf68ef6a50424509a ChangeLog 22648
+MISC ChangeLog 22861 RMD160 6b7e2ce220b69b1246116500bd0b8bf49f5e5421 SHA1 a31e8ec4f5cdac5de4a07b405637e922cdf2ca1c SHA256 b58a305bd6a13f71b4bf1519c9ff9b7acdb247e7ade241f7d34eea8aad59516a
+MD5 f1347f3dacb6ef5d1677bda94438ce52 ChangeLog 22861
+RMD160 6b7e2ce220b69b1246116500bd0b8bf49f5e5421 ChangeLog 22861
+SHA256 b58a305bd6a13f71b4bf1519c9ff9b7acdb247e7ade241f7d34eea8aad59516a ChangeLog 22861
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -328,10 +329,6 @@ SHA256 6f411247ca686af7f7e849f1ba9a734f0402652352f00e9cab8167f207d6946b files/di
 MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9 2074
 RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9 2074
 SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9 2074
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFlcYd8bi6rjpTunYRApDAAJ91+ue5MwC7KqwHYDsD6Gz0xotQSQCfd+js
-cBN9Qf6TmbNnWq6cNiZgYHA=
-=jr5g
------END PGP SIGNATURE-----
+MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9-r1 2074
+RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9-r1 2074
+SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9-r1 2074
diff --git a/app-shells/bash/bash-3.2_p9-r1.ebuild b/app-shells/bash/bash-3.2_p9-r1.ebuild
new file mode 100644 (file)
index 0000000..dbfd548
--- /dev/null
@@ -0,0 +1,143 @@
+# 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_p9-r1.ebuild,v 1.1 2006/12/31 12:20:55 uberlord Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
+PLEVEL=${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 ~sparc-fbsd ~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
+
+       # Fix process substitution on BSD.
+       epatch "${FILESDIR}"/${PN}-3.2-process-subst.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
+}
index ec1299c30c10922bb9381a41cff57ae51281198d..66d4638219667b6e1b0b976eb4ec789b0413993a 100644 (file)
@@ -1,14 +1,26 @@
-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 -ur bash-3.2.orig/aclocal.m4 bash-3.2/aclocal.m4\r
+--- bash-3.2.orig/aclocal.m4    2006-12-30 20:00:31 +0000\r
++++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000\r
+@@ -1544,7 +1544,8 @@\r
+ if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then\r
+ # check for systems like FreeBSD 5 that only provide /dev/fd/[012]\r
+    exec 3</dev/null\r
+-   if test -r /dev/fd/3; then\r
++   # bash test builtin always works here, so we use the test binary\r
++   if `which test || echo test` -e /dev/fd/3; then\r
+      bash_cv_dev_fd=standard\r
+    else\r
+      bash_cv_dev_fd=absent\r
+diff -ur bash-3.2.orig/configure bash-3.2/configure\r
+--- bash-3.2.orig/configure     2006-12-30 20:03:24 +0000\r
++++ bash-3.2/configure  2006-12-30 20:01:50 +0000\r
+@@ -27179,7 +27179,8 @@\r
+ if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then\r
+ # check for systems like FreeBSD 5 that only provide /dev/fd/[012]\r
+    exec 3</dev/null\r
+-   if test -r /dev/fd/3; then\r
++   # bash test builtin always works here, so we use the test binary\r
++   if `which test || echo test` -e /dev/fd/3; then\r
+      bash_cv_dev_fd=standard\r
+    else\r
+      bash_cv_dev_fd=absent\r
diff --git a/app-shells/bash/files/digest-bash-3.2_p9-r1 b/app-shells/bash/files/digest-bash-3.2_p9-r1
new file mode 100644 (file)
index 0000000..1ffd642
--- /dev/null
@@ -0,0 +1,30 @@
+MD5 00bfa16d58e034e3c2aa27f390390d30 bash-3.2.tar.gz 2529838
+RMD160 a73f790817d98be375a36def567737498e33aaf1 bash-3.2.tar.gz 2529838
+SHA256 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4 bash-3.2.tar.gz 2529838
+MD5 d8e10c754f477e3f3a581af566b89301 bash32-001 1539
+RMD160 633f6eb6b2b48345234c442b835abb94d10e0dad bash32-001 1539
+SHA256 beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa bash32-001 1539
+MD5 d38a5288b2f0ea6c9ac76b66cc74ef7d bash32-002 1524
+RMD160 5d0f0dab859197784b15c683d54e7a505a8434c3 bash32-002 1524
+SHA256 a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a bash32-002 1524
+MD5 0b90d37911827d8cb95f3b4353cc225e bash32-003 4599
+RMD160 efdcb4f8d6c800b5a3dab7bae37f95861bf186d8 bash32-003 4599
+SHA256 7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d bash32-003 4599
+MD5 8062f3a59631f58d78b180d83759b68a bash32-004 2585
+RMD160 0ec49a8b414f283aefc00c5ee63de913c96a7a21 bash32-004 2585
+SHA256 3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2 bash32-004 2585
+MD5 585b5943fadf0875ced243b245adde58 bash32-005 5910
+RMD160 8597b22136a294dc2cf1103a5c9ab100b75d16f5 bash32-005 5910
+SHA256 e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7 bash32-005 5910
+MD5 1d5732e01ea938aeed42f3def131fa4d bash32-006 1298
+RMD160 d8193a69956064e9fb4e64e13132b1c1b2cb8d43 bash32-006 1298
+SHA256 8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d bash32-006 1298
+MD5 dcd0cc5d801607827f7c851e72b0eabc bash32-007 1375
+RMD160 332cb936851e156c9231236541b78e651fd4ab5a bash32-007 1375
+SHA256 6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8 bash32-007 1375
+MD5 bb3c7dd11198c0ab93d0e960bebf6256 bash32-008 1302
+RMD160 44558cabad6b05a53217c17419c2477a29ebe7da bash32-008 1302
+SHA256 ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b bash32-008 1302
+MD5 434a6f29b0ca5f1ab784b2437ae8eaed bash32-009 1882
+RMD160 5a20bc86d04a156cdbcb22f36b6c68c7318e9bab bash32-009 1882
+SHA256 ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8 bash32-009 1882