summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-shells/bash/ChangeLog8
-rw-r--r--app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch52
2 files changed, 32 insertions, 28 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index b815eaf3c7c6..f8546ea9d58c 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
# 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.128 2006/12/31 12:20:55 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.129 2007/01/01 19:23:15 uberlord Exp $
+
+ 01 Jan 2007; Roy Marples <uberlord@gentoo.org>
+ files/bash-3.2-dev-fd-test-as-user.patch:
+ Fix patch file type, #159632 thanks to Zsolti.
*bash-3.2_p9-r1 (31 Dec 2006)
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
index 66d463821966..8aca7767161d 100644
--- 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
@@ -1,26 +1,26 @@
-diff -ur bash-3.2.orig/aclocal.m4 bash-3.2/aclocal.m4
---- bash-3.2.orig/aclocal.m4 2006-12-30 20:00:31 +0000
-+++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000
-@@ -1544,7 +1544,8 @@
- 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
-+ # bash test builtin always works here, so we use the test binary
-+ if `which test || echo test` -e /dev/fd/3; then
- bash_cv_dev_fd=standard
- else
- bash_cv_dev_fd=absent
-diff -ur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure 2006-12-30 20:03:24 +0000
-+++ bash-3.2/configure 2006-12-30 20:01:50 +0000
-@@ -27179,7 +27179,8 @@
- 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
-+ # bash test builtin always works here, so we use the test binary
-+ if `which test || echo 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
+--- bash-3.2.orig/aclocal.m4 2006-12-30 20:00:31 +0000
++++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000
+@@ -1544,7 +1544,8 @@
+ 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
++ # bash test builtin always works here, so we use the test binary
++ if `which test || echo test` -e /dev/fd/3; then
+ bash_cv_dev_fd=standard
+ else
+ bash_cv_dev_fd=absent
+diff -ur bash-3.2.orig/configure bash-3.2/configure
+--- bash-3.2.orig/configure 2006-12-30 20:03:24 +0000
++++ bash-3.2/configure 2006-12-30 20:01:50 +0000
+@@ -27179,7 +27179,8 @@
+ 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
++ # bash test builtin always works here, so we use the test binary
++ if `which test || echo test` -e /dev/fd/3; then
+ bash_cv_dev_fd=standard
+ else
+ bash_cv_dev_fd=absent