Update the intel-iscsi package to nb2:

+ build and install the OSD functionality as well.

5 files changed, 46 insertions, 15 deletions

diff --git a/devel/intel-iscsi/Makefile b/devel/intel-iscsi/Makefile
index 34ec955c947..b8b1565ae6f 100644
--- a/devel/intel-iscsi/Makefile
+++ b/devel/intel-iscsi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/11/03 10:54:17 agc Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/03 23:58:41 agc Exp $
 
 DISTNAME=	iscsi-Jan15
 PKGNAME=	intel-iscsi-20040115
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=intel-iscsi/}
 EXTRACT_SUFX=	.tgz
@@ -14,10 +14,10 @@ COMMENT=	Intel Lab's software reference implementation of iSCSI RFC 3720
 WRKSRC=		${WRKDIR}/IntelLabs-v20-011504
 
 do-build:
-	cd ${WRKSRC}/src && ${MAKE} ufsdisk uramdisk ufsdisk_mmap usocktest utest ktest
+	cd ${WRKSRC}/src && ${MAKE} ufsdisk uramdisk ufsdisk_mmap usocktest utest ktest uosd
 
 do-install:
-	for f in ufsdisk uramdisk ufsdisk_mmap usocktest utest ktest; do \
+	for f in ufsdisk uramdisk ufsdisk_mmap usocktest utest ktest uosd; do \
 		${INSTALL_PROGRAM} ${WRKSRC}/src/$$f ${PREFIX}/bin;	\
 	done
 
diff --git a/devel/intel-iscsi/PLIST b/devel/intel-iscsi/PLIST
index 52bb2cb5919..b97324c4bd6 100644
--- a/devel/intel-iscsi/PLIST
+++ b/devel/intel-iscsi/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/03 23:58:41 agc Exp $
 bin/ufsdisk
 bin/uramdisk
 bin/ufsdisk_mmap
 bin/usocktest
 bin/utest
 bin/ktest
+bin/uosd
diff --git a/devel/intel-iscsi/distinfo b/devel/intel-iscsi/distinfo
index e9adc295312..12385e5477f 100644
--- a/devel/intel-iscsi/distinfo
+++ b/devel/intel-iscsi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/11/03 10:54:17 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/03 23:58:41 agc Exp $
 
 SHA1 (iscsi-Jan15.tgz) = 9928feca21448cd7ebe628067f98201e0499cf25
 RMD160 (iscsi-Jan15.tgz) = b334fb52c5906d1dd5689e74300edc4529292a33
@@ -7,12 +7,12 @@ SHA1 (patch-aa) = 57ce4429360399d7381c6e1fb3d215629d2eca50
 SHA1 (patch-ab) = da3236d030f30bd3c70d5aff639369dd70846e38
 SHA1 (patch-ac) = 43d5b489b6b2ab2f7fb3f4cf9ac0bf3858111762
 SHA1 (patch-ad) = 0493fcf87a889fdb6c98525ae86543aa04f2e83d
-SHA1 (patch-ae) = 478cda607f8b58217b6a8c7f93c335c08230723e
+SHA1 (patch-ae) = c7f82de58315b872cce36955a2e3247473776808
 SHA1 (patch-af) = 850e631ae7bc121f9de7efd764d0ee2c19384303
 SHA1 (patch-ag) = 98c76d4c5da97f9c2289584e50bb88d1cdf18ad3
 SHA1 (patch-ah) = 8a1af68c604bb5f52011509d68678cef894eafbc
 SHA1 (patch-ai) = 11447ee63e17ffa9348dc6d8963053e2afba1cac
-SHA1 (patch-ak) = d57505b3e4a6a1236b088318574db63fcdbe3988
+SHA1 (patch-ak) = 22002e9678d56fa52b2b6b5f152533f5cd50dc95
 SHA1 (patch-al) = a9d066277c04867881b8932a8ac1a29d9c2d8ad1
 SHA1 (patch-am) = 48783443ad456f7103cd86d9e894c4aa814bcba6
 SHA1 (patch-an) = 23e399d7748972031036a05555c823cd08085902
diff --git a/devel/intel-iscsi/patches/patch-ae b/devel/intel-iscsi/patches/patch-ae
index 2d524ffa2f7..fe4d7162d32 100644
--- a/devel/intel-iscsi/patches/patch-ae
+++ b/devel/intel-iscsi/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 23:58:41 agc Exp $
 
 --- src/Makefile	8 Oct 2005 22:21:15 -0000	1.1.1.1
 +++ src/Makefile	8 Oct 2005 22:24:25 -0000	1.2
@@ -23,3 +23,15 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
  
  #
  # Compilation Targets
+@@ -67,8 +66,10 @@
+ #
+ 
+ USER_TARGET_OBJS = utarget.o target.o iscsi.o util.o parameters.o
+-uosd: osd.o $(USER_TARGET_OBJS)
++$(BIN)/uosd: osd.o $(USER_TARGET_OBJS)
+ 	$(CC) $(CFLAGS) osd.o $(USER_TARGET_OBJS) -lpthread -o $(BIN)/uosd
++uosd: osd.o $(USER_TARGET_OBJS)
++	$(CC) $(CFLAGS) osd.o $(USER_TARGET_OBJS) -lpthread -o uosd
+ $(BIN)/uramdisk: disk.c $(USER_TARGET_OBJS)
+ 	$(CC) $(CFLAGS) -DCONFIG_DISK_RAMDISK disk.c $(USER_TARGET_OBJS) -lpthread -o $(BIN)/uramdisk
+ $(BIN)/ufsdisk: disk.c $(USER_TARGET_OBJS)
diff --git a/devel/intel-iscsi/patches/patch-ak b/devel/intel-iscsi/patches/patch-ak
index 888e017afbe..9ec549cd5fb 100644
--- a/devel/intel-iscsi/patches/patch-ak
+++ b/devel/intel-iscsi/patches/patch-ak
@@ -1,8 +1,26 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
+$NetBSD: patch-ak,v 1.2 2005/11/03 23:58:41 agc Exp $
 
 --- src/osd.c	8 Oct 2005 22:21:15 -0000	1.1.1.1
 +++ src/osd.c	8 Oct 2005 23:37:34 -0000	1.2
-@@ -305,9 +305,9 @@
+@@ -51,12 +51,15 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+-#include <sys/vfs.h>
+ #include <utime.h>
+ #endif
+-#ifndef FreeBSD
++#ifdef __linux__
++#include <sys/vfs.h>
+ #include <scsi/scsi.h>
+ #endif
++#ifdef __NetBSD__
++#include "scsi_cmd_codes.h"
++#endif
+ #include "iscsi.h"
+ #include "util.h"
+ #include "device.h"
+@@ -305,9 +308,9 @@
  
          TRACE(TRACE_OSD, "OSD_SET_ATTR(lun %llu, GroupID 0x%x, UserID 0x%llx)\n", args->lun, osd_args.GroupID, osd_args.UserID);
          for (i=0; i<osd_args.set_attributes_list_length;) {
@@ -15,7 +33,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
            sprintf(FileName, "%s/lun_%llu/0x%x/0x%llx.0x%x.%u",
                    base_dir, args->lun, osd_args.GroupID, osd_args.UserID, page, attr);
            if ((rc=open(FileName, O_WRONLY|O_CREAT, 0644))==-1) {
-@@ -474,18 +474,18 @@
+@@ -474,18 +477,18 @@
          int i;
  
          for (i=0; i<osd_args.get_attributes_list_length;) {
@@ -40,7 +58,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
                    break;
                  default:
                    TRACE_ERROR("unknown attr index %u\n", index);
-@@ -495,16 +495,16 @@
+@@ -495,16 +498,16 @@
              case (0x00000001):
                switch(index) {
                  case (0x1):
@@ -65,7 +83,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
                    break;
                  default:
                    TRACE_ERROR("unknown attr index %u\n", index);
-@@ -517,9 +517,9 @@
+@@ -517,9 +520,9 @@
              case (0x30000000):
                switch(index) {
                  case (0x1):
@@ -78,7 +96,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/10/30 21:02:57 agc Exp $
                    sprintf(FileName, "%s/lun_%llu/0x%x/0x%llx.0x%x.%u",
                            base_dir, args->lun, osd_args.GroupID, osd_args.UserID, page, index);
                    if ((rc=open(FileName, O_RDONLY, 0644))==-1) {
-@@ -557,25 +557,25 @@
+@@ -557,25 +560,25 @@
          switch (osd_args.get_attributes_page) {
            case (0x40000001):
              index = 1;