upgrade to 2.6.0

Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>

7 files changed, 91 insertions, 85 deletions

diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa
deleted file mode 100644
index 0dd5a8079675..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
index b6acef879747..35b3ccb7dc76 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ab
+++ b/ftp/wu-ftpd+ipv6/files/patch-ab
@@ -1,6 +1,8 @@
---- 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	Mon Sep 20 06:21:11 1999
++++ makefiles/Makefile.fbs	Wed Oct 20 21:40:46 1999
+@@ -24,7 +24,9 @@
+ #
+ 
  DESTDIR=
 -PREFIX=		/usr/local
 +PREFIX?=        /usr/local
@@ -9,7 +11,7 @@
  
  BINDIR=		${DESTDIR}${PREFIX}/bin
  BINOWN=		bin
-@@ -27,12 +29,18 @@
+@@ -52,14 +54,20 @@
  	@if [ ! -e ${SBINDIR} ]; then \
  		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
  	fi
@@ -17,24 +19,26 @@
 -	@( 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 ${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 +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
@@ -44,12 +48,16 @@
 -	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
++#	@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
index 93749a1da79a..16fb41bc5a7a 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ac
+++ b/ftp/wu-ftpd+ipv6/files/patch-ac
@@ -1,40 +1,40 @@
-*** src/pathnames.h.bak	Mon Jan 20 06:21:45 1997
---- src/pathnames.h	Thu Jan 30 15:42:24 1997
+*** src/pathnames.h.orig	Wed Oct 20 20:27:34 1999
+--- src/pathnames.h	Wed Oct 20 20:30:19 1999
 ***************
-*** 45,54 ****
-  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
-  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
+*** 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"
+! #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
-  
---- 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
+! #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
-  
 ***************
-*** 109,115 ****
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+*** 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
---- 109,115 ----
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+--- 203,209 ----
+  #ifdef USE_OPT_FTPD
+  #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
   #else
 ! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
   #endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-al b/ftp/wu-ftpd+ipv6/files/patch-al
index 90c5246d7d57..40568f198e15 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-al
+++ b/ftp/wu-ftpd+ipv6/files/patch-al
@@ -1,19 +1,19 @@
-*** support/makefiles/Makefile.fbs.bak	Mon Mar  3 12:11:54 1997
---- support/makefiles/Makefile.fbs	Sun Apr 27 21:13:35 1997
+*** support/makefiles/Makefile.fbs.orig	Mon Oct  4 22:44:08 1999
+--- support/makefiles/Makefile.fbs	Wed Oct 20 20:32:42 1999
 ***************
-*** 8,14 ****
+*** 33,39 ****
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
-! CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
+! CFLAGS = -O ${IFLAGS} ${LFLAGS}
   
   SRCS   = strcasestr.c authuser.c ftw.c
   OBJS   = strcasestr.o authuser.o ftw.o
---- 8,14 ----
+--- 33,39 ----
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
-! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
+! 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
index 8868caab6178..5516dbd3ba1a 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-am
+++ b/ftp/wu-ftpd+ipv6/files/patch-am
@@ -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	Tue Aug 31 03:55:26 1999
++++ src/makefiles/Makefile.fbs	Wed Oct 20 20:34:07 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 --git a/ftp/wu-ftpd+ipv6/files/patch-an b/ftp/wu-ftpd+ipv6/files/patch-an
index fd66fed9bc31..09220f4bc9cf 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-an
+++ b/ftp/wu-ftpd+ipv6/files/patch-an
@@ -1,7 +1,7 @@
---- src/makefiles/common.bak	Thu Jan 28 20:04:59 1999
-+++ src/makefiles/common	Wed Feb 10 11:57:18 1999
-@@ -15,7 +15,11 @@
- 	${CC} ${LFLAGS} -o $@ ftpshut.o vers.o
+--- 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)
@@ -10,5 +10,5 @@
 +	${CC} -static ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
 +.endif
  
- ckconfig: ckconfig.o
- 	${CC} ${LFLAGS} -o $@ ckconfig.o
+ 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
new file mode 100644
index 000000000000..217918b048bd
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-ao
@@ -0,0 +1,17 @@
+--- 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''