This commit was manufactured by cvs2svn to create tag 'RELEASE_3_2_0'.release/3.2.0

3 files changed, 0 insertions, 139 deletions

diff --git a/ftp/proftpd-devel/files/patch-aa b/ftp/proftpd-devel/files/patch-aa
deleted file mode 100644
index 75d35a32ef25..000000000000
--- a/ftp/proftpd-devel/files/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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
-+# look at : http://www.proftpd.org/
-+#
-+
- # 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,38 @@
-   AllowOverwrite		on
- </Directory>
- 
--# A basic anonymous configuration, no upload directories.
--<Anonymous ~ftp>
--  User				ftp
--  Group				ftp
--  # We want clients to be able to login with "anonymous" as well as "ftp"
--  UserAlias			anonymous ftp
--
--  # Limit the maximum number of anonymous logins
--  MaxClients			10
--
--  # We want 'welcome.msg' displayed at login, and '.message' displayed
--  # in each newly chdired directory.
--  DisplayLogin			welcome.msg
--  DisplayFirstChdir		.message
--
--  # Limit WRITE everywhere in the anonymous chroot
--  <Limit WRITE>
--    DenyAll
--  </Limit>
- 
--</Anonymous>
-+#########################################################################
-+#									#
-+# Uncomment lines with only one # to allow basic anonymous access	#
-+#									#
-+#########################################################################
-+
-+### A basic anonymous configuration, no upload directories.
-+# <Anonymous ~ftp>
-+#  User				ftp
-+#  Group				ftp
-+  ### We want clients to be able to login with "anonymous" as well as "ftp"
-+  # UserAlias			anonymous ftp
-+
-+  ### 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
-+  # DisplayFirstChdir		.message
-+
-+  ### Limit WRITE everywhere in the anonymous chroot
-+  # <Limit WRITE>
-+  #  DenyAll
-+  # </Limit>
-+
-+# </Anonymous>
diff --git a/ftp/proftpd-devel/files/patch-ae b/ftp/proftpd-devel/files/patch-ae
deleted file mode 100644
index b7525289a45a..000000000000
--- a/ftp/proftpd-devel/files/patch-ae
+++ /dev/null
@@ -1,54 +0,0 @@
---- modules/mod_auth.c.orig	Thu Mar  4 18:29:19 1999
-+++ modules/mod_auth.c	Thu Apr  1 14:36:03 1999
-@@ -65,7 +65,7 @@
-   /* Is this the proper behavior when timing out? */
-   send_response_async(R_421,"Login Timeout (%d seconds): closing control connection.",
-                       TimeoutLogin);
--  main_exit((void*)LOG_NOTICE,"FTP login timed out, disconnected.",
-+  main_exit((void*)LOG_INFO,"FTP login timed out, disconnected.",
- 		  (void*)0,NULL);
- 
- /*
-@@ -787,13 +787,13 @@
-     resolve_anonymous_dirs(c->subset);
- 
-   if(c)
--    log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s] to %s:%i",
-+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s] to %s:%i",
-       origuser,session.c->remote_name,
-       inet_ascii(p,session.c->remote_ipaddr),
-       inet_ascii(p,session.c->local_ipaddr),
-       session.c->local_port);
-   else
--    log_auth(LOG_NOTICE,"FTP login as '%s' from %s [%s] to %s:%i",
-+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s] to %s:%i",
-       origuser,session.c->remote_name,
-       inet_ascii(p,session.c->remote_ipaddr),
-       inet_ascii(p,session.c->local_ipaddr),
-@@ -1156,7 +1156,7 @@
-       send_response(R_530,"%s",
-                     sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
- 
--      log_auth(LOG_NOTICE,"connection refused (max clients per host %d)",
-+      log_auth(LOG_INFO,"connection refused (max clients per host %d)",
-                max);
-       end_login(0);
-     }
-@@ -1180,7 +1180,7 @@
-       send_response(R_530,"%s",
-                     sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
- 
--      log_auth(LOG_NOTICE,"connection refused (max clients %d)",
-+      log_auth(LOG_INFO,"connection refused (max clients %d)",
-                max);
-       end_login(0);
-     }
-@@ -1267,7 +1267,7 @@
- 
-     if(++auth_tries >= max) {
-       send_response(R_530,"Login incorrect");
--      log_auth(LOG_NOTICE,"Maximum login attempts exceeded from %s [%s] to %s:%i",
-+      log_auth(LOG_INFO,"Maximum login attempts exceeded from %s [%s] to %s:%i",
-                session.c->remote_name,
-                inet_ascii(cmd->tmp_pool,session.c->remote_ipaddr),
- 	       inet_ascii(cmd->tmp_pool,session.c->local_ipaddr),
diff --git a/ftp/proftpd-devel/files/patch-af b/ftp/proftpd-devel/files/patch-af
deleted file mode 100644
index 210e630b9553..000000000000
--- a/ftp/proftpd-devel/files/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/proftpd.8.orig	Sun Feb 21 16:26:21 1999
-+++ src/proftpd.8	Sun Feb 21 16:28:31 1999
-@@ -21,6 +21,12 @@
- may be invoked by the Internet "super-server" inetd(8) each time a
- connection to the FTP service is made, or alternatively it can be run as a
- stand-alone daemon.
-+.br
-+.PP
-+Each successful and failed ftp(1) session is logged using syslog with a
-+facility of LOG_FTP.  Note: LOG_FTP messages are not displayed
-+by syslogd(8) by default, and may have to be enabled in syslogd(8)'s 
-+configuration file.
- 
- When
- .B proftpd