From d8e34e4d47e046901cd29097b4771c992581d922 Mon Sep 17 00:00:00 2001 From: Michael Haro Date: Sun, 5 Dec 1999 19:29:55 +0000 Subject: update to 1.2.0p9 --- ftp/proftpd-devel/Makefile | 18 ++-- ftp/proftpd-devel/distinfo | 2 +- ftp/proftpd-devel/files/patch-aa | 2 +- ftp/proftpd-devel/files/patch-ae | 201 ++++++++++++++++++++++++++++++++------- ftp/proftpd-devel/files/patch-ah | 6 +- ftp/proftpd-devel/pkg-descr | 3 +- 6 files changed, 183 insertions(+), 49 deletions(-) (limited to 'ftp/proftpd-devel') diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index efcef5e82098..18a69ccc8699 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: proftpd -# Version required: 1.2.0pl8 +# Version required: 1.2.0pl9 # Date created: 26 January 1998 # Whom: Stephane Legrand # # $FreeBSD$ # -DISTNAME= proftpd-1.2.0pre8 -PKGNAME= proftpd-1.2.0p8 +DISTNAME= proftpd-1.2.0pre9 +PKGNAME= proftpd-1.2.0p9 CATEGORIES= ftp MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/ @@ -20,8 +20,14 @@ MAN8= proftpd.8 ftpshut.8 USE_GMAKE= yes USE_AUTOCONF= yes -CONFIGURE_ARGS= --localstatedir=/var/run \ - --with-modules=mod_ratio +CONFIGURE_ARGS= --localstatedir=/var/run + +MODULES?= mod_ratio + +CONFIGURE_ARGS+= --with-modules=${MODULES} + +pre-configure: + @${ECHO_MSG} "==> Configuring with ${MODULES}" post-configure: @${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed @@ -42,7 +48,7 @@ post-configure: do-install: @${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount - @(cd ${PREFIX}/bin && ${LN} -s ftpcount ftpwho) + @${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin/ftpwho @${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd @${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut @${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1 diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo index 657002f355d5..ed01773d1321 100644 --- a/ftp/proftpd-devel/distinfo +++ b/ftp/proftpd-devel/distinfo @@ -1 +1 @@ -MD5 (proftpd-1.2.0pre8.tar.gz) = f6d7934d6edbffb518e9639e124cfd5b +MD5 (proftpd-1.2.0pre9.tar.gz) = 0ad6feb4b59b29240632b77ffc303b14 diff --git a/ftp/proftpd-devel/files/patch-aa b/ftp/proftpd-devel/files/patch-aa index 75d35a32ef25..d9342969ff2c 100644 --- a/ftp/proftpd-devel/files/patch-aa +++ b/ftp/proftpd-devel/files/patch-aa @@ -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,38 @@ +@@ -30,24 +35,38 @@ AllowOverwrite on diff --git a/ftp/proftpd-devel/files/patch-ae b/ftp/proftpd-devel/files/patch-ae index b7525289a45a..406fcb1166c9 100644 --- a/ftp/proftpd-devel/files/patch-ae +++ b/ftp/proftpd-devel/files/patch-ae @@ -1,54 +1,181 @@ ---- 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.", +--- modules/mod_auth.c.orig Fri Oct 22 22:18:49 1999 ++++ modules/mod_auth.c Sun Dec 5 11:22:46 1999 +@@ -70,7 +70,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); + +- 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 */ +@@ -541,7 +541,7 @@ + c = _auth_resolve_user(p,&user,&ourname,&anonname); - /* -@@ -787,13 +787,13 @@ + 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; + } +@@ -550,7 +550,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; + } + +@@ -607,14 +607,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; + } +@@ -628,7 +628,7 @@ + /* if 'AuthUsingAlias' set and logging in under an alias then auth using that alias */ + if (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",user,user_name); ++ log_auth(LOG_INFO,"ANON AUTH: User %s, Auth Alias %s",user,user_name); + } + + if(c) +@@ -655,22 +655,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; + +@@ -693,12 +693,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.", FTPUSERS_PATH); ++ log_auth(LOG_INFO, "USER %s (Login failed): User in %s.", FTPUSERS_PATH); + goto auth_failure; + } + +@@ -769,7 +769,7 @@ + + if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i)) + { +- log_auth(LOG_NOTICE, "%s: Limit access denies login (DenyGroup).", ++ log_auth(LOG_INFO, "%s: Limit access denies login (DenyGroup).", + origuser); + goto auth_failure; + } +@@ -784,9 +784,9 @@ 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); +- log_auth(LOG_NOTICE, "ANON %s: Login successful.", origuser); ++ log_auth(LOG_INFO, "ANON %s: Login successful.", origuser); 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,"USER %s: Login successful.", origuser); ++ log_auth(LOG_INFO,"USER %s: Login successful.", origuser); -- log_auth(LOG_NOTICE,"connection refused (max clients per host %d)", -+ log_auth(LOG_INFO,"connection refused (max clients per host %d)", - max); + /* Write the login to wtmp. This must be done here because we won't + * have access after we give up root. This can result in falsified +@@ -1050,7 +1050,7 @@ + + if(failnopwprompt) { + if(!user) { +- 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."); end_login(0); +@@ -1067,7 +1067,7 @@ + + if(c) { + if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) { +- 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."); + end_login(0); +@@ -1075,7 +1075,7 @@ } -@@ -1180,7 +1180,7 @@ + + if(!c && !aclp) { +- 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); + } +@@ -1146,7 +1146,7 @@ + "Too many users in your class, " + "please try again later."); + +- 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); +@@ -1179,7 +1179,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); +- 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); +@@ -1203,7 +1203,7 @@ + if(cur >= max) { + 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); end_login(0); } -@@ -1267,7 +1267,7 @@ + +@@ -1283,7 +1283,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), +- log_auth(LOG_NOTICE, "Maximum login attempts exceeded."); ++ log_auth(LOG_INFO, "Maximum login attempts exceeded."); + end_login(0); + } + diff --git a/ftp/proftpd-devel/files/patch-ah b/ftp/proftpd-devel/files/patch-ah index 2fe3db16a045..0de104b4408b 100644 --- a/ftp/proftpd-devel/files/patch-ah +++ b/ftp/proftpd-devel/files/patch-ah @@ -1,6 +1,6 @@ ---- modules/mod_unixpw.c.orig Sat Aug 28 16:57:42 1999 -+++ modules/mod_unixpw.c Sat Aug 28 16:59:06 1999 -@@ -36,6 +36,7 @@ +--- modules/mod_unixpw.c.orig Thu Sep 30 20:33:47 1999 ++++ modules/mod_unixpw.c Sat Nov 13 13:15:26 1999 +@@ -42,6 +42,7 @@ #include #endif #ifdef HAVE_PROT_H diff --git a/ftp/proftpd-devel/pkg-descr b/ftp/proftpd-devel/pkg-descr index 42a8a484685d..23a55fa52666 100644 --- a/ftp/proftpd-devel/pkg-descr +++ b/ftp/proftpd-devel/pkg-descr @@ -1,6 +1,7 @@ ProFTPD is a highly configurable ftp daemon for unix and unix-like operating systems. ProFTPD is designed -to be somewhat of a "drop-in" replacement for wu-ftpd. +to be somewhat of a "drop-in" replacement for wu-ftpd +with a configuration format like Apache. Full online documentation is available at http://www.proftpd.org/, including a server -- cgit v1.2.3