ports/122903: Update port: net/iscsi-target

[Mark D. Foster]

>Number:         122903
>Category:       ports
>Synopsis:       Update port: net/iscsi-target
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 19 07:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Mark Foster <mark at foster.cc>
>Release:        FreeBSD 7.0-RELEASE sparc64
>Organization:
>Environment:
System: FreeBSD sonar.foster.dmz 7.0-RELEASE FreeBSD 7.0-RELEASE #15: 
Thu Apr 3 17:17:41 PDT 2008 
root at sonar.foster.dmz:/usr/obj/usr/src/sys/GENERIC sparc64


	
>Description:
	Fixes sparc64 & ppc bug with patch provided by ports/122898
Also adds a pkg-message and minor tweak to pkg-plist

>How-To-Repeat:
	
>Fix:

	

--- iscsi-target-20080207_2.patch begins here ---
diff -urN iscsi-target.old/Makefile iscsi-target/Makefile
--- iscsi-target.old/Makefile	2008-03-16 04:16:11.000000000 -0700
+++ iscsi-target/Makefile	2008-04-18 22:27:04.000000000 -0700
@@ -7,7 +7,7 @@

  PORTNAME=	iscsi
  PORTVERSION=	20080207
-PORTREVISION=	1
+PORTREVISION=	2
  CATEGORIES=	net
  MASTER_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ \
  		http://www.magnesium.net/~mdf/distfiles/
@@ -55,3 +55,4 @@
  .endfor

  .include <bsd.port.mk>
+	@${CAT} ${PKGMESSAGE}
diff -urN iscsi-target.old/files/patch-iscsiutil 
iscsi-target/files/patch-iscsiutil
--- iscsi-target.old/files/patch-iscsiutil	1969-12-31 16:00:00.000000000 
-0800
+++ iscsi-target/files/patch-iscsiutil	2008-04-18 21:35:31.000000000 -0700
@@ -0,0 +1,23 @@
+--- ../include/iscsiutil.h	2007-11-12 15:25:40.000000000 -0800
++++ ../include/iscsiutil.h	2008-04-18 21:31:18.000000000 -0700
+@@ -77,16 +77,20 @@
+ #define ISCSI_HTONLL6(x) (uint64_t) \
+       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) 
 >> 40))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) 
 >> 24))     \
++      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) 
 >> 16))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) 
 >> 8))      \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) 
<< 8))      \
++      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) 
<< 16))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) 
<< 24))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) 
<< 40)))
+
+ #define ISCSI_NTOHLL6(x) (uint64_t) \
+       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) 
 >> 40))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) 
 >> 24))     \
++      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) 
 >> 16))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) 
 >> 8))      \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) 
<< 8))      \
++      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) 
<< 16))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) 
<< 24))     \
+       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) 
<< 40)))
+
diff -urN iscsi-target.old/pkg-message iscsi-target/pkg-message
--- iscsi-target.old/pkg-message	1969-12-31 16:00:00.000000000 -0800
+++ iscsi-target/pkg-message	2008-04-05 09:13:29.000000000 -0700
@@ -0,0 +1,3 @@
+To run iscsi-target server from startup, add iscsi_target_enable="YES"
+to /etc/rc.conf. Extra options can be found in startup script.
+
diff -urN iscsi-target.old/pkg-plist iscsi-target/pkg-plist
--- iscsi-target.old/pkg-plist	2006-10-07 08:25:26.000000000 -0700
+++ iscsi-target/pkg-plist	2008-04-18 21:42:30.000000000 -0700
@@ -14,4 +14,4 @@
  @unexec if cmp -s %D/etc/iscsi/passwd.sample  %D/etc/iscsi/passwd; 
then rm -f %D/etc/iscsi/passwd;  fi
  etc/iscsi/passwd.sample
  @exec if [ ! -f %D/etc/iscsi/passwd  ] ; then cp -p %D/%F %B/passwd;  fi
- at dirrm etc/iscsi
+ at dirrmtry etc/iscsi
--- iscsi-target-20080207_2.patch ends here ---


-- 
Said one park ranger, 'There is considerable overlap between the
  intelligence of the smartest bears and the dumbest tourists.'
Mark D. Foster, CISSP <mark at foster.cc>  http://mark.foster.cc/
>Release-Note:
>Audit-Trail:
>Unformatted: