Date: Mon, 28 May 2001 23:02:35 +0200 (CEST) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/27719: Update port: ftp/oftpd Message-ID: <20010528210235.206E23C9C@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 27719 >Category: ports >Synopsis: Update port: ftp/oftpd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 28 14:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.3-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: kern.osreldate: 430000 (4.3-STABLE) kern.osreldate: 500018 (5.0-20010420-CURRENT) >Description: Update to the latest version: 0.3.6. Fixes sendfile support to work. Removes these files (and thereby the files directory completely): files/patch-ftp_listener.c files/patch-ftp_session.c Also add missing substitution in pkg-plist. New in this version: 2001-05-28, Shane Kerr <shane@time-travellers.org> - Version 0.3.6 released. - Beat FreeBSD into submission. Now compiles (and runs!) on FreeBSD out of the box. 2001-05-11, Shane Kerr <shane@time-travellers.org> - Changed REST to only work for IMAGE (i.e. binary) mode. - Added the SIZE command. - Added the MDTM (modification time) command. 2001-04-20, Shane Kerr <shane@time-travellers.org> - Moved SIGPIPE ignore to run even in --nodetach mode. Needed to avoid unwanted signals on TCP disconnects. 2001-04-19, Shane Kerr <shane@time-travellers.org> - Added more logging: all client messages are logged with address and port, and all server responses are also logged. This occurs at DEBUG level, as it is probably not normally of interest. >How-To-Repeat: <Code/input/activities to reproduce the problem (multiple lines)> >Fix: diff -Nur oftpd.old/Makefile oftpd/Makefile --- oftpd.old/Makefile Tue Apr 24 15:12:30 2001 +++ oftpd/Makefile Mon May 28 21:30:24 2001 @@ -6,7 +6,7 @@ # PORTNAME= oftpd -PORTVERSION= 0.3.5 +PORTVERSION= 0.3.6 CATEGORIES= ftp MASTER_SITES= http://www.time-travellers.org/oftpd/ \ http://www.freenix.no/~anders/ diff -Nur oftpd.old/distinfo oftpd/distinfo --- oftpd.old/distinfo Tue Apr 24 15:12:30 2001 +++ oftpd/distinfo Mon May 28 21:31:16 2001 @@ -1 +1 @@ -MD5 (oftpd-0.3.5.tar.gz) = ee130d35dcef6283f892a11f01047324 +MD5 (oftpd-0.3.6.tar.gz) = 78b4139bb0108297b9814564db986852 diff -Nur oftpd.old/files/patch-ftp_listener.c oftpd/files/patch-ftp_listener.c --- oftpd.old/files/patch-ftp_listener.c Tue Apr 24 15:12:34 2001 +++ oftpd/files/patch-ftp_listener.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/ftp_listener.c.orig Wed Apr 18 23:42:48 2001 -+++ src/ftp_listener.c Sun Apr 22 14:26:41 2001 -@@ -361,7 +361,7 @@ - if (fd >= 0) { - - tcp_nodelay = 1; -- if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (void *)&tcp_nodelay, -+ if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *)&tcp_nodelay, - sizeof(int)) != 0) - { - syslog(LOG_ERR, diff -Nur oftpd.old/files/patch-ftp_session.c oftpd/files/patch-ftp_session.c --- oftpd.old/files/patch-ftp_session.c Tue Apr 24 15:12:34 2001 +++ oftpd/files/patch-ftp_session.c Thu Jan 1 01:00:00 1970 @@ -1,47 +0,0 @@ ---- src/ftp_session.c.orig Wed Apr 18 23:43:37 2001 -+++ src/ftp_session.c Mon Apr 23 00:38:15 2001 -@@ -3,13 +3,13 @@ - */ - - #include <config.h> -+#include <sys/types.h> - #include <netinet/in.h> - #include <string.h> - #include <stdio.h> - #include <stdarg.h> - #include <sys/stat.h> - #include <unistd.h> --#include <sys/types.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <errno.h> -@@ -1130,7 +1130,8 @@ - /* for sendfile(), we still have to use a loop to avoid - having our watchdog time us out on large files - it does - allow us to avoid an extra copy to/from user space */ --#ifdef HAVE_LINUX_SENDFILE -+#ifdef FOO_HAVE_LINUX_SENDFILE -+// This doesn't work yet. I'm working with the author to fix it. - offset = f->file_offset; - file_size = stat_buf.st_size - offset; - while (offset < stat_buf.st_size) { -@@ -1139,11 +1140,14 @@ - if (amt_to_send > 65536) { - amt_to_send = 65536; - } -- sendfile_ret = sendfile(socket_fd, -- file_fd, -- &offset, -- amt_to_send); -- if (sendfile_ret != amt_to_send) { -+ sendfile_ret = sendfile(file_fd, -+ socket_fd, -+ offset, -+ amt_to_send, -+ NULL, -+ NULL, -+ 0); -+ if (sendfile_ret != 0) { - reply(f, 550, "Error sending file; %s.", strerror(errno)); - goto exit_retr; - } diff -Nur oftpd.old/pkg-plist oftpd/pkg-plist --- oftpd.old/pkg-plist Tue Apr 24 15:12:30 2001 +++ oftpd/pkg-plist Mon May 28 21:34:28 2001 @@ -1,8 +1,8 @@ sbin/oftpd -share/doc/oftpd/README -share/doc/oftpd/AUTHORS -share/doc/oftpd/ChangeLog -share/doc/oftpd/NEWS -share/doc/oftpd/TODO -share/doc/oftpd/BUGS -@dirrm share/doc/oftpd +%%PORTDOCS%%share/doc/oftpd/README +%%PORTDOCS%%share/doc/oftpd/AUTHORS +%%PORTDOCS%%share/doc/oftpd/ChangeLog +%%PORTDOCS%%share/doc/oftpd/NEWS +%%PORTDOCS%%share/doc/oftpd/TODO +%%PORTDOCS%%share/doc/oftpd/BUGS +%%PORTDOCS%%@dirrm share/doc/oftpd >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?20010528210235.206E23C9C>