Update package to nb1:

recognise the REPORT_LUNS SCSI command in the iSCSI target, and just
return the maximum number of LUNs that the target can handle.

4 files changed, 28 insertions, 8 deletions

diff --git a/devel/intel-iscsi/Makefile b/devel/intel-iscsi/Makefile
index d9251fc6415..34ec955c947 100644
--- a/devel/intel-iscsi/Makefile
+++ b/devel/intel-iscsi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/03 10:54:17 agc Exp $
 
 DISTNAME=	iscsi-Jan15
 PKGNAME=	intel-iscsi-20040115
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=intel-iscsi/}
 EXTRACT_SUFX=	.tgz
diff --git a/devel/intel-iscsi/distinfo b/devel/intel-iscsi/distinfo
index d35fcc0bb05..e9adc295312 100644
--- a/devel/intel-iscsi/distinfo
+++ b/devel/intel-iscsi/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+$NetBSD: distinfo,v 1.2 2005/11/03 10:54:17 agc Exp $
 
 SHA1 (iscsi-Jan15.tgz) = 9928feca21448cd7ebe628067f98201e0499cf25
 RMD160 (iscsi-Jan15.tgz) = b334fb52c5906d1dd5689e74300edc4529292a33
 Size (iscsi-Jan15.tgz) = 114431 bytes
 SHA1 (patch-aa) = 57ce4429360399d7381c6e1fb3d215629d2eca50
 SHA1 (patch-ab) = da3236d030f30bd3c70d5aff639369dd70846e38
-SHA1 (patch-ac) = 74ba11f527611aa7ceecaf6bb3a2e5c4271088fc
+SHA1 (patch-ac) = 43d5b489b6b2ab2f7fb3f4cf9ac0bf3858111762
 SHA1 (patch-ad) = 0493fcf87a889fdb6c98525ae86543aa04f2e83d
 SHA1 (patch-ae) = 478cda607f8b58217b6a8c7f93c335c08230723e
-SHA1 (patch-af) = 45294ce185c6e34b24531ae1f67dc1fb5fc4c8e9
+SHA1 (patch-af) = 850e631ae7bc121f9de7efd764d0ee2c19384303
 SHA1 (patch-ag) = 98c76d4c5da97f9c2289584e50bb88d1cdf18ad3
 SHA1 (patch-ah) = 8a1af68c604bb5f52011509d68678cef894eafbc
 SHA1 (patch-ai) = 11447ee63e17ffa9348dc6d8963053e2afba1cac
diff --git a/devel/intel-iscsi/patches/patch-ac b/devel/intel-iscsi/patches/patch-ac
index 8a2cb96896e..c6da4865c8d 100644
--- a/devel/intel-iscsi/patches/patch-ac
+++ b/devel/intel-iscsi/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 10:54:17 agc Exp $
 
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ include/scsi_cmd_codes.h	8 Oct 2005 23:08:56 -0000	1.1
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +/* taken from http://www.arkeia.com/resources/scsi_rsc.html */
 +
 +#ifndef SCSI_CMD_CODES_H_
@@ -16,7 +16,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
 +	READ_CAPACITY = 0x25,
 +	READ_10 = 0x28,
 +	WRITE_10 = 0x2a,
-+	VERIFY = 0x2f
++	VERIFY = 0x2f,
++	REPORT_LUNS = 0xa0
 +};
 +
 +#endif /* !SCSI_CMD_CODES_H_ */
diff --git a/devel/intel-iscsi/patches/patch-af b/devel/intel-iscsi/patches/patch-af
index d18d5b65b6d..28380fc31bf 100644
--- a/devel/intel-iscsi/patches/patch-af
+++ b/devel/intel-iscsi/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+$NetBSD: patch-af,v 1.2 2005/11/03 10:54:17 agc Exp $
 
 --- src/disk.c	8 Oct 2005 22:21:15 -0000	1.1.1.1
 +++ src/disk.c	8 Oct 2005 23:37:34 -0000	1.3
@@ -53,3 +53,21 @@ $NetBSD: patch-af,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
        len = cdb[4];
        if (!len) len = 256;
        TRACE(TRACE_SCSI_CMD, "READ_6(lba %u, len %u blocks)\n", lba, len);
+@@ -372,6 +383,17 @@
+ 	  args->status = 0;
+ 	  break;
+ 
++	case REPORT_LUNS:
++		TRACE(TRACE_SCSI_CMD, "REPORT LUNS\n");
++		data = args->send_data;
++		data[3] = CONFIG_DISK_MAX_LUNS;
++			/* just report the maximum (CONFIG_DISK_MAX_LUNS) to the initiator */
++		args->input = 8;
++		args->length = 16;
++		args->status = 0;
++		break;
++
++
+     default:
+       //TRACE_ERROR("UNKNOWN OPCODE 0x%x\n", cdb[0]); // comment to not cause confusion with some initiator
+       args->status = 0x02;