diff options
Diffstat (limited to 'www/fhttpd')
-rw-r--r-- | www/fhttpd/Makefile | 59 | ||||
-rw-r--r-- | www/fhttpd/distinfo | 2 | ||||
-rw-r--r-- | www/fhttpd/files/fhttpd.sh | 20 | ||||
-rw-r--r-- | www/fhttpd/files/patch-aa | 18 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ab | 80 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ac | 58 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ad | 11 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ae | 37 | ||||
-rw-r--r-- | www/fhttpd/files/patch-af | 47 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ag | 10 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ah | 11 | ||||
-rw-r--r-- | www/fhttpd/files/patch-ai | 19 | ||||
-rw-r--r-- | www/fhttpd/files/patch-fhttpd.h | 13 | ||||
-rw-r--r-- | www/fhttpd/files/patch-z-clang | 125 | ||||
-rw-r--r-- | www/fhttpd/pkg-descr | 12 | ||||
-rw-r--r-- | www/fhttpd/pkg-plist | 47 |
16 files changed, 0 insertions, 569 deletions
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile deleted file mode 100644 index bae7c3619c6e..000000000000 --- a/www/fhttpd/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# Created by: Will Andrews <andrews@technologist.com> -# $FreeBSD$ - -PORTNAME= fhttpd -PORTVERSION= 0.4.2 -CATEGORIES= www -MASTER_SITES= http://www.fhttpd.org/ \ - ftp://ftp.fhttpd.org/fhttpd/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= C++-based FTP/HTTP server that supports modules - -LOGFILE= share/fhttpd/fhttpd.log -PLIST_SUB+= LOGFILE=${LOGFILE} - -CXXFLAGS+= -Wno-deprecated -Wno-write-strings - -DEPRECATED= Unmaintained since 2000 -EXPIRATION_DATE= 2014-04-11 -NO_STAGE= yes -post-extract: - @${CP} ${FILESDIR}/fhttpd.sh ${WRKSRC} - -pre-patch: - (cd ${WRKSRC} && ${TAR} xf http-root.tar) - -pre-install: - ${RM} -rf ${WRKSRC}/http-root/pub/dummy_directory - ${REINPLACE_CMD} -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \ - ${WRKSRC}/fhttpd.sh ${WRKSRC}/http-root/root-fhttpd.conf - ${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/fhttpd.sh ${PREFIX}/etc/rc.d -.for PROG in fhttpd fhttpd-file fhttpd-log - ${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/sbin -.endfor - ${INSTALL_DATA} ${WRKSRC}/http-root/root-fhttpd.conf ${PREFIX}/etc/fhttpd.conf - ${MKDIR} ${PREFIX}/share/fhttpd/bin - ${INSTALL_SCRIPT} ${WRKSRC}/http-root/bin/* ${PREFIX}/share/fhttpd/bin - ${MKDIR} ${PREFIX}/share/fhttpd/cgi-bin - ${INSTALL_SCRIPT} ${WRKSRC}/http-root/cgi-bin/f* ${PREFIX}/share/fhttpd/cgi-bin - ${INSTALL_DATA} ${WRKSRC}/http-root/cgi-bin/.index.html ${PREFIX}/share/fhttpd/cgi-bin - ${MKDIR} ${PREFIX}/share/fhttpd/incoming -.for DIR in icons private pub - ${MKDIR} ${PREFIX}/share/fhttpd/${DIR} - ${INSTALL_DATA} ${WRKSRC}/http-root/${DIR}/* ${PREFIX}/share/fhttpd/${DIR}/ -.endfor -.for DIR in private pub - ${INSTALL_DATA} ${WRKSRC}/http-root/${DIR}/.[fhi]* ${PREFIX}/share/fhttpd/${DIR}/ -.endfor -.for FILE in index.html noaccess.html - ${INSTALL_DATA} ${WRKSRC}/http-root/${FILE} ${PREFIX}/share/fhttpd/ -.endfor - -post-install: - ${TOUCH} ${PREFIX}/${LOGFILE} - -.include <bsd.port.mk> diff --git a/www/fhttpd/distinfo b/www/fhttpd/distinfo deleted file mode 100644 index 6b555667af91..000000000000 --- a/www/fhttpd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (fhttpd-0.4.2.tar.gz) = b0221c130316a9ff22db38e544d7b78cbd3707d59f03f7a4a9b426a6b55f6c4a -SIZE (fhttpd-0.4.2.tar.gz) = 130847 diff --git a/www/fhttpd/files/fhttpd.sh b/www/fhttpd/files/fhttpd.sh deleted file mode 100644 index 916f6e763f84..000000000000 --- a/www/fhttpd/files/fhttpd.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/fhttpd ] && ${PREFIX}/sbin/fhttpd -c ${PREFIX}/etc/fhttpd.conf -l ${PREFIX}/share/fhttpd/fhttpd.log > /dev/null 2>&1 && echo -n ' fhttpd' - ;; -stop) - killall fhttpd && echo -n ' fhttpd' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/www/fhttpd/files/patch-aa b/www/fhttpd/files/patch-aa deleted file mode 100644 index e77d46f8f9d3..000000000000 --- a/www/fhttpd/files/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 4788284eac1c..000000000000 --- a/www/fhttpd/files/patch-ab +++ /dev/null @@ -1,80 +0,0 @@ ---- 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 deleted file mode 100644 index b1ba191ba6e9..000000000000 --- a/www/fhttpd/files/patch-ac +++ /dev/null @@ -1,58 +0,0 @@ ---- Makefile.orig Mon Apr 19 10:38:56 1999 -+++ Makefile Wed Sep 4 19:46:45 2002 -@@ -10,8 +10,8 @@ - - # Default compilers and linker - --CC = gcc --CXX = g++ -+CC ?= cc -+CXX ?= c++ - LD = $(CXX) - - # OS-dependent definitions (choose one and adjust, if necessary) -@@ -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 = -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 - -@@ -126,8 +126,8 @@ - # Don't modify anything below - - CXXOPTS = $(COPTS) --CXXFLAGS = $(CXXOPTS) $(DEBUG) --CFLAGS = $(COPTS) $(DEBUG) -+CXXFLAGS += $(CXXOPTS) $(DEBUG) -+CFLAGS += $(COPTS) $(DEBUG) - - FHTTPD_OFILES = pseudopoll.o lists.o wildmat.o util.o configfile.o users.o \ - process.o log.o loadedfile.o sockobj.o configargs.o fhttpd.o diff --git a/www/fhttpd/files/patch-ad b/www/fhttpd/files/patch-ad deleted file mode 100644 index eae416162010..000000000000 --- a/www/fhttpd/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index d02ffd02651f..000000000000 --- a/www/fhttpd/files/patch-ae +++ /dev/null @@ -1,37 +0,0 @@ ---- sockobj.cc.orig Sat May 15 13:13:54 1999 -+++ sockobj.cc Fri Dec 15 00:37:45 2006 -@@ -53,6 +53,7 @@ - #include <stdarg.h> - #include <errno.h> - #include <time.h> -+#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ - #include <sys/socket.h> - #include <sys/un.h> - #include <netinet/in.h> -@@ -93,6 +94,8 @@ - extern int errno; - #endif - -+void cleanupserverdriver(SIGARGS); -+ - /**************************************** - *** common daemon global variables - ****************************************/ -@@ -645,7 +648,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 +1864,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 deleted file mode 100644 index ca2207378b0d..000000000000 --- a/www/fhttpd/files/patch-af +++ /dev/null @@ -1,47 +0,0 @@ ---- 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){ diff --git a/www/fhttpd/files/patch-ag b/www/fhttpd/files/patch-ag deleted file mode 100644 index 64d4db8f0df0..000000000000 --- a/www/fhttpd/files/patch-ag +++ /dev/null @@ -1,10 +0,0 @@ ---- servproc.h.orig Wed Apr 7 09:44:22 1999 -+++ servproc.h Thu Jul 13 18:53:55 2000 -@@ -29,6 +29,7 @@ - #endif - #include <sys/time.h> - #include <sys/stat.h> -+#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ - #include <sys/socket.h> - #include <sys/un.h> - #include <sys/file.h> diff --git a/www/fhttpd/files/patch-ah b/www/fhttpd/files/patch-ah deleted file mode 100644 index b49f82d9568e..000000000000 --- a/www/fhttpd/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- fhttpd-log.cc.orig Sun Aug 6 17:59:14 2000 -+++ fhttpd-log.cc Sun Aug 6 17:59:53 2000 -@@ -211,7 +211,7 @@ - int argc1; - char **argv1; - int i,human=1; --long t_sec,t_usec; -+time_t t_sec,t_usec; - __s32 requestid,clientid,instid, - nrequestid,nclientid,ninstid,n_t_sec,n_t_usec; - char *configfile=FHTTPD_CONFIG_FILE; diff --git a/www/fhttpd/files/patch-ai b/www/fhttpd/files/patch-ai deleted file mode 100644 index cac87081a86d..000000000000 --- a/www/fhttpd/files/patch-ai +++ /dev/null @@ -1,19 +0,0 @@ ---- pseudopoll.c.orig Wed Sep 4 19:45:04 2002 -+++ pseudopoll.c Wed Sep 4 19:45:19 2002 -@@ -7,7 +7,6 @@ - #include <stdlib.h> - #include <string.h> - #include <limits.h> --#include <values.h> - #include <sys/types.h> - #include <sys/time.h> - #include <sys/poll.h> -@@ -15,6 +14,8 @@ - #ifdef NEED_SELECT_H - #include <sys/select.h> - #endif -+ -+#define BITSPERBYTE 8 - - static char *readfds_c=NULL; - static char *writefds_c=NULL; diff --git a/www/fhttpd/files/patch-fhttpd.h b/www/fhttpd/files/patch-fhttpd.h deleted file mode 100644 index b36c63d04936..000000000000 --- a/www/fhttpd/files/patch-fhttpd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- fhttpd.h.orig Fri Dec 15 00:34:52 2006 -+++ fhttpd.h Fri Dec 15 00:35:10 2006 -@@ -249,8 +249,8 @@ - void response(ServerConnection *client,char *fmt,...); - void hugeresponse(ServerConnection *client,char *buffer,unsigned long size); - void setexitafterresponse(ServerConnection *client,int closeonexit); --int ControlFTPServer::getexitafterresponse(ServerConnection *client); --void ControlFTPServer::emptyresponse(ServerConnection *client); -+int getexitafterresponse(ServerConnection *client); -+void emptyresponse(ServerConnection *client); - void suspendpollforresponse(ServerConnection *client,int startpollonexit); - - void answer_to_list(char *buffer,int i,int *syncexpected, diff --git a/www/fhttpd/files/patch-z-clang b/www/fhttpd/files/patch-z-clang deleted file mode 100644 index ad8754597e52..000000000000 --- a/www/fhttpd/files/patch-z-clang +++ /dev/null @@ -1,125 +0,0 @@ ---- fhttpd.cc.orig 2011-07-25 19:48:25.000000000 +0100 -+++ fhttpd.cc 2011-07-25 19:48:57.000000000 +0100 -@@ -1321,10 +1321,14 @@ - if(args){ - if(!pipe(procpipe1)){ - signal(SIGCHLD,SIG_IGN); -- switch(!fork()){ -+ switch(fork()){ - case -1: h=-1; - break; -- case 0: -+ case 0: -+ close(procpipe1[1]); -+ h=procpipe1[0]; -+ break; -+ default: - close(procpipe1[0]); - if(procpipe1[1]!=1){ - dup2(procpipe1[1],1); -@@ -1372,9 +1376,6 @@ - execve(args->params[1],args->params+1,((ControlFTPServerApp*)client->app)->execenv); - _exit(-1); - break; -- default: -- close(procpipe1[1]); -- h=procpipe1[0]; - } - } - } -@@ -1557,10 +1558,13 @@ - if(args){ - if(!pipe(procpipe1)){ - signal(SIGCHLD,SIG_IGN); -- switch(!fork()){ -+ switch(fork()){ - case -1: h=-1; - break; -- case 0: -+ case 0: -+ close(procpipe1[0]); -+ h=procpipe1[1]; -+ default: - close(procpipe1[1]); - if(procpipe1[0]){ - dup2(procpipe1[0],0); -@@ -1608,9 +1612,6 @@ - execve(args->params[1],args->params+1,((ControlFTPServerApp*)client->app)->execenv); - _exit(-1); - break; -- default: -- close(procpipe1[0]); -- h=procpipe1[1]; - } - } - } -@@ -3347,7 +3348,7 @@ - } - } - --main(int argc,char **argv,char **env){ -+int main(int argc,char **argv,char **env){ - int h; - char tmpstr[10],*pathbuffer,*logfilename=NULL; - char *configfile=FHTTPD_CONFIG_FILE; -diff -urN fhttpd-log.cc fhttpd-log.cc ---- fhttpd-log.cc 2011-07-25 19:37:32.000000000 +0100 -+++ fhttpd-log.cc 2011-07-25 19:38:01.000000000 +0100 -@@ -355,10 +355,10 @@ - for(i=0;i<req->nlines;i++){ - switch(req->lines[i].paramc){ - case 1: -- fprintf(logfile,"%s.%06ld %s %d %d %d %s\n",tmpline1,t_usec,tmpline2,clientid,requestid,instid,req->lines[i].params[0]); -+ fprintf(logfile,"%s.%06ld %s %d %d %d %s\n",tmpline1,(unsigned long)t_usec,tmpline2,clientid,requestid,instid,req->lines[i].params[0]); - break; - case 2: -- fprintf(logfile,"%s.%06ld %s %d %d %d %s %s\n",tmpline1,t_usec,tmpline2,clientid,requestid,instid,req->lines[i].params[0],req->lines[i].params[1]); -+ fprintf(logfile,"%s.%06ld %s %d %d %d %s %s\n",tmpline1,(unsigned long)t_usec,tmpline2,clientid,requestid,instid,req->lines[i].params[0],req->lines[i].params[1]); - break; - } - } -diff -urN process.cc process.cc ---- process.cc 1999-04-12 14:40:09.000000000 +0100 -+++ process.cc 2011-07-25 19:38:01.000000000 +0100 -@@ -1840,7 +1840,7 @@ - if(*ctrlapp->query_type_buffer) - AddLine("CONTENT_TYPE",ctrlapp->query_type_buffer); - if(ctrlapp->ifmodifiedsince){ -- sprintf(numbuffer,"%lu",ctrlapp->ifmodifiedsince); -+ sprintf(numbuffer,"%lu",(unsigned long)ctrlapp->ifmodifiedsince); - AddLine("HTTP_IF_MODIFIED_SINCE",numbuffer); - } - if(*ctrlapp->auth_user_buffer){ -diff -urN pseudopoll.c pseudopoll.c ---- pseudopoll.c 2011-07-25 19:37:32.000000000 +0100 -+++ pseudopoll.c 2011-07-25 19:38:01.000000000 +0100 -@@ -22,7 +22,7 @@ - static int fdssize=0; - static int fdsbytes=0; - --inline int pseudopoll(struct pollfd *fds,unsigned long nfds,int timeout){ -+int pseudopoll(struct pollfd *fds,unsigned long nfds,int timeout){ - - int i,j,s,newfdsbytes,omitfd,byteposition,currfd,maxfd1=0; - char *newreadfds_c,*newwritefds_c,bit; -diff -urN servproc.c servproc.c ---- servproc.c 1999-05-17 13:31:52.000000000 +0100 -+++ servproc.c 2011-07-25 19:38:43.000000000 +0100 -@@ -426,7 +426,7 @@ - __s32 q; - - char *p; --int i,j,maxfds,sopt,soptlen=sizeof(int); -+int i,j,maxfds,sopt; socklen_t soptlen=sizeof(socklen_t); - int sizeknown=0; - long rln,l,dl; - -@@ -2297,7 +2297,7 @@ - char tmp_str[256], *p,*p1; - uid_t my_uid; - FILE *passwdfile; --int i,this_application,port_name_error=0,i0=0,i1=0,sopt,soptlen=sizeof(int); -+int i,this_application,port_name_error=0,i0=0,i1=0,sopt;socklen_t soptlen=sizeof(socklen_t); - - if(argc<=0) return APP_ERR_INSANE; /* sanity check */ - if(!argv) return APP_ERR_INSANE; diff --git a/www/fhttpd/pkg-descr b/www/fhttpd/pkg-descr deleted file mode 100644 index 1b140d55a39b..000000000000 --- a/www/fhttpd/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -FHTTPD is a relatively new HTTP/FTP daemon that supports modules, -in particular, for PHP3. It's a feasible alternative to Apache, -but only for certain situations (for reasons given below). For -example, if one wishes only to run one daemon for both the FTP -and HTTP services, they can do that with FHTTPD. - -Unfortunately, at this time, FHTTPD does not seem to offer the -capability of running as non-root after binding to privileged -ports. Not to mention that the code itself is not very -self-documenting... it is of a poor programming style. - -WWW: http://www.fhttpd.org/ diff --git a/www/fhttpd/pkg-plist b/www/fhttpd/pkg-plist deleted file mode 100644 index 93dc8ce9c30d..000000000000 --- a/www/fhttpd/pkg-plist +++ /dev/null @@ -1,47 +0,0 @@ -etc/fhttpd.conf -etc/rc.d/fhttpd.sh -%%LOGFILE%% -sbin/fhttpd -sbin/fhttpd-file -sbin/fhttpd-log -%%DATADIR%%/bin/finger-nohtml -%%DATADIR%%/cgi-bin/.index.html -%%DATADIR%%/cgi-bin/finger -%%DATADIR%%/cgi-bin/fortune -%%DATADIR%%/icons/at_work.gif -%%DATADIR%%/icons/audio.gif -%%DATADIR%%/icons/audio.xbm -%%DATADIR%%/icons/binary.gif -%%DATADIR%%/icons/binary.xbm -%%DATADIR%%/icons/c_text.gif -%%DATADIR%%/icons/c_text.xbm -%%DATADIR%%/icons/cdromicon.gif -%%DATADIR%%/icons/exec.gif -%%DATADIR%%/icons/folder.gif -%%DATADIR%%/icons/folder.xbm -%%DATADIR%%/icons/ftp.gif -%%DATADIR%%/icons/html.gif -%%DATADIR%%/icons/html.xbm -%%DATADIR%%/icons/image.gif -%%DATADIR%%/icons/image.xbm -%%DATADIR%%/icons/movie.gif -%%DATADIR%%/icons/text.gif -%%DATADIR%%/icons/text.xbm -%%DATADIR%%/index.html -%%DATADIR%%/noaccess.html -%%DATADIR%%/private/.footer.html -%%DATADIR%%/private/.header.html -%%DATADIR%%/private/.index.html -%%DATADIR%%/private/dummy_file -%%DATADIR%%/private/dummy_file.html -%%DATADIR%%/pub/.footer.html -%%DATADIR%%/pub/.header.html -%%DATADIR%%/pub/.index.html -%%DATADIR%%/pub/dummy_file.html -@dirrm %%DATADIR%%/bin -@dirrm %%DATADIR%%/cgi-bin -@dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%%/incoming -@dirrm %%DATADIR%%/private -@dirrm %%DATADIR%%/pub -@dirrm %%DATADIR%% |