cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to proftpd-1.2.0pre2

Browse Source
This commit is contained in:
brad 1999-02-22 05:13:33 +00:00
parent 84fcef332c
commit f63ceacdb8
9 changed files with 97 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
net/proftpd/Makefile
View File

@ -1,60 +1,49 @@
# New ports collection makefile for: proftpd
# Version required: 1.0.3pl1
# Date created: 16 Jun 1998
# Whom: Oleg Safiullin <form@OpenBSD.ORG>
#
# $OpenBSD: Makefile,v 1.2 1998/10/20 08:39:47 form Exp $
# FreeBSD: Makefile,v 1.3 1998/06/14 15:56:40 steve Exp
#
# $OpenBSD: Makefile,v 1.3 1999/02/22 05:13:33 brad Exp $
# $FreeBSD: Makefile,v 1.7 1999/02/12 21:55:04 obrien Exp $
DISTNAME= proftpd-1.0.3pl1
PKGNAME= proftpd-1.0.3
DISTNAME= proftpd-1.2.0pre2
PKGNAME= proftpd-1.2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.proftpd.org/distrib/
MAINTAINER= form@OpenBSD.ORG
MAN1= ftpwho.1 ftpcount.1
MAN1= ftpcount.1
MAN8= proftpd.8 ftpshut.8
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS}"
#
# - "configure --prefix=..." doesn't seem to work :(
# do a "sed" to set prefix to $PREFIX
#
# - do a "sed" to set the config dir to ${PREFIX}/etc
#
CONFIGURE_ARGS= --localstatedir=/var/run --sysconfdir=/etc --with-modules=mod_ratio
post-configure:
${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
${SED} -e "s:^prefix=\/usr:prefix=${PREFIX}:" \
< ${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
@${SED} -e 's:/usr/sbin/proftpd:${PREFIX}/libexec/proftpd:' \
-e 's:/usr/sbin:${PREFIX}/sbin:' \
-e 's:/usr/bin:${PREFIX}/bin:' \
< ${WRKSRC}/src/proftpd.8.pre_sed > ${WRKSRC}/src/proftpd.8
@${MV} ${WRKSRC}/src/ftpshut.8 ${WRKSRC}/src/ftpshut.8.pre_sed
@${SED} -e 's:/usr/sbin:${PREFIX}/sbin:' \
-e 's:/etc:/var/run:' \
< ${WRKSRC}/src/ftpshut.8.pre_sed > ${WRKSRC}/src/ftpshut.8
@${MV} ${WRKSRC}/src/ftpwho.1 ${WRKSRC}/src/ftpwho.1.pre_sed
@${SED} -e 's:/usr/bin:${PREFIX}/bin:' \
< ${WRKSRC}/src/ftpwho.1.pre_sed > ${WRKSRC}/src/ftpwho.1
@${MV} ${WRKSRC}/src/ftpcount.1 ${WRKSRC}/src/ftpcount.1.pre_sed
@${SED} -e 's:/usr/bin:${PREFIX}/bin:' \
< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
@${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
@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
@if [ ! -f /etc/proftpd.conf ]; then \
${INSTALL_SCRIPT} \
${WRKSRC}/sample-configurations/basic.conf /etc/proftpd.conf; \
fi
post-install:
strip ${PREFIX}/bin/ftpcount \
${PREFIX}/bin/ftpwho \
${PREFIX}/libexec/proftpd \
${PREFIX}/sbin/ftpshut \

2
net/proftpd/files/md5
View File

@ -1 +1 @@
MD5 (proftpd-1.0.3pl1.tar.gz) = 4f6c85a84ba42365704df359fd2aae0b
MD5 (proftpd-1.2.0pre2.tar.gz) = 85bed6f9211ba4a33f560312f1090a4b

13
net/proftpd/patches/patch-aa
View File

@ -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

42
net/proftpd/patches/patch-ab
View File

@ -1,42 +0,0 @@
*** Makefile.in.orig Wed May 20 23:43:14 1998
--- Makefile.in Tue Jun 16 13:34:45 1998
***************
*** 32,37 ****
--- 32,38 ----
sbindir=@sbindir@
etcdir=@etcdir@
mandir=@mandir@
+ libexecdir=@libexecdir@
include ./Make.rules
include ./Make.modules
***************
*** 76,90 ****
rm -f proftpd ftpcount ftpwho ftpshut core
install-proftpd:
! $(INSTALL) -s -g 0 -o 0 -m 0755 proftpd $(sbindir)/proftpd
! if [ ! -f $(sbindir)/in.proftpd ] ; then \
! ln -s $(sbindir)/proftpd $(sbindir)/in.proftpd; \
! fi
!
install-utils:
$(INSTALL) -s -g 0 -o 0 -m 0755 ftpcount $(bindir)/ftpcount
$(INSTALL) -s -g 0 -o 0 -m 0755 ftpcount $(bindir)/ftpwho
! $(INSTALL) -s -g 0 -o 0 -m 0755 ftpcount $(sbindir)/ftpwho
install-conf:
if [ ! -e $(etcdir)/proftpd.conf ] ; then \
--- 77,88 ----
rm -f proftpd ftpcount ftpwho ftpshut core
install-proftpd:
! $(INSTALL) -s -g 0 -o 0 -m 0755 proftpd $(libexecdir)/proftpd
!
install-utils:
$(INSTALL) -s -g 0 -o 0 -m 0755 ftpcount $(bindir)/ftpcount
$(INSTALL) -s -g 0 -o 0 -m 0755 ftpcount $(bindir)/ftpwho
! $(INSTALL) -s -g 0 -o 0 -m 0755 ftpshut $(sbindir)/ftpshut
install-conf:
if [ ! -e $(etcdir)/proftpd.conf ] ; then \

11
net/proftpd/patches/patch-ac
View File

@ -1,11 +0,0 @@
--- configure.orig Tue May 19 21:50:43 1998
+++ configure Sun Jun 7 16:00:24 1998
@@ -669,7 +669,7 @@
EOF
cat >> confdefs.h <<\EOF
-#define SHUTMSG_PATH "/etc/shutmsg"
+#define SHUTMSG_PATH "/var/run/shutmsg"
EOF
cat >> confdefs.h <<\EOF

16
net/proftpd/patches/patch-ad
View File

@ -1,15 +1,15 @@
--- src/log.c.orig Sun Jun 7 16:12:04 1998
+++ src/log.c Sun Jun 7 16:15:34 1998
@@ -38,7 +38,7 @@
static int syslog_open = FALSE;
--- src/log.c.orig Sat Oct 17 22:24:41 1998
+++ src/log.c Mon Dec 14 15:14:12 1998
@@ -44,7 +44,7 @@
static int syslog_discard = FALSE;
static int logstderr = TRUE;
static int debug_level = DEBUG0; /* Default is no debug logging */
-static int facility = LOG_DAEMON;
+static int facility = LOG_FTP;
static int runfd = -1;
static char *runfn = NULL;
static int xferfd = -1;
@@ -463,7 +463,7 @@
static int set_facility = -1;
static char *syslog_fn = NULL;
static char *syslog_hostname;
@@ -718,7 +718,7 @@
buf[1023] = '\0';

142
net/proftpd/patches/patch-ae
View File

@ -1,88 +1,54 @@
*** modules/mod_auth.c.orig Tue May 26 21:24:39 1998
--- modules/mod_auth.c Thu Jul 2 14:33:59 1998
***************
*** 177,183 ****
/* Is this the proper behavior when timing out? */
send_response_async(R_421,"Login Timeout (%d seconds): closing control connection.",
TimeoutLogin);
! schedule(main_exit,0,(void*)LOG_NOTICE,"FTP login timed out, disconnected.",
(void*)0,NULL);
remove_timer(TIMER_IDLE,ANY_MODULE);
remove_timer(TIMER_NOXFER,ANY_MODULE);
--- 177,183 ----
/* Is this the proper behavior when timing out? */
send_response_async(R_421,"Login Timeout (%d seconds): closing control connection.",
TimeoutLogin);
! schedule(main_exit,0,(void*)LOG_INFO,"FTP login timed out, disconnected.",
(void*)0,NULL);
remove_timer(TIMER_IDLE,ANY_MODULE);
remove_timer(TIMER_NOXFER,ANY_MODULE);
***************
*** 763,772 ****
}
if(c)
! log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s]",
origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
else
! log_auth(LOG_NOTICE,"FTP login as '%s' from %s [%s]",
origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
session.user = pstrdup(permanent_pool,auth_map_uid(pw->pw_uid));
--- 763,772 ----
}
if(c)
! log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s]",
origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
else
! log_auth(LOG_INFO,"FTP login as '%s' from %s [%s]",
origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
session.user = pstrdup(permanent_pool,auth_map_uid(pw->pw_uid));
***************
*** 869,881 ****
end_login(1);
}
! if(setregid(pw->pw_gid,pw->pw_gid) == -1 ||
! setreuid(pw->pw_uid,pw->pw_uid) == -1) {
PRIVS_RELINQUISH
send_response(R_530,"Unable to set user privileges.");
! log_pri(LOG_ERR,"%s setregid() or setreuid(): %s",
session.user,strerror(errno));
end_login(1);
--- 869,881 ----
end_login(1);
}
! if(setgid(pw->pw_gid) == -1 ||
! setuid(pw->pw_uid) == -1) {
PRIVS_RELINQUISH
send_response(R_530,"Unable to set user privileges.");
! log_pri(LOG_ERR,"%s setgid() or setuid(): %s",
session.user,strerror(errno));
end_login(1);
***************
*** 987,993 ****
send_response(R_530,"%s",
sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
! log_auth(LOG_NOTICE,"connection refused (max clients %d)",
max);
end_login(0);
}
--- 987,993 ----
send_response(R_530,"%s",
sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
! log_auth(LOG_INFO,"connection refused (max clients %d)",
max);
end_login(0);
}
--- modules/mod_auth.c.orig Sat Oct 17 22:24:41 1998
+++ modules/mod_auth.c Mon Dec 14 15:26:02 1998
@@ -61,7 +61,7 @@
/* Is this the proper behavior when timing out? */
send_response_async(R_421,"Login Timeout (%d seconds): closing control connection.",
TimeoutLogin);
- schedule(main_exit,0,(void*)LOG_NOTICE,"FTP login timed out, disconnected.",
+ schedule(main_exit,0,(void*)LOG_INFO,"FTP login timed out, disconnected.",
(void*)0,NULL);
remove_timer(TIMER_IDLE,ANY_MODULE);
remove_timer(TIMER_NOXFER,ANY_MODULE);
@@ -763,13 +763,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),
@@ -1132,7 +1132,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);
}
@@ -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 %d)",
+ log_auth(LOG_INFO,"connection refused (max clients %d)",
max);
end_login(0);
}
@@ -1243,7 +1243,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),

12
net/proftpd/patches/patch-af
View File

@ -1,6 +1,6 @@
--- src/proftpd.8.orig Sun Jun 7 16:26:39 1998
+++ src/proftpd.8 Sun Jun 7 16:27:44 1998
@@ -19,6 +19,12 @@
--- src/proftpd.8.orig Sun Feb 21 23:13:30 1999
+++ src/proftpd.8 Sun Feb 21 23:14:10 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.
@ -10,6 +10,6 @@
+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.
.SH OPTIONS
.TP 12
.B \-h,\--help
When
.B proftpd

2
net/proftpd/pkg/PLIST
View File

@ -1,10 +1,8 @@
bin/ftpcount
bin/ftpwho
libexec/proftpd
sbin/ftpshut
man/man8/proftpd.8
man/man8/ftpshut.8
man/man1/ftpwho.1
man/man1/ftpcount.1
@unexec echo "***"
@unexec echo "*** You should remove /etc/proftpd.conf manually"