12 files changed, 176 insertions, 0 deletions

diff --git a/ftp/Makefile b/ftp/Makefile
index fc3b2ba48e0a..a0ac4be4be2a 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -30,6 +30,7 @@
     SUBDIR += ncftp
     SUBDIR += ncftp2
     SUBDIR += ncftp3
+    SUBDIR += oftpd
     SUBDIR += omi
     SUBDIR += pavuk
     SUBDIR += proftpd
diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
new file mode 100644
index 000000000000..44e14d2d8c6d
--- /dev/null
+++ b/ftp/oftpd/Makefile
@@ -0,0 +1,39 @@
+# Ports collection makefile for:  oftpd
+# Date created:			  31 March 2001
+# Whom:				  Anders Nordby <anders@fix.no>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	oftpd
+PORTVERSION=	0.3.3
+CATEGORIES=	ftp
+MASTER_SITES=	http://www.time-travellers.org/oftpd/ \
+		http://www.freenix.no/~anders/
+
+MAINTAINER=	anders@fix.no
+
+GNU_CONFIGURE=	yes
+
+DOCFILES=	README AUTHORS ChangeLog NEWS TODO BUGS
+
+CFLAGS+=	${PTHREAD_CFLAGS}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${PREFIX}/libexec/oftpd
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d -m 555 ${PREFIX}/share/doc/oftpd
+.for i in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/oftpd
+.endfor
+.endif
+
+post-install:
+	@${ECHO} "================================================================================"
+	@${ECHO} "oftpd only runs standalone, not from inetd."
+	@${ECHO} "Try ${PREFIX}/libexec/oftpd -h to see command line options."
+	@${ECHO} "Create a README file in the root anonymous FTP dir to have it displayed to"
+	@${ECHO} "users upon login."
+	@${ECHO} "================================================================================"
+
+.include <bsd.port.mk>
diff --git a/ftp/oftpd/distinfo b/ftp/oftpd/distinfo
new file mode 100644
index 000000000000..96de3ef55f86
--- /dev/null
+++ b/ftp/oftpd/distinfo
@@ -0,0 +1 @@
+MD5 (oftpd-0.3.3.tar.gz) = 5aedb3495fa262400e71b454a4bd9470
diff --git a/ftp/oftpd/files/patch-af_portability.c b/ftp/oftpd/files/patch-af_portability.c
new file mode 100644
index 000000000000..d95dcd02c3bc
--- /dev/null
+++ b/ftp/oftpd/files/patch-af_portability.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..7c83488f94a3
--- /dev/null
+++ b/ftp/oftpd/files/patch-configure
@@ -0,0 +1,56 @@
+--- 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
new file mode 100644
index 000000000000..22456ee06309
--- /dev/null
+++ b/ftp/oftpd/files/patch-file_list.c
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..660eb292f34a
--- /dev/null
+++ b/ftp/oftpd/files/patch-ftp_command.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..538b1f786631
--- /dev/null
+++ b/ftp/oftpd/files/patch-ftp_listener.c
@@ -0,0 +1,10 @@
+--- 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>
diff --git a/ftp/oftpd/files/patch-ftp_session.c b/ftp/oftpd/files/patch-ftp_session.c
new file mode 100644
index 000000000000..6ae7dbbd007e
--- /dev/null
+++ b/ftp/oftpd/files/patch-ftp_session.c
@@ -0,0 +1,17 @@
+--- src/ftp_session.c.orig	Thu Mar 29 00:41:18 2001
++++ src/ftp_session.c	Sat Mar 31 12:07:49 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>
diff --git a/ftp/oftpd/pkg-comment b/ftp/oftpd/pkg-comment
new file mode 100644
index 000000000000..fa06ddb86bd4
--- /dev/null
+++ b/ftp/oftpd/pkg-comment
@@ -0,0 +1 @@
+A threaded, anonymous only FTP server designed for security
diff --git a/ftp/oftpd/pkg-descr b/ftp/oftpd/pkg-descr
new file mode 100644
index 000000000000..e3a6a76e8c01
--- /dev/null
+++ b/ftp/oftpd/pkg-descr
@@ -0,0 +1,9 @@
+oftpd is designed to be as secure as an anonymous FTP server can possibly be.
+It runs as non-root for most of the time, and uses the Unix chroot() command to
+hide most of the systems directories from external users - they cannot change
+into them even if the server is totally compromised! It contains its own
+directory change code, so that it can run efficiently as a threaded server, and
+its own directory listing code (most FTP servers execute the system "ls"
+command to list files).
+
+WWW: http://www.time-travellers.org/oftpd/
diff --git a/ftp/oftpd/pkg-plist b/ftp/oftpd/pkg-plist
new file mode 100644
index 000000000000..59783df28f71
--- /dev/null
+++ b/ftp/oftpd/pkg-plist
@@ -0,0 +1,8 @@
+libexec/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