10 files changed, 50 insertions, 106 deletions

diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
index b0a88908ef1a..8277a640b4b6 100644
--- a/ftp/oftpd/Makefile
+++ b/ftp/oftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oftpd
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.time-travellers.org/oftpd/ \
 		http://www.freenix.no/~anders/
@@ -18,11 +18,12 @@ GNU_CONFIGURE=	yes
 DOCFILES=	README AUTHORS ChangeLog NEWS TODO BUGS
 
 CFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ENV+=	LIBS="-pthread"
 
 MAN8=		oftpd.8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${PREFIX}/libexec/oftpd
+	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${PREFIX}/sbin/oftpd
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -m 555 ${PREFIX}/share/doc/oftpd
 .for i in ${DOCFILES}
diff --git a/ftp/oftpd/distinfo b/ftp/oftpd/distinfo
index fec85a959b9f..d0323c65280d 100644
--- a/ftp/oftpd/distinfo
+++ b/ftp/oftpd/distinfo
@@ -1 +1 @@
-MD5 (oftpd-0.3.4.tar.gz) = 3a10eb7a681ba9090f57b99a1a462f72
+MD5 (oftpd-0.3.5.tar.gz) = ee130d35dcef6283f892a11f01047324
diff --git a/ftp/oftpd/files/patch-af_portability.c b/ftp/oftpd/files/patch-af_portability.c
deleted file mode 100644
index d95dcd02c3bc..000000000000
--- a/ftp/oftpd/files/patch-af_portability.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/af_portability.h.old	Sat Mar 31 12:00:46 2001
-+++ src/af_portability.h	Sat Mar 31 12:01:00 2001
-@@ -2,6 +2,7 @@
- #define AF_PORTABILITY_H
- 
- #include <netinet/in.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- 
- /* _x_ must be a pointer to a sockaddr structure */
diff --git a/ftp/oftpd/files/patch-configure b/ftp/oftpd/files/patch-configure
deleted file mode 100644
index 7c83488f94a3..000000000000
--- a/ftp/oftpd/files/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.old	Sat Mar 31 12:13:17 2001
-+++ configure	Sat Mar 31 12:14:16 2001
-@@ -1121,14 +1121,14 @@
- fi
- 
- 
--echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
--echo "configure:1126: checking for main in -lpthread" >&5
-+echo $ac_n "checking for main with -pthread""... $ac_c" 1>&6
-+echo "configure:1126: checking for main with -pthread" >&5
- ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1134 "configure"
- #include "confdefs.h"
-@@ -1158,7 +1158,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -2311,14 +2311,14 @@
- fi
- done
- 
--echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:2316: checking for pthread_create in -lpthread" >&5
-+echo $ac_n "checking for pthread_create with -pthread""... $ac_c" 1>&6
-+echo "configure:2316: checking for pthread_create with -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="$LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2324 "configure"
- #include "confdefs.h"
-@@ -2352,7 +2352,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="$LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/ftp/oftpd/files/patch-file_list.c b/ftp/oftpd/files/patch-file_list.c
deleted file mode 100644
index 22456ee06309..000000000000
--- a/ftp/oftpd/files/patch-file_list.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/file_list.c.old	Sat Mar 31 11:27:00 2001
-+++ src/file_list.c	Sat Mar 31 11:37:38 2001
-@@ -186,7 +186,11 @@
-     /* do a glob() */
-     memset(&glob_buf, 0, sizeof(glob_buf));
-     glob_ret = glob(pattern, GLOB_ERR, NULL, &glob_buf);
-+#ifndef GLOB_NOMATCH /* FreeBSD rocks your world */
-+    if (glob_ret == GLOB_NOCHECK) {
-+#else
-     if (glob_ret == GLOB_NOMATCH) {
-+#endif
-         fdprintf(out, "total 0\r\n");
-         return 1;
-     } else if (glob_ret == GLOB_NOSPACE) {
diff --git a/ftp/oftpd/files/patch-ftp_command.c b/ftp/oftpd/files/patch-ftp_command.c
deleted file mode 100644
index 660eb292f34a..000000000000
--- a/ftp/oftpd/files/patch-ftp_command.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ftp_command.c.old	Sat Mar 31 11:43:43 2001
-+++ src/ftp_command.c	Sat Mar 31 11:44:01 2001
-@@ -6,6 +6,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/ftp/oftpd/files/patch-ftp_listener.c b/ftp/oftpd/files/patch-ftp_listener.c
index 538b1f786631..ec88bf2f244c 100644
--- a/ftp/oftpd/files/patch-ftp_listener.c
+++ b/ftp/oftpd/files/patch-ftp_listener.c
@@ -1,10 +1,11 @@
---- src/ftp_listener.c.old	Sat Mar 31 12:01:10 2001
-+++ src/ftp_listener.c	Sat Mar 31 12:01:24 2001
-@@ -3,6 +3,7 @@
-  */
- 
- #include <config.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
+--- 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 --git a/ftp/oftpd/files/patch-ftp_session.c b/ftp/oftpd/files/patch-ftp_session.c
index 6ae7dbbd007e..277145f60ae5 100644
--- a/ftp/oftpd/files/patch-ftp_session.c
+++ b/ftp/oftpd/files/patch-ftp_session.c
@@ -1,5 +1,5 @@
---- src/ftp_session.c.orig	Thu Mar 29 00:41:18 2001
-+++ src/ftp_session.c	Sat Mar 31 12:07:49 2001
+--- 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 @@
   */
  
@@ -15,3 +15,33 @@
  #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 --git a/ftp/oftpd/pkg-descr b/ftp/oftpd/pkg-descr
index e3a6a76e8c01..4bd8576e0888 100644
--- a/ftp/oftpd/pkg-descr
+++ b/ftp/oftpd/pkg-descr
@@ -7,3 +7,5 @@ its own directory listing code (most FTP servers execute the system "ls"
 command to list files).
 
 WWW: http://www.time-travellers.org/oftpd/
+
+- Anders Nordby <anders@fix.no>
diff --git a/ftp/oftpd/pkg-plist b/ftp/oftpd/pkg-plist
index 59783df28f71..6568953a6608 100644
--- a/ftp/oftpd/pkg-plist
+++ b/ftp/oftpd/pkg-plist
@@ -1,4 +1,4 @@
-libexec/oftpd
+sbin/oftpd
 share/doc/oftpd/README
 share/doc/oftpd/AUTHORS
 share/doc/oftpd/ChangeLog