From owner-svn-ports-all@FreeBSD.ORG  Fri Feb 13 22:38:21 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0261AA75;
 Fri, 13 Feb 2015 22:38:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DDB09670;
 Fri, 13 Feb 2015 22:38:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DMcKpF038040;
 Fri, 13 Feb 2015 22:38:20 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DMcKtT038036;
 Fri, 13 Feb 2015 22:38:20 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201502132238.t1DMcKtT038036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 13 Feb 2015 22:38:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r378946 - in head/net/iet: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 22:38:21 -0000

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);