Hello ports@.

As we previously mentioned in our OpenBSD iSCSI howto

http://openbsd-wip.blogspot.com/2012/01/openbsd-iscsi-howto.html

there was some errors coming out from old target. Newer version
seems to work better.

Regards,
Alexey
diff -uNr netbsd-iscsi-target.orig/Makefile netbsd-iscsi-target/Makefile
--- netbsd-iscsi-target.orig/Makefile	Mon Oct 18 21:36:50 2010
+++ netbsd-iscsi-target/Makefile	Sun Feb  5 14:22:40 2012
@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:50 espie Exp $
+SHARED_ONLY=	Yes
 
 COMMENT=	NetBSD's iSCSI (RFC 3720) target
 
-DISTNAME=	netbsd-iscsi-20080207
+DISTNAME=	netbsd-iscsi-20111006
 PKGNAME=	${DISTNAME:S/-iscsi/-iscsi-target/}
 
 CATEGORIES=	net sysutils
 
+MAINTAINER =	Roman Kravchuk <[email protected]>
+
 HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
 
 # BSD
@@ -17,24 +19,19 @@
 
 WANTLIB=	c pthread
 
+SHARED_LIBS=	iscsi   0.2
+
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 
 CONFIGURE_STYLE=gnu
 USE_GROFF =	Yes
 
-# test harness needs the initiator, not built here (needs fuse)
 NO_REGRESS=	Yes
 
-WRKSRC=		 ${WRKDIST}/src
+SRC_TARGET=	${WRKDIST}/src/target
 
 pre-configure:
 	@perl -pi -e 's,/etc/iscsi,${SYSCONFDIR}/iscsi,g' \
-	    ${WRKSRC}/targets.5 ${WRKSRC}/iscsi-target.8
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iscsi-target ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKDIST}/doc/FAQ ${PREFIX}/share/doc/iscsi
-	${INSTALL_MAN} ${WRKSRC}/iscsi-target.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/targets.5 ${PREFIX}/man/man5
+	    ${SRC_TARGET}/targets.5 ${SRC_TARGET}/iscsi-target.8
 
 .include <bsd.port.mk>
diff -uNr netbsd-iscsi-target.orig/distinfo netbsd-iscsi-target/distinfo
--- netbsd-iscsi-target.orig/distinfo	Sat Aug 15 13:46:59 2009
+++ netbsd-iscsi-target/distinfo	Sun Feb  5 14:10:22 2012
@@ -1,5 +1,5 @@
-MD5 (netbsd-iscsi-20080207.tar.gz) = JvQ/CpBqlhHLHYAoV/6l0w==
-RMD160 (netbsd-iscsi-20080207.tar.gz) = YkF6bHvr+VJXBU+WmQpwCfUVwGQ=
-SHA1 (netbsd-iscsi-20080207.tar.gz) = r+bKL99Gzm3+00Hf0FrrWXWErg8=
-SHA256 (netbsd-iscsi-20080207.tar.gz) = nG5zcslLXMvDPimQMNGf2MJMzqJP+/+qlNQlUadq4oQ=
-SIZE (netbsd-iscsi-20080207.tar.gz) = 249607
+MD5 (netbsd-iscsi-20111006.tar.gz) = H/4SxfcyNW8y77p2Kn+G7g==
+RMD160 (netbsd-iscsi-20111006.tar.gz) = /LKAmPAEj3JlcO4PENbYTmQTMPI=
+SHA1 (netbsd-iscsi-20111006.tar.gz) = 6MAXajJBbhf5DsM+vQFOwZ2XjDs=
+SHA256 (netbsd-iscsi-20111006.tar.gz) = tJlWN5FIueT6y63MkfGAqeKGkzWgRPjePxwvE/3nyy0=
+SIZE (netbsd-iscsi-20111006.tar.gz) = 535267
diff -uNr netbsd-iscsi-target.orig/patches/patch-src_Makefile_am netbsd-iscsi-target/patches/patch-src_Makefile_am
--- netbsd-iscsi-target.orig/patches/patch-src_Makefile_am	Thu Jan  1 03:00:00 1970
+++ netbsd-iscsi-target/patches/patch-src_Makefile_am	Sun Feb  5 14:10:22 2012
@@ -0,0 +1,8 @@
+$OpenBSD$
+--- src/Makefile.am.orig	Sat Jan 14 13:26:38 2012
++++ src/Makefile.am	Sat Jan 14 13:26:58 2012
+@@ -1,3 +1,3 @@
+ ## $NetBSD: Makefile.am,v 1.2 2009/06/30 02:44:52 agc Exp $
+ 
+-SUBDIRS = lib target initiator
++SUBDIRS = lib target
diff -uNr netbsd-iscsi-target.orig/patches/patch-src_Makefile_in netbsd-iscsi-target/patches/patch-src_Makefile_in
--- netbsd-iscsi-target.orig/patches/patch-src_Makefile_in	Thu Jan  1 03:00:00 1970
+++ netbsd-iscsi-target/patches/patch-src_Makefile_in	Sun Feb  5 14:10:22 2012
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig	Sat Jan 14 13:26:52 2012
++++ src/Makefile.in	Sat Jan 14 13:27:10 2012
+@@ -199,7 +199,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib target initiator
++SUBDIRS = lib target
+ all: all-recursive
+ 
+ .SUFFIXES:
diff -uNr netbsd-iscsi-target.orig/pkg/PLIST netbsd-iscsi-target/pkg/PLIST
--- netbsd-iscsi-target.orig/pkg/PLIST	Sat Aug 15 13:46:59 2009
+++ netbsd-iscsi-target/pkg/PLIST	Sun Feb  5 14:27:44 2012
@@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/08/15 10:46:59 sthen Exp $
+@comment $OpenBSD$
+@bin bin/iscsi-target
+lib/libiscsi.a
+lib/libiscsi.la
+@lib lib/libiscsi.so.${LIBiscsi_VERSION}
+@man man/man3/libiscsi.3
 @man man/man5/targets.5
 @man man/man8/iscsi-target.8
-@bin sbin/iscsi-target
-share/doc/iscsi
-@sample ${SYSCONFDIR}/iscsi/
+@rcscript ${RCDIR}/iscsi_target
diff -uNr netbsd-iscsi-target.orig/pkg/iscsi_target.rc netbsd-iscsi-target/pkg/iscsi_target.rc
--- netbsd-iscsi-target.orig/pkg/iscsi_target.rc	Thu Jan  1 03:00:00 1970
+++ netbsd-iscsi-target/pkg/iscsi_target.rc	Sun Feb  5 14:10:22 2012
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+daemon="/usr/local/bin/iscsi-target"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1

Attachment: netbsd-iscsi-target_20111006.tgz
Description: GNU Zip compressed data

Reply via email to