Update to 20110222.

Changes include
- man page claims that you can use auth type = none, but in reality this
didn't work (insisted on a username being given and then used, plus always
advertised CHAP to the target). Make initiator work as advertised (i.e.
defaults to auth type none and so don't require a username).
- document -D option to iscsi-initiator
- Remove hostname from pathname to storage in mount point.
This means /mnt/mytarget.domain.local/target0/storage is now
/mnt/target0/storage.
- Note limitations of CHAP implementation in BUGS section.
- Skip target if TargetName is empty.
- Use relevant TargetAddress, not just first one we happen to find.
- Handle NOP-OUT CmdSN and immediate bit.
- Handle NOP-IN TransferTag=0xffffffff.
- Interim solution for dealing with Underflow bit in iSCSI response.
- iscsi-initiator now talks to istgt and other targets.
- Retry read capacity. Device may not be ready on first access, so need to
wait and re-issue.

5 files changed, 31 insertions, 25 deletions

diff --git a/devel/netbsd-iscsi-lib/Makefile.common b/devel/netbsd-iscsi-lib/Makefile.common
index cbbf394f960..00f02d3b93a 100644
--- a/devel/netbsd-iscsi-lib/Makefile.common
+++ b/devel/netbsd-iscsi-lib/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+# $NetBSD: Makefile.common,v 1.2 2011/02/22 13:33:22 sborrill Exp $
 # Included by:
 # net/netbsd-iscsi-target/Makefile
 # net/netbsd-iscsi-initiator/Makefile
 
-DISTNAME=	netbsd-iscsi-20100416
+DISTNAME=	netbsd-iscsi-20110222
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 MAINTAINER=	agc@NetBSD.org
diff --git a/devel/netbsd-iscsi-lib/buildlink3.mk b/devel/netbsd-iscsi-lib/buildlink3.mk
index 23a4a61ede2..d140797085d 100644
--- a/devel/netbsd-iscsi-lib/buildlink3.mk
+++ b/devel/netbsd-iscsi-lib/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2011/02/22 13:33:22 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>=20100416
-BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20100416
+BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20110222
+BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20110222
 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 1bc3a0f123a..010efbb1974 100644
--- a/devel/netbsd-iscsi-lib/distinfo
+++ b/devel/netbsd-iscsi-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/02/09 09:41:44 rumko Exp $
+$NetBSD: distinfo,v 1.3 2011/02/22 13:33:22 sborrill Exp $
 
-SHA1 (netbsd-iscsi-20100416.tar.gz) = ab8a94f26520f8a1ff7484efa80aa3c0ecfe1c40
-RMD160 (netbsd-iscsi-20100416.tar.gz) = 1bac1a7fdcc8d1df7dd3c32b8fb940933057ba61
-Size (netbsd-iscsi-20100416.tar.gz) = 539715 bytes
-SHA1 (patch-aa) = d715ac59548c72418fe2e0a91b1a33dd3acd8a25
+SHA1 (netbsd-iscsi-20110222.tar.gz) = 223ee3f30e9b1d7b669796c5b9eb1fcb92907cc2
+RMD160 (netbsd-iscsi-20110222.tar.gz) = 3409e8b64db66ebeeff5ff48bd5ba5e7a192c646
+Size (netbsd-iscsi-20110222.tar.gz) = 539976 bytes
 SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
 SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e
+SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e
diff --git a/devel/netbsd-iscsi-lib/patches/patch-aa b/devel/netbsd-iscsi-lib/patches/patch-aa
deleted file mode 100644
index 72ad6912002..00000000000
--- a/devel/netbsd-iscsi-lib/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/02/09 09:41:45 rumko Exp $
-
---- src/lib/initiator.c.orig	2011-02-07 21:24:46 +0100
-+++ src/lib/initiator.c	2011-02-07 21:24:56 +0100
-@@ -57,6 +57,10 @@
- #ifdef HAVE_NETINET_TCP_H
- #include <netinet/tcp.h>
- #endif
-+
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-   
- #ifdef HAVE_SIGNAL_H
- #include <signal.h>
diff --git a/devel/netbsd-iscsi-lib/patches/patch-ad b/devel/netbsd-iscsi-lib/patches/patch-ad
new file mode 100644
index 00000000000..b4c406394c8
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2011/02/22 13:33:22 sborrill Exp $
+Don't hide all error messages from the user
+
+--- src/lib/util.c.orig	2011-02-21 16:22:13.000000000 +0000
++++ src/lib/util.c	2011-02-21 16:22:36.000000000 +0000
+@@ -294,7 +294,6 @@
+ void
+ iscsi_err(const char *f, const int line, const char *fmt, ...)
+ {
+-#ifdef CONFIG_ISCSI_DEBUG
+ 	va_list	vp;
+ 	char	buf[8192];
+ 
+@@ -305,7 +304,6 @@
+ #  ifdef HAVE_SYSLOG
+ 	syslog(LOG_ERR, "pid %d:%s:%d: ***ERROR*** %s", getpid(), f, line, buf);
+ #  endif /* HAVE_SYSLOG */
+-#endif
+ }
+ 
+ void