Enabling anonymous ftp in proftpd can be confusing with the average setup

PR:		ports/6982
Submitted by:	Bill Fumerola <billf@chc-chimes.com>

4 files changed, 22 insertions, 10 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 22bb57035cae..b9b34461947a 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 January 1998
 # Whom:			Stephane Legrand
 #
-# $Id: Makefile,v 1.2 1998/02/20 06:39:07 obrien Exp $
+# $Id: Makefile,v 1.3 1998/06/14 15:56:40 steve Exp $
 #
 
 DISTNAME=	proftpd-1.0.3pl1
@@ -18,7 +18,6 @@ MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
 #
 # - "configure --prefix=..." doesn't seem to work :(
diff --git a/ftp/proftpd-devel/files/patch-aa b/ftp/proftpd-devel/files/patch-aa
index 184a3e6225f3..75d35a32ef25 100644
--- a/ftp/proftpd-devel/files/patch-aa
+++ b/ftp/proftpd-devel/files/patch-aa
@@ -1,5 +1,5 @@
---- sample-configurations/basic.conf.orig	Tue Nov 18 02:23:12 1997
-+++ sample-configurations/basic.conf	Mon Jan 26 22:45:53 1998
+--- sample-configurations/basic.conf.orig	Sun Mar  1 21:51:51 1998
++++ sample-configurations/basic.conf	Wed Jul  1 19:04:28 1998
 @@ -1,3 +1,8 @@
 +#
 +# To have more informations about Proftpd configuration
@@ -9,7 +9,7 @@
  # This is a basic ProFTPD configuration file (rename it to 
  # 'proftpd.conf' for actual use.  It establishes a single server
  # and a single anonymous login.  It assumes that you have a user/group
-@@ -23,24 +28,31 @@
+@@ -23,24 +28,38 @@
    AllowOverwrite		on
  </Directory>
  
@@ -50,6 +50,13 @@
 +  ### Limit the maximum number of anonymous logins
 +  # MaxClients			10
 +
++  ### It is wise when making an 'ftp' user that you either block its
++  ### ability to login either via /etc/login.access or my giving it
++  ### an invalid shell.
++  ### Uncomment this if the 'ftp' user you made has an invalid shell
++
++  # RequireValidShell		off
++
 +  ### We want 'welcome.msg' displayed at login, and '.message' displayed
 +  ### in each newly chdired directory.
 +  # DisplayLogin			welcome.msg
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 22bb57035cae..b9b34461947a 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 January 1998
 # Whom:			Stephane Legrand
 #
-# $Id: Makefile,v 1.2 1998/02/20 06:39:07 obrien Exp $
+# $Id: Makefile,v 1.3 1998/06/14 15:56:40 steve Exp $
 #
 
 DISTNAME=	proftpd-1.0.3pl1
@@ -18,7 +18,6 @@ MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
 #
 # - "configure --prefix=..." doesn't seem to work :(
diff --git a/ftp/proftpd/files/patch-aa b/ftp/proftpd/files/patch-aa
index 184a3e6225f3..75d35a32ef25 100644
--- a/ftp/proftpd/files/patch-aa
+++ b/ftp/proftpd/files/patch-aa
@@ -1,5 +1,5 @@
---- sample-configurations/basic.conf.orig	Tue Nov 18 02:23:12 1997
-+++ sample-configurations/basic.conf	Mon Jan 26 22:45:53 1998
+--- sample-configurations/basic.conf.orig	Sun Mar  1 21:51:51 1998
++++ sample-configurations/basic.conf	Wed Jul  1 19:04:28 1998
 @@ -1,3 +1,8 @@
 +#
 +# To have more informations about Proftpd configuration
@@ -9,7 +9,7 @@
  # This is a basic ProFTPD configuration file (rename it to 
  # 'proftpd.conf' for actual use.  It establishes a single server
  # and a single anonymous login.  It assumes that you have a user/group
-@@ -23,24 +28,31 @@
+@@ -23,24 +28,38 @@
    AllowOverwrite		on
  </Directory>
  
@@ -50,6 +50,13 @@
 +  ### Limit the maximum number of anonymous logins
 +  # MaxClients			10
 +
++  ### It is wise when making an 'ftp' user that you either block its
++  ### ability to login either via /etc/login.access or my giving it
++  ### an invalid shell.
++  ### Uncomment this if the 'ftp' user you made has an invalid shell
++
++  # RequireValidShell		off
++
 +  ### We want 'welcome.msg' displayed at login, and '.message' displayed
 +  ### in each newly chdired directory.
 +  # DisplayLogin			welcome.msg