Adding fhttpd version 0.4.2.

A C++-based FTP/HTTP server that supports modules.

PR:		15804
Submitted by:	Will Andrews <andrews@technologist.com>

7 files changed, 214 insertions, 0 deletions

diff --git a/www/fhttpd/files/fhttpd.sh b/www/fhttpd/files/fhttpd.sh
new file mode 100644
index 0000000..51bbd8b
--- /dev/null
+++ b/www/fhttpd/files/fhttpd.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -x /usr/local/sbin/fhttpd ] && /usr/local/sbin/fhttpd -c /usr/local/etc/fhttpd.conf -l /usr/local/share/fhttpd/fhttpd.log >/dev/null 2>&1 && echo -n " fhttpd"
diff --git a/www/fhttpd/files/patch-aa b/www/fhttpd/files/patch-aa
new file mode 100644
index 0000000..e77d46f
--- /dev/null
+++ b/www/fhttpd/files/patch-aa
@@ -0,0 +1,18 @@
+--- pseudopoll.c	Mon Feb  9 10:48:42 1998
++++ pseudopoll.c.new	Fri Dec 24 00:12:58 1999
+@@ -3,7 +3,6 @@
+ */
+ 
+ #ifdef PSEUDOPOLL
+-#include "pseudopoll.h"
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -11,6 +10,7 @@
+ #include <values.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <sys/poll.h>
+ 
+ #ifdef NEED_SELECT_H
+ #include <sys/select.h>
diff --git a/www/fhttpd/files/patch-ab b/www/fhttpd/files/patch-ab
new file mode 100644
index 0000000..4788284
--- /dev/null
+++ b/www/fhttpd/files/patch-ab
@@ -0,0 +1,80 @@
+--- http-root/root-fhttpd.conf	Mon Apr 19 13:31:49 1999
++++ http-root/root-fhttpd.conf.new	Fri Dec 24 19:29:00 1999
+@@ -5,7 +5,7 @@
+ 
+ # HTTP root directory
+ #
+-HTTPRoot /home/ftp
++HTTPRoot /usr/local/share/fhttpd
+ 
+ # honor Keep-Alive option
+ #
+@@ -44,19 +44,19 @@
+ # access control
+ #
+ AccessRealm system /etc/passwd
+-AccessRealm http_users /etc/passwd.http_users
+-AccessRights /home/ftp/private* restrict
+-AccessRights /home/ftp/private* http_users default
++#AccessRealm http_users /etc/passwd.http_users
++AccessRights /usr/local/share/fhttpd/private* restrict
++#AccessRights /usr/local/share/fhttpd/private* http_users default
+ 
+ # finger redirected to script
+ #
+-PipeOutExec */fingerlocal /home/ftp/bin/finger-nohtml
+-AbsPipeOutExec /home/ftp/fingerlocal.html\
+- /home/ftp/cgi-bin/finger @localhost
++PipeOutExec */fingerlocal /usr/local/share/fhttpd/bin/finger-nohtml
++#AbsPipeOutExec /home/ftp/fingerlocal.html\
++# /home/ftp/cgi-bin/finger @localhost
+ 
+ # directories with executables
+ #
+-ExecMask /home/ftp/cgi-bin/*
++ExecMask /usr/local/share/fhttpd/cgi-bin/*
+ 
+ # default header and footer
+ #
+@@ -92,8 +92,8 @@
+ 
+ # CD-ROM
+ #
+-AbsDirType /home/ftp/cdrom <DT><IMG_SRC="/icons/cdromicon.gif"\
+-_ALIGN=TOP_ALT=""><B>_ _</B>
++#AbsDirType /home/ftp/cdrom <DT><IMG_SRC="/icons/cdromicon.gif"\
++#_ALIGN=TOP_ALT=""><B>_ _</B>
+ 
+ # "folder" icon for directory
+ #
+@@ -287,11 +287,11 @@
+ 
+ # preloaded files
+ #
+-PreLoad - /home/ftp/file_index.html
+-PreLoad /icons/folder.gif /home/ftp/icons/folder.gif
+-PreLoad /icons/html.gif /home/ftp/icons/html.gif
+-PreLoad /icons/text.gif /home/ftp/icons/text.gif
+-PreLoad /icons/image.gif /home/ftp/icons/image.gif
++#PreLoad - /home/ftp/file_index.html
++PreLoad /icons/folder.gif /usr/local/share/fhttpd/icons/folder.gif
++PreLoad /icons/html.gif /usr/local/share/fhttpd/icons/html.gif
++PreLoad /icons/text.gif /usr/local/share/fhttpd/icons/text.gif
++PreLoad /icons/image.gif /usr/local/share/fhttpd/icons/image.gif
+ 
+ # applications
+ #
+@@ -305,11 +305,11 @@
+ # default application
+ #
+ Application fhttpd-file - ftp 3000,30 1 * \
+-/usr/local/sbin/fhttpd-file -s -u 022 -c /etc/fhttpd.conf
++/usr/local/sbin/fhttpd-file -s -u 022 -c /usr/local/etc/fhttpd.conf
+ 
+ # log aplication
+ #
+ LogApplication log - ftp 1 1 - \
+-/usr/local/sbin/fhttpd-log -u 022 -c /etc/fhttpd.conf -l /tmp/fhttpd-log.log
++/usr/local/sbin/fhttpd-log -u 022 -c /usr/local/etc/fhttpd.conf -l %%LOGFILE%%
+ 
+ # EOF
diff --git a/www/fhttpd/files/patch-ac b/www/fhttpd/files/patch-ac
new file mode 100644
index 0000000..5772321
--- /dev/null
+++ b/www/fhttpd/files/patch-ac
@@ -0,0 +1,36 @@
+--- Makefile	Mon Apr 19 13:38:56 1999
++++ Makefile.new	Fri Dec 24 00:14:18 1999
+@@ -99,21 +99,21 @@
+ 
+ ## for Linux (glibc2/libc 6):
+ #
+-COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
+-	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
+-	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+-	 -D__s32=int\
+-	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
+-LFLAGS= -lcrypt
++#COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
++#	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
++#	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
++#	 -D__s32=int\
++#	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
++#LFLAGS= -lcrypt
+ 
+ ## for FreeBSD 2.2:
+ #
+-#COPTS   = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
+-#	 -D__s32=int -DMMAPPAGESIZE=65536\
+-#	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
+-#	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+-#	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
+-#LFLAGS = -lcrypt
++COPTS   = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
++	 -D__s32=int -DMMAPPAGESIZE=65536\
++	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
++	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
++	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
++LFLAGS = -lcrypt
+ 
+ # End of OS-dependent definitions
+ 
diff --git a/www/fhttpd/files/patch-ad b/www/fhttpd/files/patch-ad
new file mode 100644
index 0000000..eae4161
--- /dev/null
+++ b/www/fhttpd/files/patch-ad
@@ -0,0 +1,11 @@
+--- log.cc.orig	Sat Jan 29 00:53:07 2000
++++ log.cc	Sat Jan 29 00:54:02 2000
+@@ -688,7 +688,7 @@
+ 	  if(client){
+ 	    sprintf(tmpstr,"%d",currentconnection->socket->port);
+ 	    SendLogMessage(client,NULL,NULL,NULL,0,"CLIENT_EXISTS_LOCAL_PORT",tmpstr);
+-	    if(!getsockname(currentconnection->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++	    if(!getsockname(currentconnection->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+ 	      SendLogMessage(client,NULL,NULL,NULL,0,"CLIENT_EXISTS_LOCAL_IP",inet_ntoa(currsock.sin_addr));
+ 	    }
+ 	    SendLogMessage(client,NULL,NULL,NULL,0,"CLIENT_EXISTS_IP",inet_ntoa(((sockaddr_in*)currentconnection->getaddress())->sin_addr));
diff --git a/www/fhttpd/files/patch-ae b/www/fhttpd/files/patch-ae
new file mode 100644
index 0000000..4870350
--- /dev/null
+++ b/www/fhttpd/files/patch-ae
@@ -0,0 +1,20 @@
+--- sockobj.cc.orig	Sat Jan 29 00:54:37 2000
++++ sockobj.cc	Sat Jan 29 00:55:34 2000
+@@ -645,7 +645,7 @@
+ global_nconnections++;
+ if(xsocket->status==0){
+  hisaddresslength=128;
+- h=accept(xsocket->gethandle(),(struct sockaddr*)s,&hisaddresslength);
++ h=accept(xsocket->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
+  if(h<0) return;
+  hisaddress=(struct sockaddr*)malloc(hisaddresslength);
+  if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{
+@@ -1861,7 +1861,7 @@
+     if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){
+      fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN;
+      hisaddresslength=128;
+-     h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,&hisaddresslength);
++     h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
+      if(h>=0){
+ #ifdef DEBUG
+       log("Wheel::onepass: accepting connection");
diff --git a/www/fhttpd/files/patch-af b/www/fhttpd/files/patch-af
new file mode 100644
index 0000000..ca22073
--- /dev/null
+++ b/www/fhttpd/files/patch-af
@@ -0,0 +1,47 @@
+--- fhttpd.cc.orig	Sat Jan 29 00:56:40 2000
++++ fhttpd.cc	Sat Jan 29 00:58:31 2000
+@@ -130,7 +130,7 @@
+ basedir[255]=0;
+ strncpy(username,globalhttppw->pw_name,128); 
+ username[128]=0;
+-if(!getsockname(connection->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++if(!getsockname(connection->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+  AddressRoot *curraddrroot=(AddressRoot*)addressroots.start;
+  while(curraddrroot){
+   if((*((__s32*)&currsock.sin_addr))==curraddrroot->address){
+@@ -250,7 +250,7 @@
+ if(c->socket){
+  sprintf(tmpstr,"%d",c->socket->port);
+  LogMessage(this,NULL,NULL,NULL,0,"LOCAL_PORT",tmpstr);
+- if(!getsockname(c->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++ if(!getsockname(c->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+   LogMessage(this,NULL,NULL,NULL,0,"LOCAL_IP",inet_ntoa(currsock.sin_addr));
+   }
+  LogMessage(this,NULL,NULL,NULL,0,"IP",inet_ntoa(((sockaddr_in*)c->getaddress())->sin_addr));
+@@ -349,7 +349,7 @@
+ if(servertype==ftp_server_port){
+  strncpy(tmphostname,hostname,256);
+  tmphostname[255]=0;
+- if(!getsockname(client->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++ if(!getsockname(client->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+   AddressRoot *curraddrroot=(AddressRoot*)addressroots.start;
+   while(curraddrroot){
+    if((*((__s32*)&currsock.sin_addr))==curraddrroot->address){
+@@ -2554,7 +2554,7 @@
+      if(blength>253) param[1][253]=0;
+      }else ((ControlFTPServerApp*)client->app)->trailingslash=1;
+     j=0;
+-    if(getsockname(client->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++    if(getsockname(client->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+      (*((__s32*)&currsock.sin_addr))=-1;
+      }
+ 
+@@ -3139,7 +3139,7 @@
+ 
+              struct sockaddr_in currsock;
+              sockaddr_size_type currsockaddrlen=sizeof(currsock);
+-             if(!getsockname(client->gethandle(),(sockaddr*)&currsock,&currsockaddrlen)){
++             if(!getsockname(client->gethandle(),(sockaddr*)&currsock,(socklen_t*)&currsockaddrlen)){
+               AddressRoot *curraddrroot=(AddressRoot*)addressroots.start;
+               while(curraddrroot){
+                if((*((__s32*)&currsock.sin_addr))==curraddrroot->address){