diff options
Diffstat (limited to 'ftp/wu-ftpd+ipv6/files')
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-aa | 75 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ab | 81 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ac | 42 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ad | 20 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ae | 13 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ag | 19 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ah | 31 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ai | 40 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-al | 19 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-am | 14 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-an | 14 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ao | 17 | ||||
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ap | 11 |
13 files changed, 0 insertions, 396 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa deleted file mode 100644 index 9e3e4d9790ad..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-aa +++ /dev/null @@ -1,75 +0,0 @@ ---- src/ftpd.c.orig Sun Jul 2 01:17:39 2000 -+++ src/ftpd.c Tue Sep 4 10:36:51 2001 -@@ -1662,9 +1662,9 @@ - /* Display s/key challenge where appropriate. */ - - if (pwd == NULL || skeychallenge(&skey, pwd->pw_name, sbuf)) -- sprintf(buf, "Password required for %s.", name); -+ snprintf(buf, 128, "Password required for %s.", name); - else -- sprintf(buf, "%s %s for %s.", sbuf, -+ snprintf(buf, 128, "%s %s for %s.", sbuf, - pwok ? "allowed" : "required", name); - return (buf); - } -@@ -2572,7 +2572,7 @@ - #ifdef BSD_AUTH - if (ext_auth) { - if ((salt = check_auth(the_user, passwd))) { -- reply(530, salt); -+ reply(530, "%s", salt); - #ifdef LOG_FAILED /* 27-Apr-93 EHK/BM */ - syslog(LOG_INFO, "failed login from %s", - remoteident); -@@ -6274,7 +6274,7 @@ - if (s) { - int i = ntohs(pasv_addr.sin_port); - sprintf(s, "PASV port %i assigned to %s", i, remoteident); -- syslog(LOG_DEBUG, s); -+ syslog(LOG_DEBUG, "%s", s); - free(s); - } - } -@@ -6289,7 +6289,7 @@ - char *s = calloc(128 + strlen(remoteident), sizeof(char)); - if (s) { - sprintf(s, "PASV port assignment assigned for %s", remoteident); -- syslog(LOG_DEBUG, s); -+ syslog(LOG_DEBUG, "%s", s); - free(s); - } - } -@@ -6435,7 +6435,7 @@ - dirlist = ftpglob(whichfiles); - sdirlist = dirlist; /* save to free later */ - if (globerr != NULL) { -- reply(550, globerr); -+ reply(550, "%s", globerr); - goto globfree; - } - else if (dirlist == NULL) { -@@ -6486,7 +6486,6 @@ - } - goto globfree; - } -- if ((st.st_mode & S_IFMT) != S_IFDIR) { - if (dout == NULL) { - dout = dataconn("file list", (off_t) - 1, "w"); - if (dout == NULL) -@@ -6509,7 +6508,6 @@ - byte_count_out++; - } - #endif -- } - } - - if (dout != NULL) { -@@ -7274,7 +7272,7 @@ - int which; - struct aclmember *entry = NULL; - (void) acl_getclass(class); -- while (getaclentry("port-allow", &entry)) { -+ while (getaclentry("pasv-allow", &entry)) { - if ((ARG0 != NULL) && (strcasecmp(class, ARG0) == 0)) - for (which = 1; (which < MAXARGS) && (ARG[which] != NULL); which++) { - if (hostmatch(ARG[which], remoteaddr, NULL)) diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab deleted file mode 100644 index 20062d577fff..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ab +++ /dev/null @@ -1,81 +0,0 @@ ---- makefiles/Makefile.fbs.orig Sun Jul 2 00:56:26 2000 -+++ makefiles/Makefile.fbs Tue Sep 4 10:34:51 2001 -@@ -24,19 +24,21 @@ - # - - DESTDIR= --PREFIX= /usr/local -+PREFIX?= /usr/local -+ -+ETCDIR= ${DESTDIR}${PREFIX}/etc - - BINDIR= ${DESTDIR}${PREFIX}/bin --BINOWN= bin --BINGRP= bin -+BINOWN= root -+BINGRP= wheel - - SBINDIR= ${DESTDIR}${PREFIX}/libexec --SBINOWN= bin --SBINGRP= bin -+SBINOWN= root -+SBINGRP= wheel - - MANDIR= ${DESTDIR}${PREFIX}/man --MANOWN= bin --MANGRP= bin -+MANOWN= root -+MANGRP= wheel - - INSTALL= install - -@@ -52,14 +54,20 @@ - @if [ ! -e ${SBINDIR} ]; then \ - ${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \ - fi -- ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/in.ftpd -- @( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd ; chown ${SBINOWN}.${SBINGRP} wu.ftpd ) -- @( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd ) -+ ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/ftpd -+# ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/in.ftpd -+# @( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd ; chown ${SBINOWN}.${SBINGRP} wu.ftpd ) -+# @( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd ) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpshut ${BINDIR}/ftpshut - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftprestart ${BINDIR}/ftprestart - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpcount ${BINDIR}/ftpcount - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpwho ${BINDIR}/ftpwho - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/privatepw ${BINDIR}/privatepw -+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example -+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example -+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example -+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftphosts ${ETCDIR}/ftphosts.example -+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpgroups ${ETCDIR}/ftpgroups.example - @echo installing manpages. - @if [ ! -e ${MANDIR}/man1 ]; then \ - ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m 755 -d ${MANDIR}/man1 ; \ -@@ -80,14 +88,14 @@ - ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 - ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftprestart.8 ${MANDIR}/man8/ftprestart.8 - ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 util/privatepw/privatepw.8 ${MANDIR}/man8/privatepw.8 -- @echo Compressing manpages -- gzip -f -9 ${MANDIR}/man1/ftpcount.1 -- gzip -f -9 ${MANDIR}/man1/ftpwho.1 -- gzip -f -9 ${MANDIR}/man5/ftpaccess.5 -- gzip -f -9 ${MANDIR}/man5/ftpconversions.5 -- gzip -f -9 ${MANDIR}/man5/ftphosts.5 -- gzip -f -9 ${MANDIR}/man5/xferlog.5 -- gzip -f -9 ${MANDIR}/man8/ftpd.8 -- gzip -f -9 ${MANDIR}/man8/ftpshut.8 -- gzip -f -9 ${MANDIR}/man8/ftprestart.8 -- gzip -f -9 ${MANDIR}/man8/privatepw.8 -+# @echo Compressing manpages -+# gzip -f -9 ${MANDIR}/man1/ftpcount.1 -+# gzip -f -9 ${MANDIR}/man1/ftpwho.1 -+# gzip -f -9 ${MANDIR}/man5/ftpaccess.5 -+# gzip -f -9 ${MANDIR}/man5/ftpconversions.5 -+# gzip -f -9 ${MANDIR}/man5/ftphosts.5 -+# gzip -f -9 ${MANDIR}/man5/xferlog.5 -+# gzip -f -9 ${MANDIR}/man8/ftpd.8 -+# gzip -f -9 ${MANDIR}/man8/ftpshut.8 -+# gzip -f -9 ${MANDIR}/man8/ftprestart.8 -+# gzip -f -9 ${MANDIR}/man8/privatepw.8 diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac deleted file mode 100644 index 16fb41bc5a7a..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ -*** src/pathnames.h.orig Wed Oct 20 20:27:34 1999 ---- src/pathnames.h Wed Oct 20 20:30:19 1999 -*************** -*** 104,113 **** - #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers" - #endif - #else -! #define _PATH_FTPUSERS "/usr/local/lib/ftpd/ftpusers" -! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess" -! #define _PATH_CVT "/usr/local/lib/ftpd/ftpconversions" -! #define _PATH_PRIVATE "/usr/local/lib/ftpd/ftpgroups" - #ifdef VIRTUAL - #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers" - #endif ---- 104,113 ---- - #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers" - #endif - #else -! #define _PATH_FTPUSERS "!!PREFIX!!/lib/ftpd/ftpusers" -! #define _PATH_FTPACCESS "!!PREFIX!!/lib/ftpd/ftpaccess" -! #define _PATH_CVT "!!PREFIX!!/lib/ftpd/ftpconversions" -! #define _PATH_PRIVATE "!!PREFIX!!/lib/ftpd/ftpgroups" - #ifdef VIRTUAL - #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers" - #endif -*************** -*** 203,209 **** - #ifdef USE_OPT_FTPD - #define _PATH_FTPHOSTS "/opt/ftpd/lib/ftphosts" - #else -! #define _PATH_FTPHOSTS "/usr/local/lib/ftpd/ftphosts" - #endif - #endif - #endif ---- 203,209 ---- - #ifdef USE_OPT_FTPD - #define _PATH_FTPHOSTS "/opt/ftpd/lib/ftphosts" - #else -! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts" - #endif - #endif - #endif diff --git a/ftp/wu-ftpd+ipv6/files/patch-ad b/ftp/wu-ftpd+ipv6/files/patch-ad deleted file mode 100644 index 90496cc26cae..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/xferlog.5.orig Thu Jan 9 22:29:03 1997 -+++ doc/xferlog.5 Mon Feb 16 23:34:15 1998 -@@ -7,7 +7,7 @@ - .B xferlog - file contains logging information from the FTP server daemon, - .BR ftpd (8). --This file usually is found in /usr/adm, but can be located anywhere by using a -+This file usually is found in /var/log, but can be located anywhere by using a - option to - .BR ftpd (8). - Each server entry is composed of a single line of the following form, -@@ -135,7 +135,7 @@ - .SH FILES - .PD 0 - .TP 20 --.B /usr/adm/xferlog -+.B /var/log/xferlog - .SH "SEE ALSO" - .BR ftpd(8), - .BR ftpaccess(5) diff --git a/ftp/wu-ftpd+ipv6/files/patch-ae b/ftp/wu-ftpd+ipv6/files/patch-ae deleted file mode 100644 index 39924aea5bfc..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ ---- src/config/config.fbs.bak Sat Jul 1 22:03:07 2000 -+++ src/config/config.fbs Sun Jul 29 23:37:56 2001 -@@ -79,10 +79,6 @@ - typedef void SIGNAL_TYPE; - - #include "../config.h" --/* SKEY should always be defined on FreeBSD */ --#ifndef SKEY --#define SKEY --#endif - #ifdef SKEY - #define SKEY_NAME - #endif diff --git a/ftp/wu-ftpd+ipv6/files/patch-ag b/ftp/wu-ftpd+ipv6/files/patch-ag deleted file mode 100644 index dabfbce24f9e..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ -*** doc/examples/ftpconversions.orig Wed Jan 25 22:11:02 1995 ---- doc/examples/ftpconversions Wed Jan 25 22:11:49 1995 -*************** -*** 1,7 **** -! :.Z: : :/bin/compress -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS - : : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS - :.gz: : :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP - : : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP - : : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR - : : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS -! : : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP ---- 1,7 ---- -! :.Z: : :/bin/gzip -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS - : : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS - :.gz: : :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP - : : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP - : : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR - : : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS -! : : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP diff --git a/ftp/wu-ftpd+ipv6/files/patch-ah b/ftp/wu-ftpd+ipv6/files/patch-ah deleted file mode 100644 index 537d8d5e0959..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ah +++ /dev/null @@ -1,31 +0,0 @@ -*** doc/examples/ftpusers.orig Tue Aug 8 19:30:46 1995 ---- doc/examples/ftpusers Tue Aug 8 19:33:46 1995 -*************** -*** 1,14 **** - root -! bin -! boot - daemon -- digital -- field -- gateway -- guest -- nobody - operator -! ris -! sccs -! sys - uucp ---- 1,12 ---- - root -! toor - daemon - operator -! bin -! games -! news -! man - uucp -+ xten -+ ingres -+ nobody diff --git a/ftp/wu-ftpd+ipv6/files/patch-ai b/ftp/wu-ftpd+ipv6/files/patch-ai deleted file mode 100644 index 13a3588117c7..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ai +++ /dev/null @@ -1,40 +0,0 @@ ---- config.h.orig Sun Jul 29 23:29:57 2001 -+++ config.h Sun Jul 29 23:30:55 2001 -@@ -109,9 +109,7 @@ - * Add OPIE support -- REQUIRES OPIE libraries - */ - --#if !defined (LINUX) /* Linux autodetects OPIE */ --#undef OPIE --#endif -+#define OPIE - - /* - * ALTERNATE_CD -@@ -132,7 +130,7 @@ - * Define this if you want to use RFC 931 'authentication' - this improves - * the logging at the cost of a possible slight delay in connection. - */ --#undef USE_RFC931 -+#define USE_RFC931 - - /* - * BUFFER_SIZE -@@ -232,7 +230,7 @@ - * Undefine this to let NOOP reset the idle timeout. - */ - --#define IGNORE_NOOP -+#undef IGNORE_NOOP - - /* - * XFERLOG_REALPATH -@@ -286,7 +284,7 @@ - * the risk of PASV port race stealing the connection. It also is non-RFC - * compliant, so it may cause problems for some client sites. - */ --#define FIGHT_PASV_PORT_RACE -+#undef FIGHT_PASV_PORT_RACE - - /* - * Define this to completely disable anonymous FTP access. diff --git a/ftp/wu-ftpd+ipv6/files/patch-al b/ftp/wu-ftpd+ipv6/files/patch-al deleted file mode 100644 index 40568f198e15..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-al +++ /dev/null @@ -1,19 +0,0 @@ -*** support/makefiles/Makefile.fbs.orig Mon Oct 4 22:44:08 1999 ---- support/makefiles/Makefile.fbs Wed Oct 20 20:32:42 1999 -*************** -*** 33,39 **** - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS = -O ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o ---- 33,39 ---- - LIBC = /usr/lib/libc.a - IFLAGS = - LFLAGS = -! CFLAGS += ${IFLAGS} ${LFLAGS} - - SRCS = strcasestr.c authuser.c ftw.c - OBJS = strcasestr.o authuser.o ftw.o diff --git a/ftp/wu-ftpd+ipv6/files/patch-am b/ftp/wu-ftpd+ipv6/files/patch-am deleted file mode 100644 index 63b9551ecc1b..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-am +++ /dev/null @@ -1,14 +0,0 @@ ---- src/makefiles/Makefile.fbs.orig Sat Jul 1 22:57:50 2000 -+++ src/makefiles/Makefile.fbs Sun Jul 29 23:33:47 2001 -@@ -30,9 +30,9 @@ - #CC = cc - IFLAGS = -I.. -I../support - LFLAGS = -L../support -s --CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO -+CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO - XOBJS = --LIBES = -lsupport -lutil -lskey -lmd -lcrypt -+LIBES = -lsupport -lutil -lopie -lmd -lcrypt - LIBC = /usr/lib/libc.a - LINTFLAGS= - LKERB = -lauth -lckrb -lkrb -ldes diff --git a/ftp/wu-ftpd+ipv6/files/patch-an b/ftp/wu-ftpd+ipv6/files/patch-an deleted file mode 100644 index 09220f4bc9cf..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-an +++ /dev/null @@ -1,14 +0,0 @@ ---- src/makefiles/common.orig Sun Oct 3 21:51:35 1999 -+++ src/makefiles/common Wed Oct 20 20:35:25 1999 -@@ -48,7 +48,11 @@ - ${CC} ${LFLAGS} -o $@ ${UTIL_OBJS} ftprestart.o rdservers.o ${XLIBS} - - ftpd: ${OBJS} ${XOBJS} ../support/libsupport.a -+.if defined(PACKAGE_BUILDING) - ${CC} ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS} -+.else -+ ${CC} -static ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS} -+.endif - - ckconfig: ${UTIL_OBJS} ckconfig.o rdservers.o - ${CC} ${LFLAGS} -o $@ ${UTIL_OBJS} ckconfig.o rdservers.o ${XLIBS} diff --git a/ftp/wu-ftpd+ipv6/files/patch-ao b/ftp/wu-ftpd+ipv6/files/patch-ao deleted file mode 100644 index 217918b048bd..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ ---- build.dist Sun Oct 17 09:31:38 1999 -+++ build Wed Oct 20 20:40:00 1999 -@@ -114,10 +114,10 @@ - - done - --rm -f config.h --ln -s config.h.noac config.h --rm -f src/pathnames.h --ln -s pathnames.h.noac src/pathnames.h -+#rm -f config.h -+#ln -s config.h.noac config.h -+#rm -f src/pathnames.h -+#ln -s pathnames.h.noac src/pathnames.h - - echo 'make args are : '$makeargs'' - echo 'make opts are : '$makeopts'' diff --git a/ftp/wu-ftpd+ipv6/files/patch-ap b/ftp/wu-ftpd+ipv6/files/patch-ap deleted file mode 100644 index 1fe5e1602398..000000000000 --- a/ftp/wu-ftpd+ipv6/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- src/glob.c.dist Tue Oct 5 11:54:42 1999 -+++ src/glob.c Thu Oct 21 19:51:03 1999 -@@ -107,7 +107,7 @@ - - fixpath(v); - if (v[0] == '\0') -- v = "*"; -+ v = "."; - else if ((strlen(v) > 1) && (v[strlen(v) - 1] == '/')) - v[strlen(v) - 1] = '\0'; - |