Fix patch file type, #159632 thanks to Zsolti.

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index b815eaf3c7c6f4b55dc3ff472983ae25709c095d..f8546ea9d58cc4c605a681ff99efe0be3506f3d2 100644 (file)
--- 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/Manifest b/app-shells/bash/Manifest
index 9754e0bdd247b779b8ae122719f39b05d58fa102..21716b056b636f10ae96d0973d7f788747bfe864 100644 (file)
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -174,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 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-dev-fd-test-as-user.patch 1104 RMD160 9701347bb8a0cbd0a98fdcd461f2e87e88afa67b SHA1 04a70b6dcbdc8c2896ee6a7f4a6f0915f10b737e SHA256 f1c8ea4628a85e094f12cf88bc2436fc748cc1c67f2204fdbca222b46a30e858
+MD5 0902b9102a3f1febcf7110ec63ab44c3 files/bash-3.2-dev-fd-test-as-user.patch 1104
+RMD160 9701347bb8a0cbd0a98fdcd461f2e87e88afa67b files/bash-3.2-dev-fd-test-as-user.patch 1104
+SHA256 f1c8ea4628a85e094f12cf88bc2436fc748cc1c67f2204fdbca222b46a30e858 files/bash-3.2-dev-fd-test-as-user.patch 1104
 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
@@ -297,10 +297,10 @@ EBUILD bash-3.2_p9.ebuild 4349 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d S
 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 22861 RMD160 6b7e2ce220b69b1246116500bd0b8bf49f5e5421 SHA1 a31e8ec4f5cdac5de4a07b405637e922cdf2ca1c SHA256 b58a305bd6a13f71b4bf1519c9ff9b7acdb247e7ade241f7d34eea8aad59516a
-MD5 f1347f3dacb6ef5d1677bda94438ce52 ChangeLog 22861
-RMD160 6b7e2ce220b69b1246116500bd0b8bf49f5e5421 ChangeLog 22861
-SHA256 b58a305bd6a13f71b4bf1519c9ff9b7acdb247e7ade241f7d34eea8aad59516a ChangeLog 22861
+MISC ChangeLog 23004 RMD160 da89160b3c0aeaef58e7e30734a849b3d67c3eae SHA1 7241217eb2363137b901d468b7b58286f7164670 SHA256 477622a0bb9c1c7e5bcf082cb0d2ccb90a0401167c18b8e55b0659558f61e0e9
+MD5 11eee00d13b63fe1c34837efb90d31d2 ChangeLog 23004
+RMD160 da89160b3c0aeaef58e7e30734a849b3d67c3eae ChangeLog 23004
+SHA256 477622a0bb9c1c7e5bcf082cb0d2ccb90a0401167c18b8e55b0659558f61e0e9 ChangeLog 23004
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164

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 66d4638219667b6e1b0b976eb4ec789b0413993a..8aca7767161d100c904af76971cc5828617b2ca9 100644 (file)
--- 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\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 -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