Update the NetBSD iSCSI initiator and target to version 20071221.

Changes since previous version:

+ Incorporate a minor build change for platforms without strlcat(3).

+ Add the new "size" keyword to the extent definition when presenting targets:

When defining extents, the new keyword "size" can be used in the place
of the physical size of the regular file. This is useful for presenting
ISO images to initiators, as in the following:

        In /etc/iscsi/targets:
        # present an ISO image
        extent2         /usr/sets/20071214/release/iso/i386cd.iso 0 size
        target2         ro      extent2         any

        % priv /etc/rc.d/iscsi_target restart
        Stopping iscsi_target.
        Starting iscsi_target.
        Reading configuration from `/etc/iscsi/targets'
        target0:rw:any
                extent0:/tmp/iscsi-target0:0:104857600
        target1:rw:any
                extent1:/tmp/iscsi-target1:0:52428800
        target2:ro:any
                extent2:/usr/sets/20071214/release/iso/i386cd.iso:0:354906112
        DISK: 1 logical unit (204800 blocks, 512 bytes/block), type iscsi fs
        DISK: LUN 0: 100 MB disk storage for "target0"
        DISK: 1 logical unit (102400 blocks, 512 bytes/block), type iscsi fs
        DISK: LUN 0: 50 MB disk storage for "target1"
        DISK: 1 logical unit (693176 blocks, 512 bytes/block), type iscsi fs
        DISK: LUN 0: 338 MB readonly disk storage for "target2"
        TARGET: TargetName is iqn.1994-04.org.netbsd.iscsi-target
        %

Please note that the NetBSD initiator can mount (via vnd) an iSCSI target
presented in this manner. The Microsoft iSCSI initiator sees the read-only
target as a normal SCSI disk, and fails (not surprisingly) to initialize
the disk. It's now possible to make ISO images available via iSCSI, and
NetBSD will DTRT.

In read-only targets, don't attempt to seek to the last block and rewrite
it, it may not work.

Don't assign 8 MB of unused space for use in each iSCSI disk - just use
1MB, which will be enough for the scatter gather iovecs.

Get rid of some dead code.

4 files changed, 13 insertions, 13 deletions

diff --git a/devel/netbsd-iscsi-initiator/Makefile b/devel/netbsd-iscsi-initiator/Makefile
index 8a73abfb3af..19e04635d8c 100644
--- a/devel/netbsd-iscsi-initiator/Makefile
+++ b/devel/netbsd-iscsi-initiator/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2007/12/18 11:38:44 agc Exp $
+# $NetBSD: Makefile,v 1.7 2007/12/21 13:26:42 agc Exp $
 
-DISTNAME=	netbsd-iscsi-20071218
+DISTNAME=	netbsd-iscsi-20071221
 PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-initiator/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alistaircrooks.co.uk/src/
@@ -21,7 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/iscsifs ${DESTDIR}${PREFIX}/sbin/iscsifs
 	${INSTALL_MAN} ${WRKSRC}/src/iscsifs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/iscsifs.8
 
-#.include "../../mk/fuse.buildlink3.mk"
+.include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/netbsd-iscsi-initiator/distinfo b/devel/netbsd-iscsi-initiator/distinfo
index a15c9ac036f..f981cc9c567 100644
--- a/devel/netbsd-iscsi-initiator/distinfo
+++ b/devel/netbsd-iscsi-initiator/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/12/18 11:38:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/12/21 13:26:43 agc Exp $
 
-SHA1 (netbsd-iscsi-20071218.tar.gz) = 043d357987e1548fb9bdd32da7d3fdea2c6dae82
-RMD160 (netbsd-iscsi-20071218.tar.gz) = 5e3564694c09b77e839f58b23bdb61953e6d1b50
-Size (netbsd-iscsi-20071218.tar.gz) = 253331 bytes
+SHA1 (netbsd-iscsi-20071221.tar.gz) = 800455a6bbe909719aa3969fcb32974256640772
+RMD160 (netbsd-iscsi-20071221.tar.gz) = 1e6a7d6e564a45966527754446660ce0a27da58c
+Size (netbsd-iscsi-20071221.tar.gz) = 254599 bytes
 SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14
diff --git a/devel/netbsd-iscsi-target/Makefile b/devel/netbsd-iscsi-target/Makefile
index 62bde1fb875..3c0d1590bbe 100644
--- a/devel/netbsd-iscsi-target/Makefile
+++ b/devel/netbsd-iscsi-target/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2007/12/18 11:30:08 agc Exp $
+# $NetBSD: Makefile,v 1.7 2007/12/21 13:26:43 agc Exp $
 
-DISTNAME=	netbsd-iscsi-20071218
+DISTNAME=	netbsd-iscsi-20071221
 PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-target/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alistaircrooks.co.uk/src/
diff --git a/devel/netbsd-iscsi-target/distinfo b/devel/netbsd-iscsi-target/distinfo
index c0e803c6c69..4c595b7dd59 100644
--- a/devel/netbsd-iscsi-target/distinfo
+++ b/devel/netbsd-iscsi-target/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/12/18 11:30:08 agc Exp $
+$NetBSD: distinfo,v 1.9 2007/12/21 13:26:43 agc Exp $
 
-SHA1 (netbsd-iscsi-20071218.tar.gz) = 043d357987e1548fb9bdd32da7d3fdea2c6dae82
-RMD160 (netbsd-iscsi-20071218.tar.gz) = 5e3564694c09b77e839f58b23bdb61953e6d1b50
-Size (netbsd-iscsi-20071218.tar.gz) = 253331 bytes
+SHA1 (netbsd-iscsi-20071221.tar.gz) = 800455a6bbe909719aa3969fcb32974256640772
+RMD160 (netbsd-iscsi-20071221.tar.gz) = 1e6a7d6e564a45966527754446660ce0a27da58c
+Size (netbsd-iscsi-20071221.tar.gz) = 254599 bytes
 SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14