From gslin@infomath.math.nctu.edu.tw  Tue Mar 12 10:12:55 2002
Return-Path: <gslin@infomath.math.nctu.edu.tw>
Received: from Mgw1-out.NCTU.edu.tw (Mgw1-out.NCTU.edu.tw [140.113.1.3])
	by hub.freebsd.org (Postfix) with ESMTP id B5A1437B402
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Mar 2002 10:12:46 -0800 (PST)
Received: from Mgw1-out.NCTU.edu.tw (localhost [127.0.0.1])
	by Mgw1-out.NCTU.edu.tw (8.12.2/8.12.2) with ESMTP id g2CICdib048874
	for <FreeBSD-gnats-submit@freebsd.org.procmail>; Wed, 13 Mar 2002 02:12:39 +0800 (CST)
Received: (from root@localhost)
	by Mgw1-out.NCTU.edu.tw (8.12.2/8.12.2/Submit) id g2CICdU0048873
	for FreeBSD-gnats-submit@freebsd.org.procmail; Wed, 13 Mar 2002 02:12:39 +0800 (CST)
Received: from infomath.math.nctu.edu.tw (infomath.Math.NCTU.edu.tw [140.113.22.119])
	by Mgw1-out.NCTU.edu.tw (8.12.2/8.12.2) with ESMTP id g2CICbib048866
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Mar 2002 02:12:39 +0800 (CST)
Received: by infomath.math.nctu.edu.tw (Postfix, from userid 1000)
	id 7525C3DE4; Wed, 13 Mar 2002 02:12:36 +0800 (CST)
Message-Id: <20020312181236.7525C3DE4@infomath.math.nctu.edu.tw>
Date: Wed, 13 Mar 2002 02:12:36 +0800 (CST)
From: Gea-Suan Lin <gslin@infomath.math.nctu.edu.tw>
Reply-To: Gea-Suan Lin <gslin@infomath.math.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gslin@infomath.math.nctu.edu.tw
Subject: Maintainer Update: ftp/twoftpd
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         35826
>Category:       ports
>Synopsis:       Maintainer Update: ftp/twoftpd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 12 10:20:00 PST 2002
>Closed-Date:    Tue Mar 12 14:27:38 PST 2002
>Last-Modified:  Tue Mar 12 14:27:54 PST 2002
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 4.5-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD InfoMath.Math.NCTU.edu.tw 4.5-RELEASE-p2 FreeBSD 4.5-RELEASE-p2 #5: Fri Mar 8 02:38:09 CST 2002 root@InfoMath.Math.NCTU.edu.tw:/home/obj/usr/src/sys/InFoMath i386


	
>Description:
	See the following url:
	http://lists.em.ca/?command=threadindex&list=bgware&threadid=lmlodipgcpjebkbnpdmk
	
>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/ftp/twoftpd/Makefile twoftpd/Makefile
--- /usr/ports/ftp/twoftpd/Makefile	Sun Mar  3 09:24:36 2002
+++ twoftpd/Makefile	Wed Mar 13 02:09:20 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	twoftpd
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
diff -ruN /usr/ports/ftp/twoftpd/files/patch-aa twoftpd/files/patch-aa
--- /usr/ports/ftp/twoftpd/files/patch-aa	Thu Jan  1 08:00:00 1970
+++ twoftpd/files/patch-aa	Wed Mar 13 02:07:55 2002
@@ -0,0 +1,26 @@
+--- socket/cork.c.orig	Wed Mar 13 02:00:20 2002
++++ socket/cork.c	Wed Mar 13 02:01:45 2002
+@@ -15,9 +15,9 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include "socket.h"
+ 
+@@ -25,10 +25,10 @@
+ {
+ #if defined(TCP_CORK)
+   int flag = 1;
+-  return setsockopt(sock, SOL_TCP, TCP_CORK, &flag, sizeof flag) == 0;
++  return setsockopt(sock, SOL_SOCKET, TCP_CORK, &flag, sizeof flag) == 0;
+ #elif defined(TCP_NOPUSH)
+   int flag = 1;
+-  return setsockopt(sock, SOL_TCP, TCP_NOPUSH, &flag, sizeof flag) == 0;
++  return setsockopt(sock, SOL_SOCKET, TCP_NOPUSH, &flag, sizeof flag) == 0;
+ #else
+   return 1;
+ #endif
diff -ruN /usr/ports/ftp/twoftpd/files/patch-ab twoftpd/files/patch-ab
--- /usr/ports/ftp/twoftpd/files/patch-ab	Thu Jan  1 08:00:00 1970
+++ twoftpd/files/patch-ab	Wed Mar 13 02:08:07 2002
@@ -0,0 +1,29 @@
+--- socket/uncork.c.orig	Wed Mar 13 02:02:05 2002
++++ socket/uncork.c	Wed Mar 13 02:02:35 2002
+@@ -15,9 +15,9 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include "socket.h"
+ 
+@@ -25,13 +25,13 @@
+ {
+ #if defined(TCP_CORK)
+   int flag = 0;
+-  return setsockopt(sock, SOL_TCP, TCP_CORK, &flag, sizeof flag) == 0;
++  return setsockopt(sock, SOL_SOCKET, TCP_CORK, &flag, sizeof flag) == 0;
+ #elif defined(TCP_NOPUSH)
+   /* BSD's TCP_NOPUSH option only takes effect after a write/send.
+    * Hopefully this extra write will cause the TCP stack to send out
+    * any buffered writes. */
+   int flag = 0;
+-  if (setsockopt(sock, SOL_TCP, TCP_NOPUSH, &flag, sizeof flag) != 0) return 0;
++  if (setsockopt(sock, SOL_SOCKET, TCP_NOPUSH, &flag, sizeof flag) != 0) return 0;
+   return write(sock, &flag, 0) == 0;
+ #else
+   return 1;
	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Tue Mar 12 14:27:38 PST 2002 
State-Changed-Why:  
Committed, Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=35826 
>Unformatted:
