From 26b76994ea3bd567eea4ff24d2ff866f9b1154d7 Mon Sep 17 00:00:00 2001 From: Michael Haro Date: Thu, 29 Mar 2001 19:56:45 +0000 Subject: update to 1.2.2rc1 - this version fixes the DOS bug in 1.2.1 --- ftp/proftpd-devel/Makefile | 4 +- ftp/proftpd-devel/distinfo | 3 +- ftp/proftpd-devel/files/patch-ae | 187 --------------------------------------- 3 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 ftp/proftpd-devel/files/patch-ae (limited to 'ftp/proftpd-devel') diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index da97d80367c4..a121b4c6445b 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= proftpd -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2rc1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.stikman.com/pub/proftpd/source/ \ @@ -15,8 +15,6 @@ MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ MAINTAINER= mharo@FreeBSD.org -FORBIDDEN= "Security vulnerability - check back in a few days" - .if defined(WITH_LDAP) MASTER_SITES+= http://www.horde.net/~jwm/software/proftpd-ldap/ MOD_LDAP= mod_ldap-2.7.4.tar.bz2 diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo index da3b8dc459c4..0092fb747ffd 100644 --- a/ftp/proftpd-devel/distinfo +++ b/ftp/proftpd-devel/distinfo @@ -1,2 +1 @@ -MD5 (proftpd-1.2.1.tar.bz2) = 0ca3b3c10d2a87a4c3f72a4f76df6a89 -MD5 (mod_ldap-2.7.4.tar.bz2) = 647efb6abffeb3f63b86e8cd76cd9df2 +MD5 (proftpd-1.2.2rc1.tar.bz2) = c43a62b2b5fac287041a8a8756bb6c49 diff --git a/ftp/proftpd-devel/files/patch-ae b/ftp/proftpd-devel/files/patch-ae deleted file mode 100644 index a6ea69730163..000000000000 --- a/ftp/proftpd-devel/files/patch-ae +++ /dev/null @@ -1,187 +0,0 @@ ---- modules/mod_auth.c.old Sun Mar 4 15:14:21 2001 -+++ modules/mod_auth.c Sun Mar 4 15:15:29 2001 -@@ -92,7 +92,7 @@ - "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); - - /* should never be reached */ -@@ -518,7 +518,7 @@ - c = _auth_resolve_user(p,&user,&ourname,&anonname); - - if(!user) { -- log_pri(LOG_NOTICE, "USER %s (Login failed): User not a UserAlias.", -+ log_pri(LOG_INFO, "USER %s (Login failed): User not a UserAlias.", - origuser); - goto auth_failure; - } -@@ -527,7 +527,7 @@ - aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i); - - if((pw = auth_getpwnam(p,user)) == NULL) { -- log_pri(LOG_NOTICE, "USER %s (Login failed): Can't find user.", user); -+ log_pri(LOG_INFO, "USER %s (Login failed): Can't find user.", user); - goto auth_failure; - } - -@@ -595,14 +595,14 @@ - } - - if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){ -- log_auth(LOG_NOTICE, "ANON %s (Login failed): Limit access denies " -+ log_auth(LOG_INFO, "ANON %s (Login failed): Limit access denies " - "login.", origuser); - goto auth_failure; - } - } - - if(!c && !aclp) { -- log_auth(LOG_NOTICE, "USER %s (Login failed): Limit access denies login.", -+ log_auth(LOG_INFO, "USER %s (Login failed): Limit access denies login.", - origuser); - goto auth_failure; - } -@@ -619,7 +619,7 @@ - if(c && origuser && strcasecmp(user,origuser) && - get_param_int(c->subset,"AuthUsingAlias",FALSE) == 1) { - user_name = origuser; -- log_auth(LOG_NOTICE, "ANON AUTH: User %s, Auth Alias %s", -+ log_auth(LOG_INFO, "ANON AUTH: User %s, Auth Alias %s", - user, user_name); - } - -@@ -647,22 +647,22 @@ - - switch(authcode) { - case AUTH_NOPWD: -- log_auth(LOG_NOTICE, "USER %s (Login failed): No such user found.", -+ log_auth(LOG_INFO, "USER %s (Login failed): No such user found.", - user); - goto auth_failure; - - case AUTH_BADPWD: -- log_auth(LOG_NOTICE, "USER %s (Login failed): Incorrect password.", -+ log_auth(LOG_INFO, "USER %s (Login failed): Incorrect password.", - origuser); - goto auth_failure; - - case AUTH_AGEPWD: -- log_auth(LOG_NOTICE, "USER %s (Login failed): Password expired.", -+ log_auth(LOG_INFO, "USER %s (Login failed): Password expired.", - user); - goto auth_failure; - - case AUTH_DISABLEDPWD: -- log_auth(LOG_NOTICE, "USER %s (Login failed): Account disabled.", -+ log_auth(LOG_INFO, "USER %s (Login failed): Account disabled.", - user); - goto auth_failure; - -@@ -685,12 +685,12 @@ - auth_setgrent(p); - - if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) { -- log_auth(LOG_NOTICE, "USER %s (Login failed): Invalid shell.", user); -+ log_auth(LOG_INFO, "USER %s (Login failed): Invalid shell.", user); - goto auth_failure; - } - - if(!_auth_check_ftpusers((c ? c->subset : main_server->conf),pw->pw_name)) { -- log_auth(LOG_NOTICE, "USER %s (Login failed): User in %s.", -+ log_auth(LOG_INFO, "USER %s (Login failed): User in %s.", - user, FTPUSERS_PATH); - goto auth_failure; - } -@@ -819,7 +819,7 @@ - - if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i)) - { -- log_auth(LOG_NOTICE, "%s %s: Limit access denies login.", -+ log_auth(LOG_INFO, "%s %s: Limit access denies login.", - (c != NULL) ? "ANON" : "USER", origuser); - goto auth_failure; - } -@@ -834,7 +834,7 @@ - if(c && c->subset) - resolve_anonymous_dirs(c->subset); - -- log_auth(LOG_NOTICE, "%s %s: Login successful.", -+ log_auth(LOG_INFO, "%s %s: Login successful.", - (c != NULL) ? "ANON" : "USER", - origuser); - -@@ -1229,7 +1229,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- log_auth(LOG_NOTICE, "Connection refused (max clients for class %s).", -+ log_auth(LOG_INFO, "Connection refused (max clients for class %s).", - session.class->name); - - end_login(0); -@@ -1261,7 +1261,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- 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); -@@ -1286,7 +1286,7 @@ - send_response(R_530, "%s", - sreplace(cmd->tmp_pool, maxstr, "%m", maxn, NULL)); - -- log_auth(LOG_NOTICE, "Connection refused (max clients %d).", max); -+ log_auth(LOG_INFO, "Connection refused (max clients %d).", max); - - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); -@@ -1316,7 +1316,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- 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); -@@ -1363,7 +1363,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- log_pri(LOG_NOTICE, "USER %s (Login failed): Not a UserAlias.", -+ log_pri(LOG_INFO, "USER %s (Login failed): Not a UserAlias.", - origuser); - send_response(R_530,"Login incorrect."); - -@@ -1384,7 +1384,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- log_auth(LOG_NOTICE, "ANON %s: Limit access denies login.", -+ log_auth(LOG_INFO, "ANON %s: Limit access denies login.", - origuser); - send_response(R_530, "Login incorrect."); - -@@ -1396,7 +1396,7 @@ - remove_config(cmd->server->conf, C_USER, FALSE); - remove_config(cmd->server->conf, C_PASS, FALSE); - -- log_auth(LOG_NOTICE, "USER %s: Limit access denies login.", origuser); -+ log_auth(LOG_INFO, "USER %s: Limit access denies login.", origuser); - send_response(R_530, "Login incorrect."); - - end_login(0); -@@ -1490,7 +1490,7 @@ - - if(++auth_tries >= max) { - send_response(R_530,"Login incorrect"); -- log_auth(LOG_NOTICE, "Maximum login attempts exceeded."); -+ log_auth(LOG_INFO, "Maximum login attempts exceeded."); - end_login(0); - } - -- cgit v1.2.3