Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 May 2002 16:45:27 +0800 (CST)
From:      Gea-Suan Lin <gslin@infomath.math.nctu.edu.tw>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gslin@infomath.math.nctu.edu.tw
Subject:   ports/38237: Maintainer Update port: ftp/twoftpd
Message-ID:  <20020518084527.3B08F3D99@infomath.math.nctu.edu.tw>

next in thread | raw e-mail | index | archive | help

>Number:         38237
>Category:       ports
>Synopsis:       Maintainer Update port: ftp/twoftpd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 18 01:50:17 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 4.5-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD InfoMath.Math.NCTU.edu.tw 4.5-RELEASE-p4 FreeBSD 4.5-RELEASE-p4 #7: Tue Apr 23 04:15:27 CST 2002 root@InfoMath.Math.NCTU.edu.tw:/home/obj/usr/src/sys/InFoMath i386


	
>Description:
	Upgrade to 1.15
	
>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/ftp/twoftpd/Makefile twoftpd/Makefile
--- /usr/ports/ftp/twoftpd/Makefile	Mon Mar 18 07:42:35 2002
+++ twoftpd/Makefile	Sat May 18 16:43:36 2002
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	twoftpd
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 
+MAN1=		twoftpd-auth.1 twoftpd-xfer.1
+
 BIN=		twoftpd-anon twoftpd-anon-conf twoftpd-auth twoftpd-conf twoftpd-xfer
 
 do-install:
+.for FILE in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${FILE} ${PREFIX}/man/man1
+.endfor
 .for FILE in ${BIN}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
 .endfor
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/ftp/twoftpd/distinfo twoftpd/distinfo
--- /usr/ports/ftp/twoftpd/distinfo	Sun Mar  3 09:24:36 2002
+++ twoftpd/distinfo	Sat May 18 16:35:29 2002
@@ -1 +1 @@
-MD5 (twoftpd-1.14.tar.gz) = e22d8e071139386e2b1320924597ab09
+MD5 (twoftpd-1.15.tar.gz) = 1a247c51f3b99ca1414ad39d02d3728f
diff -ruN /usr/ports/ftp/twoftpd/files/patch-socket::cork.c twoftpd/files/patch-socket::cork.c
--- /usr/ports/ftp/twoftpd/files/patch-socket::cork.c	Wed Mar 13 06:27:30 2002
+++ twoftpd/files/patch-socket::cork.c	Thu Jan  1 08:00:00 1970
@@ -1,26 +0,0 @@
---- 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-socket::uncork.c twoftpd/files/patch-socket::uncork.c
--- /usr/ports/ftp/twoftpd/files/patch-socket::uncork.c	Wed Mar 13 06:27:30 2002
+++ twoftpd/files/patch-socket::uncork.c	Thu Jan  1 08:00:00 1970
@@ -1,29 +0,0 @@
---- 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;
diff -ruN /usr/ports/ftp/twoftpd/pkg-descr twoftpd/pkg-descr
--- /usr/ports/ftp/twoftpd/pkg-descr	Mon Sep 17 00:18:47 2001
+++ twoftpd/pkg-descr	Sat May 18 16:35:12 2002
@@ -7,6 +7,3 @@
 which contain all the data transfer code.
 
 WWW: http://untroubled.org/twoftpd/
-
-- Gea-Suan Lin
-  gslin@ccca.nctu.edu.tw
	


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020518084527.3B08F3D99>