Attachment 19517 Details for Bug 34660 – file.diff

[patch] file.diff

file.diff (text/plain), 7.36 KB, created by James E. Housley on 2002-02-06 11:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James E. Housley

Created: 2002-02-06 11:50:01 UTC

Size: 7.36 KB

patch

obsolete

>diff -ruN wu-ftpd-orig/Makefile wu-ftpd/Makefile
>--- wu-ftpd-orig/Makefile	Thu Dec 20 15:30:35 2001
>+++ wu-ftpd/Makefile	Wed Feb  6 06:34:48 2002
>@@ -9,7 +9,7 @@
> 
> PORTNAME=	wu-ftpd
> PORTVERSION=	2.6.1
>-PORTREVISION=   8
>+PORTREVISION=   9
> CATEGORIES=	ftp
> DIST_SUBDIR=    wu-ftpd
> MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
>@@ -22,15 +22,14 @@
> 
> 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
>+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>
>diff -ruN wu-ftpd-orig/files/patch-ac wu-ftpd/files/patch-ac
>--- wu-ftpd-orig/files/patch-ac	Thu Oct 18 08:40:03 2001
>+++ wu-ftpd/files/patch-ac	Wed Feb  6 06:35:29 2002
>@@ -1,42 +0,0 @@
>-*** 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
>diff -ruN wu-ftpd-orig/files/patch-ai wu-ftpd/files/patch-ai
>--- wu-ftpd-orig/files/patch-ai	Thu Oct 18 08:40:03 2001
>+++ wu-ftpd/files/patch-ai	Wed Feb  6 06:35:33 2002
>@@ -1,46 +0,0 @@
>---- 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
>diff -ruN wu-ftpd-orig/files/patch-ao wu-ftpd/files/patch-ao
>--- wu-ftpd-orig/files/patch-ao	Sat Oct 23 21:57:37 1999
>+++ wu-ftpd/files/patch-ao	Wed Dec 31 19:00:00 1969
>@@ -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 -ruN wu-ftpd-orig/files/patch-aq wu-ftpd/files/patch-aq
>--- wu-ftpd-orig/files/patch-aq	Wed Dec 31 19:00:00 1969
>+++ wu-ftpd/files/patch-aq	Tue Feb  5 23:05:16 2002
>@@ -0,0 +1,22 @@
>+--- 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
>diff -ruN wu-ftpd-orig/pkg-plist wu-ftpd/pkg-plist
>--- wu-ftpd-orig/pkg-plist	Sat Oct 23 21:57:37 1999
>+++ wu-ftpd/pkg-plist	Tue Feb  5 22:51:17 2002
>@@ -1,8 +1,9 @@
> bin/ftpcount
>-bin/ftprestart
>-bin/ftpshut
> bin/ftpwho
>-bin/privatepw
>+sbin/ckconfig
>+sbin/ftprestart
>+sbin/ftpshut
>+sbin/privatepw
> etc/ftpaccess.example
> etc/ftpconversions.example
> etc/ftpgroups.example
>diff -ruN wu-ftpd-orig/scripts/configure wu-ftpd/scripts/configure
>--- wu-ftpd-orig/scripts/configure	Sun Apr 27 17:48:55 1997
>+++ wu-ftpd/scripts/configure	Wed Dec 31 19:00:00 1969
>@@ -1,7 +0,0 @@
>-#!/bin/sh
>-#
>-# configure,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp
>-#
>-
>-mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
>-sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g

Actions: View | Diff

Attachments on bug 34660: 19517