Attachment #6317 for bug #14434

View | Details | Raw Unified | Return to bug 14434
Collapse All | Expand All




# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
# it is changed from previous versions

DISTNAME=       wu-ftpd-2.6.0
CATEGORIES=	ftp
MASTER_SITES=   ftp://ftp.wu-ftpd.org/pub/wu-ftpd/

PATCH_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/quickfixes/apply_to_2.5.0/
PATCHFILES=     \
		data-limit.patch \
		deny.not.nameserved.patch \
		mapped.path.overrun.patch \
		not.in.class.patch \
		rfc931.timeout.patch

MAINTAINER=     ache@FreeBSD.org

Y2K=		http://www.cetis.hvu.nl/~koos/wu-ftpd-faq.html#QA35

HAS_CONFIGURE=	yes

MAN1=		ftpcount.1 ftpwho.1
MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
MAN8=		ftpd.8 ftpshut.8 privatepw.8 ftprestart.8

do-build:
	cd ${WRKSRC} && ./build fbs

Lines 1-6 Link Here

(-)wu-ftpd/files/md5 (-6 / +1 lines)
1	MD5 (wu-ftpd-2.5.0.tar.gz) = 98f9c8490e0d1ca2c3c57e60e65803b7	1	MD5 (wu-ftpd-2.6.0.tar.gz) = 652cfe4b59e0468eded736e7c281d16f
2	MD5 (data-limit.patch) = 1a3868e8533ab13c88ec572fff55957a
3	MD5 (deny.not.nameserved.patch) = 5f5158c26caa9db10c02e92b258c5a1f
4	MD5 (mapped.path.overrun.patch) = b01b65652eb3816f0ab11971ac52424d
5	MD5 (not.in.class.patch) = 5f1eb9b3c8ab07c3005c5cb7c1c6091c
6	MD5 (rfc931.timeout.patch) = 0eae85226fb40f4d717693472de19c46




--- src/config/config.fbs.orig	Thu Oct 21 01:02:40 1999
+++ src/config/config.fbs	Thu Oct 21 01:03:26 1999
@@ -57,7 +57,7 @@
 #define VIRTUAL
 #if defined(__FreeBSD__)
 #undef SPT_TYPE
-#if __FreeBSD__ >= 2
+#if __FreeBSD__ == 2
 #include <osreldate.h>		/* and this works */
 #if __FreeBSD_version >= 199512	/* 2.2-current right now */
 #define SPT_TYPE    SPT_BUILTIN
--- 29,35 ----
  #define VIRTUAL
  # if defined(__FreeBSD__)
  #  undef SPT_TYPE
! #  if __FreeBSD__ >= 2
  #   include <osreldate.h>               /* and this works */
  #   if __FreeBSD_version >= 199512      /* 2.2-current right now */
  #    define SPT_TYPE    SPT_BUILTIN




--- makefiles/Makefile.fbs.orig	Thu Oct 21 01:05:27 1999
+++ makefiles/Makefile.fbs	Thu Oct 21 01:10:55 1999
@@ -24,7 +24,9 @@
 #
 
 DESTDIR=
-PREFIX=		/usr/local
+PREFIX?=		/usr/local
+
+ETCDIR=		${DESTDIR}${PREFIX}/etc
 
 BINDIR=		${DESTDIR}${PREFIX}/bin
 BINOWN=		bin
@@ -52,14 +54,17 @@
 	@if [ ! -e ${SBINDIR} ]; then \
 		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
 	fi

-	@( 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 +85,3 @@
 	fi
 	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpd.8           ${MANDIR}/man8/ftpd.8
 	${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/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
+#        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




*** src/pathnames.h.bak	Mon Jan 20 06:21:45 1997
--- src/pathnames.h	Thu Jan 30 15:42:24 1997
***************
*** 45,54 ****
  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
  #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"
  #endif
  #endif
  
--- 45,54 ----
  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
  #else
! #define _PATH_FTPUSERS  "!!PREFIX!!/etc/ftpusers"
! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
  #endif
  #endif
  
***************
*** 109,115 ****
  #ifdef USE_ETC_FTPD
  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
  #else
! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
  #endif
  #endif
  #endif
--- 109,115 ----
  #ifdef USE_ETC_FTPD
  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
  #else
! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
  #endif
  #endif
  #endif




--- config.h.in.orig	Thu Oct 21 01:18:55 1999
+++ config.h.in	Thu Oct 21 01:20:41 1999
@@ -99,7 +99,7 @@
  * See FIXES-2.4-HOBBIT for more information on this option.
  */
 

 
 /*
  * OPIE
@@ -131,7 +131,7 @@
  * the logging at the cost of a possible slight delay in connection.
  */
 #undef USE_RFC931
-
+ 
 
 /*
  * XFERLOG_REALPATH
@@ -257,7 +257,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
 
 /*
  * BUFFER_SIZE
  * You can specify the buffer size for binary transfers; the defaults




--- support/makefiles/Makefile.fbs.orig	Thu Oct 21 01:21:51 1999
+++ support/makefiles/Makefile.fbs	Thu Oct 21 01:22:55 1999
@@ -33,7 +33,7 @@
 LIBC   = /usr/lib/libc.a
 IFLAGS = 
 LFLAGS = 
-CFLAGS = -O ${IFLAGS} ${LFLAGS}
+CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
 
 SRCS   = strcasestr.c authuser.c ftw.c
 OBJS   = strcasestr.o authuser.o ftw.o
--- 8,14 ----
  LIBC   = /usr/lib/libc.a
  IFLAGS = 
  LFLAGS = 
! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
  
  SRCS   = strcasestr.c authuser.c ftw.c
  OBJS   = strcasestr.o authuser.o ftw.o

Lines 1-11 Link Here

(-)wu-ftpd/patches/patch-am (-5 / +5 lines)
1	--- src/makefiles/Makefile.fbs.orig Sat Oct 31 18:58:15 1998	1	--- src/makefiles/Makefile.fbs.orig Thu Oct 21 01:26:35 1999
2	+++ src/makefiles/Makefile.fbs Wed Feb 10 11:54:57 1999	2	+++ src/makefiles/Makefile.fbs Thu Oct 21 01:27:24 1999
3	@@ -4,7 +4,7 @@	3	@@ -30,7 +30,7 @@
4	#CC = cc	4	#CC = cc
5	IFLAGS = -I.. -I../support	5	IFLAGS = -I.. -I../support
6	LFLAGS = -L../support -s	6	LFLAGS = -L../support -s
7	-CFLAGS = -O ${IFLAGS} ${LFLAGS}	7	-CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
8	+CFLAGS += ${IFLAGS} ${LFLAGS}	8	+CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
9	XOBJS =	9	XOBJS =
10	LIBES = -lsupport -lutil -lskey -lmd -lcrypt	10	LIBES = -lsupport -lutil -lskey -lmd -lcrypt
11	LIBC = /usr/lib/libc.a	11	LIBC = /usr/lib/libc.a

Lines 1-6 Link Here

(-)wu-ftpd/pkg/PLIST (+2 lines)
1	bin/ftpcount	1	bin/ftpcount
2	bin/ftpshut	2	bin/ftpshut
3	bin/ftpwho	3	bin/ftpwho
		4	bin/ftprestart
		5	bin/privatepw
4	etc/ftpaccess.example	6	etc/ftpaccess.example
5	etc/ftpconversions.example	7	etc/ftpconversions.example
6	etc/ftpgroups.example	8	etc/ftpgroups.example

Lines 1-7 Link Here

(-)wu-ftpd/scripts/configure (-7 lines)
1	#!/bin/sh
2	#
3	# configure,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp
4	#
5
6	mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
7	sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g

Return to bug 14434

Lines 8-32 Link Here

(-)wu-ftpd/Makefile (-11 / +5 lines)
8	# REMINDER: to use ftpaccess(5) you need to specify -a in command line,	8	# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
9	# it is changed from previous versions	9	# it is changed from previous versions
10		10
11	DISTNAME= wu-ftpd-2.5.0	11	DISTNAME= wu-ftpd-2.6.0
12	CATEGORIES= ftp	12	CATEGORIES= ftp
13	MASTER_SITES= ftp://ftp.vr.net/pub/wu-ftpd/wu-ftpd/	13	MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
14
15	PATCH_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/quickfixes/apply_to_2.5.0/
16	PATCHFILES= \
17	data-limit.patch \
18	deny.not.nameserved.patch \
19	mapped.path.overrun.patch \
20	not.in.class.patch \
21	rfc931.timeout.patch
22		14
23	MAINTAINER= ache@FreeBSD.org	15	MAINTAINER= ache@FreeBSD.org
24		16
25	Y2K= http://www.cetis.hvu.nl/~koos/wu-ftpd-faq.html#QA35	17	Y2K= http://www.cetis.hvu.nl/~koos/wu-ftpd-faq.html#QA35
26		18
		19	HAS_CONFIGURE= yes
		20
27	MAN1= ftpcount.1 ftpwho.1	21	MAN1= ftpcount.1 ftpwho.1
28	MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5	22	MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
29	MAN8= ftpd.8 ftpshut.8	23	MAN8= ftpd.8 ftpshut.8 privatepw.8 ftprestart.8
30		24
31	do-build:	25	do-build:
32	cd ${WRKSRC} && ./build fbs	26	cd ${WRKSRC} && ./build fbs

Lines 1-19 Link Here

(-)wu-ftpd/patches/patch-aa (-19 / +11 lines)
1	*** src/config/config.fbs.bak Fri Dec 12 18:17:19 1997	1	--- src/config/config.fbs.orig Thu Oct 21 01:02:40 1999
2	--- src/config/config.fbs Wed Dec 24 20:39:50 1997	2	+++ src/config/config.fbs Thu Oct 21 01:03:26 1999
3	***************	3	@@ -57,7 +57,7 @@
4	* 29,35 **	4	#define VIRTUAL
5	#define VIRTUAL	5	#if defined(__FreeBSD__)
6	# if defined(__FreeBSD__)	6	#undef SPT_TYPE
7	# undef SPT_TYPE	7	-#if __FreeBSD__ >= 2
8	! # if __FreeBSD__ == 2	8	+#if __FreeBSD__ == 2
9	# include <osreldate.h> /* and this works */	9	#include <osreldate.h> /* and this works */
10	# if __FreeBSD_version >= 199512 /* 2.2-current right now */	10	#if __FreeBSD_version >= 199512 /* 2.2-current right now */
11	# define SPT_TYPE SPT_BUILTIN	11	#define SPT_TYPE SPT_BUILTIN
12	--- 29,35 ----
13	#define VIRTUAL
14	# if defined(__FreeBSD__)
15	# undef SPT_TYPE
16	! # if __FreeBSD__ >= 2
17	# include <osreldate.h> /* and this works */
18	# if __FreeBSD_version >= 199512 /* 2.2-current right now */
19	# define SPT_TYPE SPT_BUILTIN

Lines 1-15 Link Here

(-)wu-ftpd/patches/patch-ab (-26 / +20 lines)
1	--- makefiles/Makefile.fbs.orig Tue Mar 30 05:31:40 1999	1	--- makefiles/Makefile.fbs.orig Thu Oct 21 01:05:27 1999
2	+++ makefiles/Makefile.fbs Wed Apr 7 14:58:44 1999	2	+++ makefiles/Makefile.fbs Thu Oct 21 01:10:55 1999
3	@@ -1,5 +1,7 @@	3	@@ -24,7 +24,9 @@
		4	#
		5
4	DESTDIR=	6	DESTDIR=
5	-PREFIX= /usr/local	7	-PREFIX= /usr/local
6	+PREFIX?= /usr/local	8	+PREFIX?= /usr/local
7	+	9	+
8	+ETCDIR= ${DESTDIR}${PREFIX}/etc	10	+ETCDIR= ${DESTDIR}${PREFIX}/etc
9		11
10	BINDIR= ${DESTDIR}${PREFIX}/bin	12	BINDIR= ${DESTDIR}${PREFIX}/bin
11	BINOWN= bin	13	BINOWN= bin
12	@@ -27,12 +29,18 @@	14	@@ -52,14 +54,17 @@
13	@if [ ! -e ${SBINDIR} ]; then \	15	@if [ ! -e ${SBINDIR} ]; then \
14	${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \	16	${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
15	fi	17	fi
Lines 17-40 Link Here
17	- @( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd ; chown ${SBINOWN}.${SBINGRP} wu.ftpd )	19	- @( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd ; chown ${SBINOWN}.${SBINGRP} wu.ftpd )
18	- @( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd )	20	- @( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd )
19	+ ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/ftpd	21	+ ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/ftpd
20	+# ${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd ${SBINDIR}/in.ftpd
21	+# @( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd ; chown ${SBINOWN}.${SBINGRP} wu.ftpd )
22	+# @( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd )
23	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpshut ${BINDIR}/ftpshut	22	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpshut ${BINDIR}/ftpshut
		23	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftprestart ${BINDIR}/ftprestart
24	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpcount ${BINDIR}/ftpcount	24	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpcount ${BINDIR}/ftpcount
25	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpwho ${BINDIR}/ftpwho	25	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/ftpwho ${BINDIR}/ftpwho
26	+ $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example	26	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 111 bin/privatepw ${BINDIR}/privatepw
27	+ $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example	27	+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
28	+ $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example	28	+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
29	+ $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftphosts ${ETCDIR}/ftphosts.example	29	+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
30	+ $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpgroups ${ETCDIR}/ftpgroups.example	30	+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftphosts ${ETCDIR}/ftphosts.example
		31	+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 doc/examples/ftpgroups ${ETCDIR}/ftpgroups.example
31	@echo installing manpages.	32	@echo installing manpages.
32	@if [ ! -e ${MANDIR}/man1 ]; then \	33	@if [ ! -e ${MANDIR}/man1 ]; then \
33	${INSTALL} -o ${MANOWN} -g ${MANGRP} -m 755 -d ${MANDIR}/man1 ; \	34	${INSTALL} -o ${MANOWN} -g ${MANGRP} -m 755 -d ${MANDIR}/man1 ; \
34	@@ -51,12 +59,12 @@	35	@@ -80,14 +85,3 @@
35	fi
36	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
37	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8	36	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
		37	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftprestart.8 ${MANDIR}/man8/ftprestart.8
		38	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 util/privatepw/privatepw.8 ${MANDIR}/man8/privatepw.8
38	- @echo Compressing manpages	39	- @echo Compressing manpages
39	- gzip -f -9 ${MANDIR}/man1/ftpcount.1	40	- gzip -f -9 ${MANDIR}/man1/ftpcount.1
40	- gzip -f -9 ${MANDIR}/man1/ftpwho.1	41	- gzip -f -9 ${MANDIR}/man1/ftpwho.1
Lines 44-55 Link Here
44	- gzip -f -9 ${MANDIR}/man5/xferlog.5	45	- gzip -f -9 ${MANDIR}/man5/xferlog.5
45	- gzip -f -9 ${MANDIR}/man8/ftpd.8	46	- gzip -f -9 ${MANDIR}/man8/ftpd.8
46	- gzip -f -9 ${MANDIR}/man8/ftpshut.8	47	- gzip -f -9 ${MANDIR}/man8/ftpshut.8
47	+# @echo Compressing manpages	48	- gzip -f -9 ${MANDIR}/man8/ftprestart.8
48	+# gzip -f -9 ${MANDIR}/man1/ftpcount.1	49	- gzip -f -9 ${MANDIR}/man8/privatepw.8
49	+# gzip -f -9 ${MANDIR}/man1/ftpwho.1
50	+# gzip -f -9 ${MANDIR}/man5/ftpaccess.5
51	+# gzip -f -9 ${MANDIR}/man5/ftpconversions.5
52	+# gzip -f -9 ${MANDIR}/man5/ftphosts.5
53	+# gzip -f -9 ${MANDIR}/man5/xferlog.5
54	+# gzip -f -9 ${MANDIR}/man8/ftpd.8
55	+# gzip -f -9 ${MANDIR}/man8/ftpshut.8

Lines 1-42 Link Here

(-)wu-ftpd/patches/patch-ac (-42 lines)
1	*** src/pathnames.h.bak Mon Jan 20 06:21:45 1997
2	--- src/pathnames.h Thu Jan 30 15:42:24 1997
3	***************
4	* 45,54 **
5	#define _PATH_CVT "/etc/ftpd/ftpconversions"
6	#define _PATH_PRIVATE "/etc/ftpd/ftpgroups"
7	#else
8	! #define _PATH_FTPUSERS "/usr/local/lib/ftpd/ftpusers"
9	! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
10	! #define _PATH_CVT "/usr/local/lib/ftpd/ftpconversions"
11	! #define _PATH_PRIVATE "/usr/local/lib/ftpd/ftpgroups"
12	#endif
13	#endif
14
15	--- 45,54 ----
16	#define _PATH_CVT "/etc/ftpd/ftpconversions"
17	#define _PATH_PRIVATE "/etc/ftpd/ftpgroups"
18	#else
19	! #define _PATH_FTPUSERS "!!PREFIX!!/etc/ftpusers"
20	! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
21	! #define _PATH_CVT "!!PREFIX!!/etc/ftpconversions"
22	! #define _PATH_PRIVATE "!!PREFIX!!/etc/ftpgroups"
23	#endif
24	#endif
25
26	***************
27	* 109,115 **
28	#ifdef USE_ETC_FTPD
29	#define _PATH_FTPHOSTS "/etc/ftpd/ftphosts"
30	#else
31	! #define _PATH_FTPHOSTS "/usr/local/lib/ftpd/ftphosts"
32	#endif
33	#endif
34	#endif
35	--- 109,115 ----
36	#ifdef USE_ETC_FTPD
37	#define _PATH_FTPHOSTS "/etc/ftpd/ftphosts"
38	#else
39	! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts"
40	#endif
41	#endif
42	#endif

Lines 1-6 Link Here

(-)wu-ftpd/patches/patch-ai (-19 / +10 lines)
1	--- config.h.orig Thu Mar 4 09:45:57 1999	1	--- config.h.in.orig Thu Oct 21 01:18:55 1999
2	+++ config.h Tue Mar 9 16:33:39 1999	2	+++ config.h.in Thu Oct 21 01:20:41 1999
3	@@ -74,7 +74,7 @@	3	@@ -99,7 +99,7 @@
4	* See FIXES-2.4-HOBBIT for more information on this option.	4	* See FIXES-2.4-HOBBIT for more information on this option.
5	*/	5	*/
6		6
Lines 9-29 Link Here
9		9
10	/*	10	/*
11	* OPIE	11	* OPIE
12	@@ -203,7 +203,7 @@	12	@@ -131,7 +131,7 @@
13	* Undefine this to let NOOP reset the idle timeout.	13	* the logging at the cost of a possible slight delay in connection.
14	*/	14	*/
15		15	#undef USE_RFC931
16	-#define IGNORE_NOOP	16	-
17	+#undef IGNORE_NOOP	17	+
18
19	/*
20	* XFERLOG_REALPATH
21	@@ -257,7 +257,7 @@
22	* the risk of PASV port race stealing the connection. It also is non-RFC
23	* compliant, so it may cause problems for some client sites.
24	*/
25	-#define FIGHT_PASV_PORT_RACE
26	+#undef FIGHT_PASV_PORT_RACE
27
28	/*	18	/*
29	* Define this to completely disable anonymous FTP access.	19	* BUFFER_SIZE
		20	* You can specify the buffer size for binary transfers; the defaults

Lines 1-19 Link Here

(-)wu-ftpd/patches/patch-al (-19 / +11 lines)
1	*** support/makefiles/Makefile.fbs.bak Mon Mar 3 12:11:54 1997	1	--- support/makefiles/Makefile.fbs.orig Thu Oct 21 01:21:51 1999
2	--- support/makefiles/Makefile.fbs Sun Apr 27 21:13:35 1997	2	+++ support/makefiles/Makefile.fbs Thu Oct 21 01:22:55 1999
3	***************	3	@@ -33,7 +33,7 @@
4	* 8,14 **	4	LIBC = /usr/lib/libc.a
5	LIBC = /usr/lib/libc.a	5	IFLAGS =
6	IFLAGS =	6	LFLAGS =
7	LFLAGS =	7	-CFLAGS = -O ${IFLAGS} ${LFLAGS}
8	! CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO	8	+CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
9		9
10	SRCS = strcasestr.c authuser.c ftw.c	10	SRCS = strcasestr.c authuser.c ftw.c
11	OBJS = strcasestr.o authuser.o ftw.o	11	OBJS = strcasestr.o authuser.o ftw.o
12	--- 8,14 ----
13	LIBC = /usr/lib/libc.a
14	IFLAGS =
15	LFLAGS =
16	! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
17
18	SRCS = strcasestr.c authuser.c ftw.c
19	OBJS = strcasestr.o authuser.o ftw.o