Attachment 6317 Details for Bug 14434 – file.diff

[patch] file.diff

file.diff (text/plain), 12.33 KB, created by Ying-Chieh Liao on 1999-10-20 18:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ying-Chieh Liao

Created: 1999-10-20 18:40:01 UTC

Size: 12.33 KB

patch

obsolete

>diff -ruN /usr/ports/ftp/wu-ftpd/Makefile wu-ftpd/Makefile
>--- /usr/ports/ftp/wu-ftpd/Makefile	Sat Sep  4 01:27:24 1999
>+++ wu-ftpd/Makefile	Thu Oct 21 01:34:44 1999
>@@ -8,25 +8,19 @@
> # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
> # it is changed from previous versions
> 
>-DISTNAME=       wu-ftpd-2.5.0
>+DISTNAME=       wu-ftpd-2.6.0
> CATEGORIES=	ftp
>-MASTER_SITES=   ftp://ftp.vr.net/pub/wu-ftpd/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
>+MASTER_SITES=   ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
> 
> 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
>+MAN8=		ftpd.8 ftpshut.8 privatepw.8 ftprestart.8
> 
> do-build:
> 	cd ${WRKSRC} && ./build fbs
>diff -ruN /usr/ports/ftp/wu-ftpd/files/md5 wu-ftpd/files/md5
>--- /usr/ports/ftp/wu-ftpd/files/md5	Sat Sep  4 01:27:31 1999
>+++ wu-ftpd/files/md5	Thu Oct 21 01:01:36 1999
>@@ -1,6 +1 @@
>-MD5 (wu-ftpd-2.5.0.tar.gz) = 98f9c8490e0d1ca2c3c57e60e65803b7
>-MD5 (data-limit.patch) = 1a3868e8533ab13c88ec572fff55957a
>-MD5 (deny.not.nameserved.patch) = 5f5158c26caa9db10c02e92b258c5a1f
>-MD5 (mapped.path.overrun.patch) = b01b65652eb3816f0ab11971ac52424d
>-MD5 (not.in.class.patch) = 5f1eb9b3c8ab07c3005c5cb7c1c6091c
>-MD5 (rfc931.timeout.patch) = 0eae85226fb40f4d717693472de19c46
>+MD5 (wu-ftpd-2.6.0.tar.gz) = 652cfe4b59e0468eded736e7c281d16f
>diff -ruN /usr/ports/ftp/wu-ftpd/patches/patch-aa wu-ftpd/patches/patch-aa
>--- /usr/ports/ftp/wu-ftpd/patches/patch-aa	Thu Dec 25 01:45:43 1997
>+++ wu-ftpd/patches/patch-aa	Thu Oct 21 01:04:18 1999
>@@ -1,19 +1,11 @@
>-*** src/config/config.fbs.bak	Fri Dec 12 18:17:19 1997
>---- src/config/config.fbs	Wed Dec 24 20:39:50 1997
>-***************
>-*** 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
>---- 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
>+--- 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
>diff -ruN /usr/ports/ftp/wu-ftpd/patches/patch-ab wu-ftpd/patches/patch-ab
>--- /usr/ports/ftp/wu-ftpd/patches/patch-ab	Wed Apr  7 19:08:53 1999
>+++ wu-ftpd/patches/patch-ab	Thu Oct 21 01:11:39 1999
>@@ -1,15 +1,17 @@
>---- makefiles/Makefile.fbs.orig	Tue Mar 30 05:31:40 1999
>-+++ makefiles/Makefile.fbs	Wed Apr  7 14:58:44 1999
>-@@ -1,5 +1,7 @@
>+--- 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
>++PREFIX?=		/usr/local
> +
>-+ETCDIR=         ${DESTDIR}${PREFIX}/etc
>++ETCDIR=		${DESTDIR}${PREFIX}/etc
>  
>  BINDIR=		${DESTDIR}${PREFIX}/bin
>  BINOWN=		bin
>-@@ -27,12 +29,18 @@
>+@@ -52,14 +54,17 @@
>  	@if [ ! -e ${SBINDIR} ]; then \
>  		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
>  	fi
>@@ -17,24 +19,23 @@
> -	@( 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 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
>+ 	${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 ; \
>-@@ -51,12 +59,12 @@
>- 	fi
>- 	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpd.8           ${MANDIR}/man8/ftpd.8
>+@@ -80,14 +85,3 @@
>  	${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
>@@ -44,12 +45,5 @@
> -	gzip -f -9 ${MANDIR}/man5/xferlog.5
> -	gzip -f -9 ${MANDIR}/man8/ftpd.8
> -	gzip -f -9 ${MANDIR}/man8/ftpshut.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 -ruN /usr/ports/ftp/wu-ftpd/patches/patch-ac wu-ftpd/patches/patch-ac
>--- /usr/ports/ftp/wu-ftpd/patches/patch-ac	Fri Jan 31 01:00:45 1997
>+++ wu-ftpd/patches/patch-ac	Thu Jan  1 08:00:00 1970
>@@ -1,42 +0,0 @@
>-*** 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
>diff -ruN /usr/ports/ftp/wu-ftpd/patches/patch-ai wu-ftpd/patches/patch-ai
>--- /usr/ports/ftp/wu-ftpd/patches/patch-ai	Tue Mar  9 21:54:45 1999
>+++ wu-ftpd/patches/patch-ai	Thu Oct 21 01:21:05 1999
>@@ -1,6 +1,6 @@
>---- config.h.orig	Thu Mar  4 09:45:57 1999
>-+++ config.h	Tue Mar  9 16:33:39 1999
>-@@ -74,7 +74,7 @@
>+--- 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.
>   */
>  
>@@ -9,21 +9,12 @@
>  
>  /*
>   * OPIE
>-@@ -203,7 +203,7 @@
>-  * Undefine this to let NOOP reset the idle timeout.
>+@@ -131,7 +131,7 @@
>+  * the logging at the cost of a possible slight delay in connection.
>   */
>- 
>--#define IGNORE_NOOP
>-+#undef IGNORE_NOOP
>- 
>- /*
>-  * 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
>- 
>+ #undef USE_RFC931
>+-
>++ 
>  /*
>-  * Define this to completely disable anonymous FTP access.
>+  * BUFFER_SIZE
>+  * You can specify the buffer size for binary transfers; the defaults
>diff -ruN /usr/ports/ftp/wu-ftpd/patches/patch-al wu-ftpd/patches/patch-al
>--- /usr/ports/ftp/wu-ftpd/patches/patch-al	Mon Apr 28 05:48:53 1997
>+++ wu-ftpd/patches/patch-al	Thu Oct 21 01:23:45 1999
>@@ -1,19 +1,11 @@
>-*** support/makefiles/Makefile.fbs.bak	Mon Mar  3 12:11:54 1997
>---- support/makefiles/Makefile.fbs	Sun Apr 27 21:13:35 1997
>-***************
>-*** 8,14 ****
>-  LIBC   = /usr/lib/libc.a
>-  IFLAGS = 
>-  LFLAGS = 
>-! CFLAGS = -O ${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
>+--- 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
>diff -ruN /usr/ports/ftp/wu-ftpd/patches/patch-am wu-ftpd/patches/patch-am
>--- /usr/ports/ftp/wu-ftpd/patches/patch-am	Wed Feb 10 20:48:09 1999
>+++ wu-ftpd/patches/patch-am	Thu Oct 21 01:27:56 1999
>@@ -1,11 +1,11 @@
>---- src/makefiles/Makefile.fbs.orig	Sat Oct 31 18:58:15 1998
>-+++ src/makefiles/Makefile.fbs	Wed Feb 10 11:54:57 1999
>-@@ -4,7 +4,7 @@
>+--- src/makefiles/Makefile.fbs.orig	Thu Oct 21 01:26:35 1999
>++++ src/makefiles/Makefile.fbs	Thu Oct 21 01:27:24 1999
>+@@ -30,7 +30,7 @@
>  #CC       = cc
>  IFLAGS   = -I.. -I../support
>  LFLAGS   = -L../support -s
>--CFLAGS   = -O ${IFLAGS} ${LFLAGS}
>-+CFLAGS   += ${IFLAGS} ${LFLAGS}
>+-CFLAGS   = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
>++CFLAGS   += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
>  XOBJS    = 
>  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
>  LIBC     = /usr/lib/libc.a
>diff -ruN /usr/ports/ftp/wu-ftpd/pkg/PLIST wu-ftpd/pkg/PLIST
>--- /usr/ports/ftp/wu-ftpd/pkg/PLIST	Mon May  3 22:36:23 1999
>+++ wu-ftpd/pkg/PLIST	Thu Oct 21 01:33:40 1999
>@@ -1,6 +1,8 @@
> bin/ftpcount
> bin/ftpshut
> bin/ftpwho
>+bin/ftprestart
>+bin/privatepw
> etc/ftpaccess.example
> etc/ftpconversions.example
> etc/ftpgroups.example
>diff -ruN /usr/ports/ftp/wu-ftpd/scripts/configure wu-ftpd/scripts/configure
>--- /usr/ports/ftp/wu-ftpd/scripts/configure	Mon Apr 28 05:48:55 1997
>+++ wu-ftpd/scripts/configure	Thu Jan  1 08:00:00 1970
>@@ -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 14434: 6317