Update to netbsd-iscsi-20111006.

Allow maximum number of targets in initiator to be set in mk.conf
with ISCSI_INITIATOR_MAX_TARGETS

Changes:
Provide function in libiscsi to return the compile-time limit on number of
targets. Use this function in the initiator, to ensure that the same limit
is used throughout (i.e. stop you attempting to compile the initiator with a
different limit to the library - the initiator uses the library for most of
its functionality).

If truncating the number of targets in the initiator, truncate it to the
correct amount, not half of what it should be.

Obey RFC3720 when determining targets. SendTargets=All MUST be supported
on a discovery session, and MUST NOT be supported on an operational session.
Previously, SendTargets=All was used both in the initial discovery session
and the later session. (from Daisuke Aoyama - author of istgt).

4 files changed, 26 insertions, 10 deletions

diff --git a/devel/netbsd-iscsi-lib/MESSAGE b/devel/netbsd-iscsi-lib/MESSAGE
new file mode 100644
index 00000000000..bf7f845acd6
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/MESSAGE
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2011/10/06 14:19:25 sborrill Exp $
+
+The maximum number of targets supported by the initiator is set at
+compile time. The default maximum is 16, but this can be altered by
+setting ISCSI_INITIATOR_MAX_TARGETS in /etc/mk.conf. If altered,
+netbsd-iscsi-lib must be rebuilt.
+
+This package was compiled with ISCSI_INITIATOR_MAX_TARGETS=${MAX_TARGETS}
+
+===========================================================================
diff --git a/devel/netbsd-iscsi-lib/Makefile.common b/devel/netbsd-iscsi-lib/Makefile.common
index 00f02d3b93a..abcdaff8e56 100644
--- a/devel/netbsd-iscsi-lib/Makefile.common
+++ b/devel/netbsd-iscsi-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.2 2011/02/22 13:33:22 sborrill Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/10/06 14:19:25 sborrill Exp $
 # Included by:
 # net/netbsd-iscsi-target/Makefile
 # net/netbsd-iscsi-initiator/Makefile
 
-DISTNAME=	netbsd-iscsi-20110222
+DISTNAME=	netbsd-iscsi-20111006
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
-MAINTAINER=	agc@NetBSD.org
+MAINTAINER=	sborrill@NetBSD.org
 HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
 LICENSE=	modified-bsd
 
@@ -15,3 +15,8 @@ GNU_CONFIGURE=	yes
 AUTO_MKDIRS=		yes
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+
+# ISCSI_INITIATOR_MAX_TARGETS can be overridden in your mk.conf file
+ISCSI_INITIATOR_MAX_TARGETS?=	16
+MESSAGE_SUBST+=		MAX_TARGETS=${ISCSI_INITIATOR_MAX_TARGETS:Q}
+CFLAGS+=	-DCONFIG_INITIATOR_NUM_TARGETS=${ISCSI_INITIATOR_MAX_TARGETS}
diff --git a/devel/netbsd-iscsi-lib/buildlink3.mk b/devel/netbsd-iscsi-lib/buildlink3.mk
index d140797085d..bc9c43e988a 100644
--- a/devel/netbsd-iscsi-lib/buildlink3.mk
+++ b/devel/netbsd-iscsi-lib/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/02/22 13:33:22 sborrill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2011/10/06 14:19:25 sborrill Exp $
 
 BUILDLINK_TREE+=	netbsd-iscsi-lib
 
 .if !defined(NETBSD_ISCSI_LIB_BUILDLINK3_MK)
 NETBSD_ISCSI_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20110222
-BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20110222
+BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20111006
+BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20111006
 BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?=	../../devel/netbsd-iscsi-lib
 .endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK
 
diff --git a/devel/netbsd-iscsi-lib/distinfo b/devel/netbsd-iscsi-lib/distinfo
index 010efbb1974..e2d4277374f 100644
--- a/devel/netbsd-iscsi-lib/distinfo
+++ b/devel/netbsd-iscsi-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/02/22 13:33:22 sborrill Exp $
+$NetBSD: distinfo,v 1.4 2011/10/06 14:19:25 sborrill Exp $
 
-SHA1 (netbsd-iscsi-20110222.tar.gz) = 223ee3f30e9b1d7b669796c5b9eb1fcb92907cc2
-RMD160 (netbsd-iscsi-20110222.tar.gz) = 3409e8b64db66ebeeff5ff48bd5ba5e7a192c646
-Size (netbsd-iscsi-20110222.tar.gz) = 539976 bytes
+SHA1 (netbsd-iscsi-20111006.tar.gz) = e8c0176a32416e17f90ec33ebd014ec19d978c3b
+RMD160 (netbsd-iscsi-20111006.tar.gz) = fcb28098f0048f726570ee0f10d6d84e641330f2
+Size (netbsd-iscsi-20111006.tar.gz) = 535267 bytes
 SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
 SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e
 SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e