svn commit: r378946 - in head/net/iet: . files

[Xin LI]

Author: delphij
Date: Fri Feb 13 22:38:19 2015
New Revision: 378946
URL: https://svnweb.freebsd.org/changeset/ports/378946
QAT: https://qat.redports.org/buildarchive/r378946/

Log:
  Add a new patch for iet(4) after sendfile refactor.
  
  This would fix build for -CURRENT.

Modified:
  head/net/iet/Makefile
  head/net/iet/files/patch-freebsd11

Modified: head/net/iet/Makefile
==============================================================================
--- head/net/iet/Makefile	Fri Feb 13 21:41:22 2015	(r378945)
+++ head/net/iet/Makefile	Fri Feb 13 22:38:19 2015	(r378946)
@@ -3,7 +3,7 @@
 
 PORTNAME=	iet
 PORTVERSION=	1.4.20.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net kld
 MASTER_SITES=	SF/iscsitarget/iscsitarget/${PORTVERSION}/
 DISTNAME=	iscsitarget-${PORTVERSION}

Modified: head/net/iet/files/patch-freebsd11
==============================================================================
--- head/net/iet/files/patch-freebsd11	Fri Feb 13 21:41:22 2015	(r378945)
+++ head/net/iet/files/patch-freebsd11	Fri Feb 13 22:38:19 2015	(r378946)
@@ -10,3 +10,17 @@
  #define DATA_PROTECT			SSD_KEY_DATA_PROTECT
  #define NO_SENSE			SSD_KEY_NO_SENSE
  #define MEDIUM_ERROR			SSD_KEY_MEDIUM_ERROR
+--- kernel/conn.c.orig	2015-02-13 14:23:20.438348146 -0800
++++ kernel/conn.c	2015-02-13 14:33:52.728261609 -0800
+@@ -80,7 +80,11 @@
+ 
+ 	if ((so->so_state & SS_ISDISCONNECTING) ||(so->so_state & SS_ISDISCONNECTED))
+ 		conn_close(conn);
++#if __FreeBSD_version >= 1100048
++	else if (soreadable(so))
++#else
+ 	else if (so->so_rcv.sb_cc || !(so->so_rcv.sb_state & SBS_CANTRCVMORE))
++#endif
+ 		__nthread_wakeup(info);
+ 
+ 	return (SU_OK);