Bug #126249, patch against scsi.agent. Affecte hardware is very rare, not bumping revision.

(Portage version: 2.1_pre6-r5)

4 files changed, 34 insertions, 16 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 58fd5a26d87f..2716c3ae0ee9 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hotplug
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.65 2005/07/19 18:34:28 brix Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.66 2006/03/24 04:55:53 robbat2 Exp $
+
+  24 Mar 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/hotplug-20040923-scsi-agent-timeout.patch,
+  hotplug-20040923-r1.ebuild:
+  Bug #126249, patch against scsi.agent. Affected hardware is very rare, not
+  bumping revision.
 
 *hotplug-20040923-r1 (19 Jul 2005)
 
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index c9491a8d24b6..8a8db8371de7 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 522378c432e3f4d6bf3c17a7f23b6659 ChangeLog 10580
 RMD160 aedd50c30c9cf5e40ccefbc00cb70d5fec69ae6a ChangeLog 10580
 SHA256 51b5602fe986134f2203905175c76decc12473f58c08cbe481f664483f6d3278 ChangeLog 10580
@@ -28,6 +25,9 @@ SHA256 1d62356190ab859cb2cc7ac44673468231d7f68c295935870ff2d12adf8b8c62 files/di
 MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
 RMD160 b0767f92d9be81728e5d2000ebde7a019446af93 files/firmware.agent 1188
 SHA256 57f47199e5171d12a2488fde44825ca755dbacfcc974b1f07c6a0b8bf6e5fd35 files/firmware.agent 1188
+MD5 7b66d8cebe873153b0e8163bcb070edb files/hotplug-20040923-scsi-agent-timeout.patch 668
+RMD160 8b422293b874c61b5c54c4a010d73cdcbf02396c files/hotplug-20040923-scsi-agent-timeout.patch 668
+SHA256 abcc9167aae99799ba5671cc5a9cd35b508fdf60957deddb1ee8e4ef3f28eee2 files/hotplug-20040923-scsi-agent-timeout.patch 668
 MD5 26bdc7a660920610447194535ff8b341 files/hotplug-ifrename.patch 837
 RMD160 e58304b72465b217e5a1f4533503cdfed303bedf files/hotplug-ifrename.patch 837
 SHA256 0d7c9f7588b92f15fa7418ddb5e722d4fe2223615ec9a2e287a35665dd9f42f7 files/hotplug-ifrename.patch 837
@@ -67,19 +67,12 @@ SHA256 a853d77d01fa413ccad2ddbfa9d563deb5549ebb511c36d29b8ad27cd269bc6d hotplug-
 MD5 8ea3943b3d17011f1307236a2d03c89b hotplug-20040920.ebuild 1838
 RMD160 05c13eaf6a859535c30981ca39b699ce5f8aa508 hotplug-20040920.ebuild 1838
 SHA256 f42274c421307d11614b05e74244aebcadec95542c63f2bd2d8510a624fe60ca hotplug-20040920.ebuild 1838
-MD5 3928983e8ac8e26106df3114a57bd0c4 hotplug-20040923-r1.ebuild 2233
-RMD160 9a266953007dd16ba9059bce3fbd438434fb0229 hotplug-20040923-r1.ebuild 2233
-SHA256 92202b5cb836b1ac07dd084a299f6de1eee3faaf1cade58ca0d1d527a49e0591 hotplug-20040923-r1.ebuild 2233
+MD5 9acc7045f2ed50f44539d80f67093022 hotplug-20040923-r1.ebuild 2285
+RMD160 9c6981f598336f075cc50d7c19533dacc266a1e5 hotplug-20040923-r1.ebuild 2285
+SHA256 8d9933b1e0c2e56a423b5ba2e537c327d3e43ed9d796f9d5af4af228d13acaac hotplug-20040923-r1.ebuild 2285
 MD5 3090ae95c340e913c9c10dbf241f09d5 hotplug-20040923.ebuild 2220
 RMD160 5d3148e323bdbeb420ec51053b13fb8e337db588 hotplug-20040923.ebuild 2220
 SHA256 111cf545b19cd16b4d65423a560a9045d6a9ecd30006ad5d89471f41d32676b6 hotplug-20040923.ebuild 2220
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 RMD160 f1b0916156eade656b558b7507109b69ed78d394 metadata.xml 260
 SHA256 31722725c8bf774ad90600f7a3f50f2ca76c1396aad6888ce1cc08ce981b1552 metadata.xml 260
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEC2Rh2+ySkm8kpY0RAvOaAKCtKVYyfND5fYxAXv+p26ywO07peQCeIxdq
-ikdXSTmPMyU9GwEfkYXCdUI=
-=xR64
------END PGP SIGNATURE-----
diff --git a/sys-apps/hotplug/files/hotplug-20040923-scsi-agent-timeout.patch b/sys-apps/hotplug/files/hotplug-20040923-scsi-agent-timeout.patch
new file mode 100644
index 000000000000..47d81426c286
--- /dev/null
+++ b/sys-apps/hotplug/files/hotplug-20040923-scsi-agent-timeout.patch
@@ -0,0 +1,18 @@
+Increase the timeout while waiting for the type attribute.
+This is needed for some fibre channel hardware (Sun StorEdge
+A5000), that only begin to spin up the disk much later than
+this. Patch has no side effects.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- etc/hotplug/scsi.agent.orig	2004-09-20 14:29:54.000000000 -0700
++++ etc/hotplug/scsi.agent	2006-03-14 18:37:43.000000000 -0800
+@@ -22,7 +22,7 @@
+ 
+     # Possibly sleep here to try and avoid races with scsi attributes and block
+     # devices
+-    count=10
++    count=120
+     while [ ! -f $TYPE_ATTR ] && [ $count -gt 0 ]
+     do
+ 	# We seem to always hit this now, so don't output any message.
diff --git a/sys-apps/hotplug/hotplug-20040923-r1.ebuild b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
index 1044cb3e42d2..b794dffb360b 100644
--- a/sys-apps/hotplug/hotplug-20040923-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.3 2006/03/05 22:20:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.4 2006/03/24 04:55:53 robbat2 Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-ifrename.patch
+	epatch "${FILESDIR}"/${P}-scsi-agent-timeout.patch
 }
 
 src_install() {