Fix bug #190516 for newer kernels that do not enable CONFIG_SCSI_PROC_FS by default. It was just causing a misdetection.

Package-Manager: portage-2.1.4

7 files changed, 98 insertions, 24 deletions

diff --git a/sys-apps/rescan-scsi-bus/ChangeLog b/sys-apps/rescan-scsi-bus/ChangeLog
index 517f105d43d5..e3851c391b00 100644
--- a/sys-apps/rescan-scsi-bus/ChangeLog
+++ b/sys-apps/rescan-scsi-bus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/rescan-scsi-bus
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/ChangeLog,v 1.11 2007/11/20 21:25:51 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/ChangeLog,v 1.12 2008/01/15 09:10:41 robbat2 Exp $
+
+*rescan-scsi-bus-1.25-r1 (15 Jan 2008)
+
+  15 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch,
+  rescan-scsi-bus-1.24.ebuild, rescan-scsi-bus-1.25.ebuild,
+  +rescan-scsi-bus-1.25-r1.ebuild:
+  Fix bug #190516 for newer kernels that do not enable CONFIG_SCSI_PROC_FS by
+  default. It was just causing a misdetection.
 
   20 Nov 2007; Markus Rothe <corsair@gentoo.org>
   rescan-scsi-bus-1.25.ebuild:
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 523dfd2d95e2..8d64da374e40 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,17 +1,25 @@
+AUX rescan-scsi-bus-1.25-support-sysfs-only-systems.patch 398 RMD160 d6d1085c19cf3910269e5e8ef1d1a6891d446f5c SHA1 4bce5fa02101fefaa023a0ea3d73b3b68c77f8ee SHA256 d0e04fda6684e3935157bf33162a8a1a795550a58082b2985f3a53035c29bb9c
+MD5 a0332e6fada0799964d6c7acf8bc46cf files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch 398
+RMD160 d6d1085c19cf3910269e5e8ef1d1a6891d446f5c files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch 398
+SHA256 d0e04fda6684e3935157bf33162a8a1a795550a58082b2985f3a53035c29bb9c files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch 398
 DIST rescan-scsi-bus.sh-1.24 11369 RMD160 b1b743ff7def0ef80152f03606fdf2064d376940 SHA1 90b2b92b0e103041fa6b5f6cdf4a2f30bd98c45f SHA256 5403713f3ac21055bdcae3de2cf3bd2b9bd552e666de64732accbde6c1c31dc2
 DIST rescan-scsi-bus.sh-1.25 14669 RMD160 cbfc8f95272ae0005c6042a4ca55cd4276b01513 SHA1 8ee9614857a2c2788e59676140fb1347d7a871b2 SHA256 a2e652323da19cb52d743aa04753c0411127fccbaf531b994c9bf10f42b388fa
-EBUILD rescan-scsi-bus-1.24.ebuild 819 RMD160 45130f03f24337f3f39ad24a1950db5a1dc2eef8 SHA1 7004a4ce49a68fae44bdf0c9827428646cb58040 SHA256 b2562390972e41ae4f4fd038c3d1b27fd6cb9331e52901aec93b7124143f7f4c
-MD5 ab3de9e67bcb28c810fb55ce7d8c3296 rescan-scsi-bus-1.24.ebuild 819
-RMD160 45130f03f24337f3f39ad24a1950db5a1dc2eef8 rescan-scsi-bus-1.24.ebuild 819
-SHA256 b2562390972e41ae4f4fd038c3d1b27fd6cb9331e52901aec93b7124143f7f4c rescan-scsi-bus-1.24.ebuild 819
-EBUILD rescan-scsi-bus-1.25.ebuild 856 RMD160 d86855031a6f4772a97fdd272b4b54e201cc5e60 SHA1 e14ee7e348a1f42f814458301b22cbcfe7aaacc0 SHA256 4b4e3751386744f0ecc038aae13a79d6fa98b75107fe78e9799cb5be84c2bbc6
-MD5 687e5916f20e0a7cfe787d8f0e5fc862 rescan-scsi-bus-1.25.ebuild 856
-RMD160 d86855031a6f4772a97fdd272b4b54e201cc5e60 rescan-scsi-bus-1.25.ebuild 856
-SHA256 4b4e3751386744f0ecc038aae13a79d6fa98b75107fe78e9799cb5be84c2bbc6 rescan-scsi-bus-1.25.ebuild 856
-MISC ChangeLog 1464 RMD160 f1ce7f6f59eec9373f76e1a262ae23f69012d766 SHA1 b9832ace9cc6a2bf3d3ba35d4687e7a38ba9e832 SHA256 27b78d57f49bd4c4771e254b78f6f4e757eec4c64b587d04eb3392fdb9e6ce58
-MD5 09338a31ce27c76ef0d5aefb279acea6 ChangeLog 1464
-RMD160 f1ce7f6f59eec9373f76e1a262ae23f69012d766 ChangeLog 1464
-SHA256 27b78d57f49bd4c4771e254b78f6f4e757eec4c64b587d04eb3392fdb9e6ce58 ChangeLog 1464
+EBUILD rescan-scsi-bus-1.24.ebuild 801 RMD160 cb384ebd87bc6b4823797b057b4e7741965a40c7 SHA1 62b0c32d7ace59e2cfe3bc4892c1fb90c18dbe65 SHA256 4e8b884cdda89b7840976db5037e584672b6f3ad27043ab03a77d53bcf1ac337
+MD5 793f68c9f07d2320bda0094e4caad6d7 rescan-scsi-bus-1.24.ebuild 801
+RMD160 cb384ebd87bc6b4823797b057b4e7741965a40c7 rescan-scsi-bus-1.24.ebuild 801
+SHA256 4e8b884cdda89b7840976db5037e584672b6f3ad27043ab03a77d53bcf1ac337 rescan-scsi-bus-1.24.ebuild 801
+EBUILD rescan-scsi-bus-1.25-r1.ebuild 1100 RMD160 c120632242eea98a71b606f88d524f472d5f2cd4 SHA1 d735d643071b22bf97c35aa181bbc23324672e8f SHA256 18dd8c56307dc9f608765f99f1e26e0b3e006d366f61b42f288aa830895c775d
+MD5 fb6fed7ec4f448d0357e56825b78b355 rescan-scsi-bus-1.25-r1.ebuild 1100
+RMD160 c120632242eea98a71b606f88d524f472d5f2cd4 rescan-scsi-bus-1.25-r1.ebuild 1100
+SHA256 18dd8c56307dc9f608765f99f1e26e0b3e006d366f61b42f288aa830895c775d rescan-scsi-bus-1.25-r1.ebuild 1100
+EBUILD rescan-scsi-bus-1.25.ebuild 839 RMD160 e23e143c548427599e852f40df5d31812a219219 SHA1 0b3e550656db214f1b65dac32d7c9fef9e31b897 SHA256 c58d889086b6c19dd7511e3d4912be060a1699dc210bf5c79af319ba0bf37828
+MD5 c7e6f7b0a52362af51d751718190f4d8 rescan-scsi-bus-1.25.ebuild 839
+RMD160 e23e143c548427599e852f40df5d31812a219219 rescan-scsi-bus-1.25.ebuild 839
+SHA256 c58d889086b6c19dd7511e3d4912be060a1699dc210bf5c79af319ba0bf37828 rescan-scsi-bus-1.25.ebuild 839
+MISC ChangeLog 1842 RMD160 1670dc0d6e070a5985ca4826555246030c75f985 SHA1 2aea59bf088839d49a8276d27424fbf19fa13fb6 SHA256 2bf96f6080c01bfe3fa12c1468a5eedf2193aa9d45b2ec9510448c64b8a16f25
+MD5 25b264fbb7045576f42280d00fd9580b ChangeLog 1842
+RMD160 1670dc0d6e070a5985ca4826555246030c75f985 ChangeLog 1842
+SHA256 2bf96f6080c01bfe3fa12c1468a5eedf2193aa9d45b2ec9510448c64b8a16f25 ChangeLog 1842
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
 MD5 e25e70948beb656da0b6fa0b48124f16 metadata.xml 227
 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 metadata.xml 227
@@ -22,3 +30,6 @@ SHA256 3c17359ee20ffbeb14390662bb2f8b2b45d483bfc6995a309b763977c11e5ab4 files/di
 MD5 1206a05f9654242380abe307d69c0b82 files/digest-rescan-scsi-bus-1.25 247
 RMD160 652ae849ec9427e796428aac4a36e0661dddc030 files/digest-rescan-scsi-bus-1.25 247
 SHA256 dd8202e2b78128893b650f085acb2bf2e0b5d6459ecf556c7f0ebd3ee60fbc5a files/digest-rescan-scsi-bus-1.25 247
+MD5 1206a05f9654242380abe307d69c0b82 files/digest-rescan-scsi-bus-1.25-r1 247
+RMD160 652ae849ec9427e796428aac4a36e0661dddc030 files/digest-rescan-scsi-bus-1.25-r1 247
+SHA256 dd8202e2b78128893b650f085acb2bf2e0b5d6459ecf556c7f0ebd3ee60fbc5a files/digest-rescan-scsi-bus-1.25-r1 247
diff --git a/sys-apps/rescan-scsi-bus/files/digest-rescan-scsi-bus-1.25-r1 b/sys-apps/rescan-scsi-bus/files/digest-rescan-scsi-bus-1.25-r1
new file mode 100644
index 000000000000..5cc4db95e4c1
--- /dev/null
+++ b/sys-apps/rescan-scsi-bus/files/digest-rescan-scsi-bus-1.25-r1
@@ -0,0 +1,3 @@
+MD5 f53c6fead50d380c78f79ba026cca81f rescan-scsi-bus.sh-1.25 14669
+RMD160 cbfc8f95272ae0005c6042a4ca55cd4276b01513 rescan-scsi-bus.sh-1.25 14669
+SHA256 a2e652323da19cb52d743aa04753c0411127fccbaf531b994c9bf10f42b388fa rescan-scsi-bus.sh-1.25 14669
diff --git a/sys-apps/rescan-scsi-bus/files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch b/sys-apps/rescan-scsi-bus/files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch
new file mode 100644
index 000000000000..7d890d0d5f66
--- /dev/null
+++ b/sys-apps/rescan-scsi-bus/files/rescan-scsi-bus-1.25-support-sysfs-only-systems.patch
@@ -0,0 +1,14 @@
+--- rescan-scsi-bus.sh.orig	2008-01-15 01:01:21.316547000 -0800
++++ rescan-scsi-bus.sh	2008-01-15 01:02:02.704184735 -0800
+@@ -444,7 +444,10 @@
+     echo $result
+ }
+ 
+-if test ! -d /proc/scsi/; then
++# /proc/scsi may not exist in new 2.6 kernels without CONFIG_SCSI_PROC_FS
++if test -d /proc/scsi/ || test -d /sys/bus/scsi/; then
++	:
++else
+   echo "Error: SCSI subsystem not active"
+   exit 1
+ fi	
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild
index e4aff91d7532..f119ab87562b 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild,v 1.6 2007/08/24 03:19:04 metalgod Exp $
-
-inherit versionator
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild,v 1.7 2008/01/15 09:10:41 robbat2 Exp $
 
 DESCRIPTION="Script to rescan the SCSI bus without rebooting"
 HOMEPAGE="http://www.garloff.de/kurt/linux/"
@@ -22,7 +20,7 @@ RDEPEND=">=sys-apps/sg3_utils-1.24
 S="${WORKDIR}"
 
 src_unpack() {
-	cp -f ${DISTDIR}/${A} ${WORKDIR}/${SCRIPT_NAME}
+	cp -f "${DISTDIR}"/${A} "${WORKDIR}"/${SCRIPT_NAME}
 }
 
 src_compile() {
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild
new file mode 100644
index 000000000000..7fa7e889fd53
--- /dev/null
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild,v 1.1 2008/01/15 09:10:41 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Script to rescan the SCSI bus without rebooting"
+HOMEPAGE="http://www.garloff.de/kurt/linux/"
+SCRIPT_NAME="${PN}.sh"
+SRC_NAME="${SCRIPT_NAME}-${PV}"
+SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sys-apps/sg3_utils-1.24
+		 sys-apps/module-init-tools
+		 app-shells/bash"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	einfo "Unpacking into ${WORKDIR}/"
+	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
+	epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	into /usr
+	dosbin ${SCRIPT_NAME}
+	# Some scripts look for this without the trailing .sh
+	# Some look for it with the trailing .sh, so have a symlink
+	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
+}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild
index 4fbc471e35c1..d2f6f7a3abb8 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild,v 1.3 2007/11/20 21:25:51 corsair Exp $
-
-inherit versionator
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild,v 1.4 2008/01/15 09:10:41 robbat2 Exp $
 
 DESCRIPTION="Script to rescan the SCSI bus without rebooting"
 HOMEPAGE="http://www.garloff.de/kurt/linux/"
@@ -22,7 +20,7 @@ RDEPEND=">=sys-apps/sg3_utils-1.24
 S="${WORKDIR}"
 
 src_unpack() {
-	cp -f ${DISTDIR}/${A} ${WORKDIR}/${SCRIPT_NAME}
+	cp -f "${DISTDIR}"/${A} "${WORKDIR}"/${SCRIPT_NAME}
 }
 
 src_compile() {