aboutsummaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'ftp')
-rw-r--r--ftp/proftpd-devel/Makefile6
-rw-r--r--ftp/proftpd-devel/distinfo2
-rw-r--r--ftp/proftpd-devel/files/patch-ae61
-rw-r--r--ftp/proftpd-devel/files/patch-af12
-rw-r--r--ftp/proftpd/Makefile6
-rw-r--r--ftp/proftpd/distinfo2
-rw-r--r--ftp/proftpd/files/patch-ae61
-rw-r--r--ftp/proftpd/files/patch-af12
8 files changed, 76 insertions, 86 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index fbcf82b27b9b..4defdceb6846 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,18 +6,16 @@
#
PORTNAME= proftpd
-PORTVERSION= 1.2.0p10
+PORTVERSION= 1.2.0rc2
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/ \
ftp://ftp.stikman.com/pub/proftpd/ \
ftp://ftp.linux.co.uk/pub/packages/proftpd/ \
ftp://ftp.drenik.net/linux/ftp/proftpd/
-DISTNAME= ${PORTNAME}-1.2.0pre10
+DISTNAME= ${PORTNAME}-1.2.0rc2
MAINTAINER= mharo@FreeBSD.org
-FORBIDDEN= "Remote root hole, exploitable anonymously"
-
MAN1= ftpcount.1 ftpwho.1
MAN5= xferlog.5
MAN8= proftpd.8 ftpshut.8
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 007ef35438e6..1fe1435cf139 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.0pre10.tar.gz) = 5f2cc3b052d5eab230ff822cfc08d475
+MD5 (proftpd-1.2.0rc2.tar.gz) = 13e48f0f4006738ffb9aa7c28ab0ae63
diff --git a/ftp/proftpd-devel/files/patch-ae b/ftp/proftpd-devel/files/patch-ae
index 5fac82747d06..eb59e14d9b3f 100644
--- a/ftp/proftpd-devel/files/patch-ae
+++ b/ftp/proftpd-devel/files/patch-ae
@@ -1,6 +1,6 @@
---- modules/mod_auth.c.orig Mon Jan 3 13:28:39 2000
-+++ modules/mod_auth.c Thu Jan 27 23:17:19 2000
-@@ -70,7 +70,7 @@
+--- modules/mod_auth.c.orig Fri Jul 28 10:51:59 2000
++++ modules/mod_auth.c Fri Jul 28 10:52:17 2000
+@@ -72,7 +72,7 @@
"closing control connection.",
TimeoutLogin);
@@ -9,7 +9,7 @@
(void*) 0, NULL);
/* should never be reached */
-@@ -559,7 +559,7 @@
+@@ -608,7 +608,7 @@
c = _auth_resolve_user(p,&user,&ourname,&anonname);
if(!user) {
@@ -18,7 +18,7 @@
origuser);
goto auth_failure;
}
-@@ -568,7 +568,7 @@
+@@ -617,7 +617,7 @@
aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
if((pw = auth_getpwnam(p,user)) == NULL) {
@@ -27,7 +27,7 @@
goto auth_failure;
}
-@@ -629,14 +629,14 @@
+@@ -678,14 +678,14 @@
}
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){
@@ -44,16 +44,16 @@
origuser);
goto auth_failure;
}
-@@ -650,7 +650,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) {
+@@ -702,7 +702,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",user,user_name);
-+ log_auth(LOG_INFO,"ANON AUTH: User %s, Auth Alias %s",user,user_name);
+- 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);
}
-
- if(c)
-@@ -677,22 +677,22 @@
+
+@@ -730,22 +730,22 @@
switch(authcode) {
case AUTH_NOPWD:
@@ -80,7 +80,7 @@
user);
goto auth_failure;
-@@ -715,12 +715,12 @@
+@@ -768,12 +768,12 @@
auth_setgrent(p);
if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) {
@@ -95,7 +95,7 @@
user, FTPUSERS_PATH);
goto auth_failure;
}
-@@ -792,7 +792,7 @@
+@@ -845,7 +845,7 @@
if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i))
{
@@ -104,19 +104,16 @@
origuser);
goto auth_failure;
}
-@@ -807,9 +807,9 @@
+@@ -860,7 +860,7 @@
+ if(c && c->subset)
resolve_anonymous_dirs(c->subset);
- if(c)
-- log_auth(LOG_NOTICE, "ANON %s: Login successful.", origuser);
-+ log_auth(LOG_INFO, "ANON %s: Login successful.", origuser);
- else
-- log_auth(LOG_NOTICE,"USER %s: Login successful.", origuser);
-+ log_auth(LOG_INFO,"USER %s: Login successful.", origuser);
+- log_auth(LOG_NOTICE, "%s %s: Login successful.",
++ log_auth(LOG_INFO, "%s %s: Login successful.",
+ (c != NULL) ? "ANON" : "USER",
+ origuser);
- /* 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
-@@ -1073,7 +1073,7 @@
+@@ -1172,7 +1172,7 @@
if(failnopwprompt) {
if(!user) {
@@ -125,7 +122,7 @@
origuser);
send_response(R_530,"Login incorrect.");
end_login(0);
-@@ -1090,7 +1090,7 @@
+@@ -1189,7 +1189,7 @@
if(c) {
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) {
@@ -134,7 +131,7 @@
origuser);
send_response(R_530,"Login incorrect.");
end_login(0);
-@@ -1098,7 +1098,7 @@
+@@ -1197,7 +1197,7 @@
}
if(!c && !aclp) {
@@ -143,7 +140,7 @@
send_response(R_530,"Login incorrect.");
end_login(0);
}
-@@ -1169,7 +1169,7 @@
+@@ -1269,7 +1269,7 @@
"Too many users in your class, "
"please try again later.");
@@ -152,7 +149,7 @@
session.class->name);
end_login(0);
-@@ -1202,7 +1202,7 @@
+@@ -1304,7 +1304,7 @@
send_response(R_530,"%s",
sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
@@ -161,7 +158,7 @@
max);
end_login(0);
-@@ -1226,7 +1226,7 @@
+@@ -1330,7 +1330,7 @@
if(cur >= max) {
send_response(R_530, "%s",
sreplace(cmd->tmp_pool, maxstr, "%m", maxn, NULL));
@@ -170,7 +167,7 @@
end_login(0);
}
-@@ -1301,7 +1301,7 @@
+@@ -1411,7 +1411,7 @@
if(++auth_tries >= max) {
send_response(R_530,"Login incorrect");
diff --git a/ftp/proftpd-devel/files/patch-af b/ftp/proftpd-devel/files/patch-af
index 210e630b9553..102a7f802220 100644
--- a/ftp/proftpd-devel/files/patch-af
+++ b/ftp/proftpd-devel/files/patch-af
@@ -1,15 +1,15 @@
---- 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
+--- src/proftpd.8.orig Wed Jul 5 23:13:50 2000
++++ src/proftpd.8 Fri Jul 28 10:54:41 2000
+@@ -22,6 +22,12 @@
connection to the FTP service is made, or alternatively it can be run as a
stand-alone daemon.
+ .PP
+.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.
-
++.PP
When
.B proftpd
+ is run in standalone mode and it receives a SIGHUP then it will reread its
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index fbcf82b27b9b..4defdceb6846 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,18 +6,16 @@
#
PORTNAME= proftpd
-PORTVERSION= 1.2.0p10
+PORTVERSION= 1.2.0rc2
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/ \
ftp://ftp.stikman.com/pub/proftpd/ \
ftp://ftp.linux.co.uk/pub/packages/proftpd/ \
ftp://ftp.drenik.net/linux/ftp/proftpd/
-DISTNAME= ${PORTNAME}-1.2.0pre10
+DISTNAME= ${PORTNAME}-1.2.0rc2
MAINTAINER= mharo@FreeBSD.org
-FORBIDDEN= "Remote root hole, exploitable anonymously"
-
MAN1= ftpcount.1 ftpwho.1
MAN5= xferlog.5
MAN8= proftpd.8 ftpshut.8
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 007ef35438e6..1fe1435cf139 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.0pre10.tar.gz) = 5f2cc3b052d5eab230ff822cfc08d475
+MD5 (proftpd-1.2.0rc2.tar.gz) = 13e48f0f4006738ffb9aa7c28ab0ae63
diff --git a/ftp/proftpd/files/patch-ae b/ftp/proftpd/files/patch-ae
index 5fac82747d06..eb59e14d9b3f 100644
--- a/ftp/proftpd/files/patch-ae
+++ b/ftp/proftpd/files/patch-ae
@@ -1,6 +1,6 @@
---- modules/mod_auth.c.orig Mon Jan 3 13:28:39 2000
-+++ modules/mod_auth.c Thu Jan 27 23:17:19 2000
-@@ -70,7 +70,7 @@
+--- modules/mod_auth.c.orig Fri Jul 28 10:51:59 2000
++++ modules/mod_auth.c Fri Jul 28 10:52:17 2000
+@@ -72,7 +72,7 @@
"closing control connection.",
TimeoutLogin);
@@ -9,7 +9,7 @@
(void*) 0, NULL);
/* should never be reached */
-@@ -559,7 +559,7 @@
+@@ -608,7 +608,7 @@
c = _auth_resolve_user(p,&user,&ourname,&anonname);
if(!user) {
@@ -18,7 +18,7 @@
origuser);
goto auth_failure;
}
-@@ -568,7 +568,7 @@
+@@ -617,7 +617,7 @@
aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
if((pw = auth_getpwnam(p,user)) == NULL) {
@@ -27,7 +27,7 @@
goto auth_failure;
}
-@@ -629,14 +629,14 @@
+@@ -678,14 +678,14 @@
}
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){
@@ -44,16 +44,16 @@
origuser);
goto auth_failure;
}
-@@ -650,7 +650,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) {
+@@ -702,7 +702,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",user,user_name);
-+ log_auth(LOG_INFO,"ANON AUTH: User %s, Auth Alias %s",user,user_name);
+- 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);
}
-
- if(c)
-@@ -677,22 +677,22 @@
+
+@@ -730,22 +730,22 @@
switch(authcode) {
case AUTH_NOPWD:
@@ -80,7 +80,7 @@
user);
goto auth_failure;
-@@ -715,12 +715,12 @@
+@@ -768,12 +768,12 @@
auth_setgrent(p);
if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) {
@@ -95,7 +95,7 @@
user, FTPUSERS_PATH);
goto auth_failure;
}
-@@ -792,7 +792,7 @@
+@@ -845,7 +845,7 @@
if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i))
{
@@ -104,19 +104,16 @@
origuser);
goto auth_failure;
}
-@@ -807,9 +807,9 @@
+@@ -860,7 +860,7 @@
+ if(c && c->subset)
resolve_anonymous_dirs(c->subset);
- if(c)
-- log_auth(LOG_NOTICE, "ANON %s: Login successful.", origuser);
-+ log_auth(LOG_INFO, "ANON %s: Login successful.", origuser);
- else
-- log_auth(LOG_NOTICE,"USER %s: Login successful.", origuser);
-+ log_auth(LOG_INFO,"USER %s: Login successful.", origuser);
+- log_auth(LOG_NOTICE, "%s %s: Login successful.",
++ log_auth(LOG_INFO, "%s %s: Login successful.",
+ (c != NULL) ? "ANON" : "USER",
+ origuser);
- /* 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
-@@ -1073,7 +1073,7 @@
+@@ -1172,7 +1172,7 @@
if(failnopwprompt) {
if(!user) {
@@ -125,7 +122,7 @@
origuser);
send_response(R_530,"Login incorrect.");
end_login(0);
-@@ -1090,7 +1090,7 @@
+@@ -1189,7 +1189,7 @@
if(c) {
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) {
@@ -134,7 +131,7 @@
origuser);
send_response(R_530,"Login incorrect.");
end_login(0);
-@@ -1098,7 +1098,7 @@
+@@ -1197,7 +1197,7 @@
}
if(!c && !aclp) {
@@ -143,7 +140,7 @@
send_response(R_530,"Login incorrect.");
end_login(0);
}
-@@ -1169,7 +1169,7 @@
+@@ -1269,7 +1269,7 @@
"Too many users in your class, "
"please try again later.");
@@ -152,7 +149,7 @@
session.class->name);
end_login(0);
-@@ -1202,7 +1202,7 @@
+@@ -1304,7 +1304,7 @@
send_response(R_530,"%s",
sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
@@ -161,7 +158,7 @@
max);
end_login(0);
-@@ -1226,7 +1226,7 @@
+@@ -1330,7 +1330,7 @@
if(cur >= max) {
send_response(R_530, "%s",
sreplace(cmd->tmp_pool, maxstr, "%m", maxn, NULL));
@@ -170,7 +167,7 @@
end_login(0);
}
-@@ -1301,7 +1301,7 @@
+@@ -1411,7 +1411,7 @@
if(++auth_tries >= max) {
send_response(R_530,"Login incorrect");
diff --git a/ftp/proftpd/files/patch-af b/ftp/proftpd/files/patch-af
index 210e630b9553..102a7f802220 100644
--- a/ftp/proftpd/files/patch-af
+++ b/ftp/proftpd/files/patch-af
@@ -1,15 +1,15 @@
---- 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
+--- src/proftpd.8.orig Wed Jul 5 23:13:50 2000
++++ src/proftpd.8 Fri Jul 28 10:54:41 2000
+@@ -22,6 +22,12 @@
connection to the FTP service is made, or alternatively it can be run as a
stand-alone daemon.
+ .PP
+.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.
-
++.PP
When
.B proftpd
+ is run in standalone mode and it receives a SIGHUP then it will reread its
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 19:27:40 +0000