From 0c76714e6b7a573cd55e6677f69b4d8101a1b7bc Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 10 Feb 1999 12:48:09 +0000
Subject: [PATCH] upgrade to vr13 to close security hole and lots of
 enhancements

---
 ftp/wu-ftpd+ipv6/Makefile       | 10 +++-----
 ftp/wu-ftpd+ipv6/distinfo       |  2 +-
 ftp/wu-ftpd+ipv6/files/patch-am | 44 +++++++++------------------------
 ftp/wu-ftpd+ipv6/files/patch-an | 14 +++++++++++
 ftp/wu-ftpd/Makefile            | 10 +++-----
 ftp/wu-ftpd/distinfo            |  2 +-
 ftp/wu-ftpd/files/patch-am      | 44 +++++++++------------------------
 ftp/wu-ftpd/files/patch-an      | 14 +++++++++++
 8 files changed, 60 insertions(+), 80 deletions(-)
 create mode 100644 ftp/wu-ftpd+ipv6/files/patch-an
 create mode 100644 ftp/wu-ftpd/files/patch-an

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 051fbad23d8e..d06c4f0f0557 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -3,17 +3,15 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.18 1998/07/22 10:14:12 ache Exp $
+# $Id: Makefile,v 1.19 1999/01/13 03:37:28 scrappy Exp $
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2-beta-18
-PKGNAME=        wu-ftpd-2.4.2b18
+DISTNAME=       wu-ftpd-2.4.2-beta-18-vr13
+PKGNAME=        wu-ftpd-2.4.2b18vr13
 CATEGORIES=	net
-# AUSCERT recommendation
-MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=   ftp://ftp.vr.net/pub/wu-ftpd/
 
 do-build:
 	cd ${WRKSRC} && ./build fbs
diff --git a/ftp/wu-ftpd+ipv6/distinfo b/ftp/wu-ftpd+ipv6/distinfo
index 4cbfebb74393..cb6e434182dd 100644
--- a/ftp/wu-ftpd+ipv6/distinfo
+++ b/ftp/wu-ftpd+ipv6/distinfo
@@ -1 +1 @@
-MD5 (wu-ftpd-2.4.2-beta-18.tar.Z) = b320d7872ba807c04f1b677595f28d86
+MD5 (wu-ftpd-2.4.2-beta-18-vr13.tar.gz) = 20de666ba0e772402c1909b404ee4cc0
diff --git a/ftp/wu-ftpd+ipv6/files/patch-am b/ftp/wu-ftpd+ipv6/files/patch-am
index 04297b0bb716..8868caab6178 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-am
+++ b/ftp/wu-ftpd+ipv6/files/patch-am
@@ -1,33 +1,11 @@
-*** src/makefiles/Makefile.fbs.orig	Sun Dec 21 07:04:49 1997
---- src/makefiles/Makefile.fbs	Wed Dec 24 20:26:01 1997
-***************
-*** 4,10 ****
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
---- 4,10 ----
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   += ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
-***************
-*** 27,33 ****
---- 27,37 ----
-  	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
-  
-  ftpd: ${OBJS} ${LIBC}
-+ .if defined(PACKAGE_BUILDING)
-  	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .else
-+ 	${CC} -static ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .endif
-  
-  ckconfig:   ckconfig.c
-  	${CC} ${CFLAGS} -o $@ ckconfig.c
+--- 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 @@
+ #CC       = cc
+ IFLAGS   = -I.. -I../support
+ LFLAGS   = -L../support -s
+-CFLAGS   = -O ${IFLAGS} ${LFLAGS}
++CFLAGS   += ${IFLAGS} ${LFLAGS}
+ 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
new file mode 100644
index 000000000000..fd66fed9bc31
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-an
@@ -0,0 +1,14 @@
+--- 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
+ 
+ ftpd: ${OBJS} ${XOBJS} ../support/libsupport.a
++.if defined(PACKAGE_BUILDING)
+ 	${CC} ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
++.else
++	${CC} -static ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
++.endif
+ 
+ ckconfig: ckconfig.o
+ 	${CC} ${LFLAGS} -o $@ ckconfig.o
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 051fbad23d8e..d06c4f0f0557 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -3,17 +3,15 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.18 1998/07/22 10:14:12 ache Exp $
+# $Id: Makefile,v 1.19 1999/01/13 03:37:28 scrappy Exp $
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2-beta-18
-PKGNAME=        wu-ftpd-2.4.2b18
+DISTNAME=       wu-ftpd-2.4.2-beta-18-vr13
+PKGNAME=        wu-ftpd-2.4.2b18vr13
 CATEGORIES=	net
-# AUSCERT recommendation
-MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=   ftp://ftp.vr.net/pub/wu-ftpd/
 
 do-build:
 	cd ${WRKSRC} && ./build fbs
diff --git a/ftp/wu-ftpd/distinfo b/ftp/wu-ftpd/distinfo
index 4cbfebb74393..cb6e434182dd 100644
--- a/ftp/wu-ftpd/distinfo
+++ b/ftp/wu-ftpd/distinfo
@@ -1 +1 @@
-MD5 (wu-ftpd-2.4.2-beta-18.tar.Z) = b320d7872ba807c04f1b677595f28d86
+MD5 (wu-ftpd-2.4.2-beta-18-vr13.tar.gz) = 20de666ba0e772402c1909b404ee4cc0
diff --git a/ftp/wu-ftpd/files/patch-am b/ftp/wu-ftpd/files/patch-am
index 04297b0bb716..8868caab6178 100644
--- a/ftp/wu-ftpd/files/patch-am
+++ b/ftp/wu-ftpd/files/patch-am
@@ -1,33 +1,11 @@
-*** src/makefiles/Makefile.fbs.orig	Sun Dec 21 07:04:49 1997
---- src/makefiles/Makefile.fbs	Wed Dec 24 20:26:01 1997
-***************
-*** 4,10 ****
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
---- 4,10 ----
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   += ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
-***************
-*** 27,33 ****
---- 27,37 ----
-  	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
-  
-  ftpd: ${OBJS} ${LIBC}
-+ .if defined(PACKAGE_BUILDING)
-  	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .else
-+ 	${CC} -static ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .endif
-  
-  ckconfig:   ckconfig.c
-  	${CC} ${CFLAGS} -o $@ ckconfig.c
+--- 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 @@
+ #CC       = cc
+ IFLAGS   = -I.. -I../support
+ LFLAGS   = -L../support -s
+-CFLAGS   = -O ${IFLAGS} ${LFLAGS}
++CFLAGS   += ${IFLAGS} ${LFLAGS}
+ XOBJS    = 
+ LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
+ LIBC     = /usr/lib/libc.a
diff --git a/ftp/wu-ftpd/files/patch-an b/ftp/wu-ftpd/files/patch-an
new file mode 100644
index 000000000000..fd66fed9bc31
--- /dev/null
+++ b/ftp/wu-ftpd/files/patch-an
@@ -0,0 +1,14 @@
+--- 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
+ 
+ ftpd: ${OBJS} ${XOBJS} ../support/libsupport.a
++.if defined(PACKAGE_BUILDING)
+ 	${CC} ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
++.else
++	${CC} -static ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
++.endif
+ 
+ ckconfig: ckconfig.o
+ 	${CC} ${LFLAGS} -o $@ ckconfig.o