Attachment #19517 for bug #34660

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





PORTNAME=	wu-ftpd
PORTVERSION=	2.6.1
PORTREVISION=   9
CATEGORIES=	ftp
DIST_SUBDIR=    wu-ftpd
MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/


MAINTAINER=	ache@FreeBSD.org

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
		--enable-noop --disable-numericuid \
		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc

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

post-patch:
	@${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h
	@${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h

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

.include <bsd.port.mk>




*** src/pathnames.h.orig	Wed Oct 20 20:27:34 1999
--- src/pathnames.h.noac	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




--- config.h.noac.orig	Tue Oct  2 23:07:36 2001
+++ config.h.noac	Tue Oct  2 23:08:15 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.
@@ -387,4 +385,4 @@
  * the NLST command enough to quell complains from Solaris command-
  * line FTP client users.
  */
-#undef NLST_SHOWS_DIRS
+#define NLST_SHOWS_DIRS




--- 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''




--- Makefile.in.orig	Tue Feb  5 23:02:47 2002
+++ Makefile.in	Tue Feb  5 22:57:32 2002
@@ -67,7 +67,7 @@
 	-@mkdir -p $(DESTDIR)/$(mandir)/man1
 	-@mkdir -p $(DESTDIR)/$(mandir)/man5
 	-@mkdir -p $(DESTDIR)/@ETCDIR@
-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
@@ -87,5 +87,8 @@
 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess.example
+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions.example
+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpgroups $(DESTDIR)/@ETCDIR@/ftpgroups.example
+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftphosts $(DESTDIR)/@ETCDIR@/ftphosts.example
+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@ETCDIR@/ftpusers.example

Lines 1-8 Link Here

(-)wu-ftpd/pkg-plist (-3 / +4 lines)
1	bin/ftpcount	1	bin/ftpcount
2	bin/ftprestart
3	bin/ftpshut
4	bin/ftpwho	2	bin/ftpwho
5	bin/privatepw	3	sbin/ckconfig
		4	sbin/ftprestart
		5	sbin/ftpshut
		6	sbin/privatepw
6	etc/ftpaccess.example	7	etc/ftpaccess.example
7	etc/ftpconversions.example	8	etc/ftpconversions.example
8	etc/ftpgroups.example	9	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 34660

Lines 9-15 Link Here

(-)wu-ftpd/Makefile (-9 / +8 lines)
9		9
10	PORTNAME= wu-ftpd	10	PORTNAME= wu-ftpd
11	PORTVERSION= 2.6.1	11	PORTVERSION= 2.6.1
12	PORTREVISION= 8	12	PORTREVISION= 9
13	CATEGORIES= ftp	13	CATEGORIES= ftp
14	DIST_SUBDIR= wu-ftpd	14	DIST_SUBDIR= wu-ftpd
15	MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/	15	MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
Lines 22-36 Link Here
22		22
23	MAINTAINER= ache@FreeBSD.org	23	MAINTAINER= ache@FreeBSD.org
24		24
		25	HAS_CONFIGURE= yes
		26	CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \
		27	--enable-noop --disable-numericuid \
		28	--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
		29
25	MAN1= ftpcount.1 ftpwho.1	30	MAN1= ftpcount.1 ftpwho.1
26	MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5	31	MAN5= ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 \
		32	ftpservers.5
27	MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8	33	MAN8= ftpd.8 ftpshut.8 ftprestart.8 privatepw.8
28
29	post-patch:
30	@${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h
31	@${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h
32
33	do-build:
34	cd ${WRKSRC} && ./build fbs
35		34
36	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Lines 1-42 Link Here

(-)wu-ftpd/files/patch-ac (-42 lines)
1	*** src/pathnames.h.orig Wed Oct 20 20:27:34 1999
2	--- src/pathnames.h.noac Wed Oct 20 20:30:19 1999
3	***************
4	* 104,113 **
5	#define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
6	#endif
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	#ifdef VIRTUAL
13	#define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
14	#endif
15	--- 104,113 ----
16	#define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
17	#endif
18	#else
19	! #define _PATH_FTPUSERS "!!PREFIX!!/lib/ftpd/ftpusers"
20	! #define _PATH_FTPACCESS "!!PREFIX!!/lib/ftpd/ftpaccess"
21	! #define _PATH_CVT "!!PREFIX!!/lib/ftpd/ftpconversions"
22	! #define _PATH_PRIVATE "!!PREFIX!!/lib/ftpd/ftpgroups"
23	#ifdef VIRTUAL
24	#define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
25	#endif
26	***************
27	* 203,209 **
28	#ifdef USE_OPT_FTPD
29	#define _PATH_FTPHOSTS "/opt/ftpd/lib/ftphosts"
30	#else
31	! #define _PATH_FTPHOSTS "/usr/local/lib/ftpd/ftphosts"
32	#endif
33	#endif
34	#endif
35	--- 203,209 ----
36	#ifdef USE_OPT_FTPD
37	#define _PATH_FTPHOSTS "/opt/ftpd/lib/ftphosts"
38	#else
39	! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts"
40	#endif
41	#endif
42	#endif

Lines 1-46 Link Here

(-)wu-ftpd/files/patch-ai (-46 lines)
1	--- config.h.noac.orig Tue Oct 2 23:07:36 2001
2	+++ config.h.noac Tue Oct 2 23:08:15 2001
3	@@ -109,9 +109,7 @@
4	* Add OPIE support -- REQUIRES OPIE libraries
5	*/
6
7	-#if !defined (LINUX) /* Linux autodetects OPIE */
8	-#undef OPIE
9	-#endif
10	+#define OPIE
11
12	/*
13	* ALTERNATE_CD
14	@@ -132,7 +130,7 @@
15	* Define this if you want to use RFC 931 'authentication' - this improves
16	* the logging at the cost of a possible slight delay in connection.
17	*/
18	-#undef USE_RFC931
19	+#define USE_RFC931
20
21	/*
22	* BUFFER_SIZE
23	@@ -232,7 +230,7 @@
24	* Undefine this to let NOOP reset the idle timeout.
25	*/
26
27	-#define IGNORE_NOOP
28	+#undef IGNORE_NOOP
29
30	/*
31	* XFERLOG_REALPATH
32	@@ -286,7 +284,7 @@
33	* the risk of PASV port race stealing the connection. It also is non-RFC
34	* compliant, so it may cause problems for some client sites.
35	*/
36	-#define FIGHT_PASV_PORT_RACE
37	+#undef FIGHT_PASV_PORT_RACE
38
39	/*
40	* Define this to completely disable anonymous FTP access.
41	@@ -387,4 +385,4 @@
42	* the NLST command enough to quell complains from Solaris command-
43	* line FTP client users.
44	*/
45	-#undef NLST_SHOWS_DIRS
46	+#define NLST_SHOWS_DIRS

Lines 1-17 Link Here

(-)wu-ftpd/files/patch-ao (-17 lines)
1	--- build.dist Sun Oct 17 09:31:38 1999
2	+++ build Wed Oct 20 20:40:00 1999
3	@@ -114,10 +114,10 @@
4
5	done
6
7	-rm -f config.h
8	-ln -s config.h.noac config.h
9	-rm -f src/pathnames.h
10	-ln -s pathnames.h.noac src/pathnames.h
11	+#rm -f config.h
12	+#ln -s config.h.noac config.h
13	+#rm -f src/pathnames.h
14	+#ln -s pathnames.h.noac src/pathnames.h
15
16	echo 'make args are : '$makeargs''
17	echo 'make opts are : '$makeopts''

Line 0 Link Here

(-)wu-ftpd/files/patch-aq (+22 lines)
	1	--- Makefile.in.orig Tue Feb 5 23:02:47 2002
	2	+++ Makefile.in Tue Feb 5 22:57:32 2002
	3	@@ -67,7 +67,7 @@
	4	-@mkdir -p $(DESTDIR)/$(mandir)/man1
	5	-@mkdir -p $(DESTDIR)/$(mandir)/man5
	6	-@mkdir -p $(DESTDIR)/@ETCDIR@
	7	- @INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
	8	+ @INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
	9	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
	10	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
	11	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
	12	@@ -87,5 +87,8 @@
	13	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
	14	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
	15	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
	16	- @if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
	17	- @if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
	18	+ @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess.example
	19	+ @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions.example
	20	+ @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpgroups $(DESTDIR)/@ETCDIR@/ftpgroups.example
	21	+ @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftphosts $(DESTDIR)/@ETCDIR@/ftphosts.example
	22	+ @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@ETCDIR@/ftpusers.example