upgrade to proftpd 1.2.0pre9

net/proftpd/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.14 1999/09/28 18:43:29 espie Exp $
+# $OpenBSD: Makefile,v 1.15 1999/10/27 22:54:42 brad Exp $
 # $FreeBSD: Makefile,v 1.7 1999/02/12 21:55:04 obrien Exp $
 
-DISTNAME=	proftpd-1.2.0pre7
+DISTNAME=	proftpd-1.2.0pre9
 PKGNAME=	proftpd-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.tos.net/pub/proftpd/ \
@@ -16,7 +16,7 @@ NEED_VERSION=	1.73
 # It is recommended that you don't use proftpd for now, 
 # unless you're really sure you know what you are doing.
 #
-BROKEN="Needs a security audit. Use at your own risk"
+BROKEN=	"Needs a security audit. Use at your own risk"
 
 MAINTAINER=	brad@openbsd.org
 
@@ -48,14 +48,16 @@ post-configure:
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/proftpd
-	${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
+	${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
+	${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut
+	${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
+	${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
+	${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
+	${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5
-	${INSTALL_SCRIPT} ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/lib/proftpd/proftpd.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/lib/proftpd/proftpd.conf.sample
 
 post-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL

net/proftpd/files/md5

@@ -1,3 +1,3 @@
-MD5 (proftpd-1.2.0pre7.tar.gz) = 2d8298c8b51276e89bc4db3dadd276d7
+MD5 (proftpd-1.2.0pre9.tar.gz) = 0ad6feb4b59b29240632b77ffc303b14
-RMD160 (proftpd-1.2.0pre7.tar.gz) = 3c58519d3e2b80ada2278edd9fcea73d5d119024
+RMD160 (proftpd-1.2.0pre9.tar.gz) = eeb3dc4de8920380e18737a8489abaee90a2a701
-SHA1 (proftpd-1.2.0pre7.tar.gz) = fa3da69f9ccc77cdfe2391a63e149ad2b33a12dd
+SHA1 (proftpd-1.2.0pre9.tar.gz) = c291e48e20aedfac640bc242c2b48a063f9f060a

net/proftpd/patches/patch-ad

@@ -1,6 +1,6 @@
---- src/log.c.orig	Sun Sep 26 02:00:34 1999
+--- src/log.c.orig	Sun Oct 10 23:13:13 1999
-+++ src/log.c	Tue Sep 28 13:30:12 1999
++++ src/log.c	Wed Oct 27 17:29:28 1999
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
  static int syslog_discard = FALSE;
  static int logstderr = TRUE;
  static int debug_level = DEBUG0;	/* Default is no debug logging */
@@ -9,8 +9,8 @@
  static int set_facility = -1;
  static char *syslog_fn = NULL;
  static char *syslog_hostname;
-@@ -739,7 +739,7 @@
+@@ -772,7 +772,7 @@
-   log(priority,facility,buf);
+   log(priority, facility, buf);
  }
  
 -/* Like log_pri(), but sends the log entry in the LOG_AUTHPRIV
@@ -18,9 +18,9 @@
   * facility (presumable it doesn't need to be seen by everyone
   */
  
-@@ -754,7 +754,7 @@
+@@ -787,7 +787,7 @@
  
-   buf[1023] = '\0';
+   buf[sizeof(buf) - 1] = '\0';
  
 -  log(priority, LOG_AUTHPRIV, buf);
 +  log(priority, LOG_FTP, buf);

net/proftpd/patches/patch-ae

@@ -1,54 +1,50 @@
---- modules/mod_auth.c.orig	Sun Aug 22 20:23:51 1999
+--- modules/mod_auth.c.orig	Sat Oct 23 01:18:49 1999
-+++ modules/mod_auth.c	Sun Aug 22 20:23:53 1999
++++ modules/mod_auth.c	Wed Oct 27 17:36:14 1999
-@@ -69,7 +69,7 @@
+@@ -70,7 +70,7 @@
- 		  (void*)0,NULL);
+ 		      "closing control connection.",
+                       TimeoutLogin);
    
- /*
+-  main_exit((void*) LOG_NOTICE, "FTP login timed out, disconnected.",
--  schedule(main_exit,0,(void*)LOG_NOTICE,"FTP login timed out, disconnected.",
++  main_exit((void*) LOG_INFO, "FTP login timed out, disconnected.",
-+  schedule(main_exit,0,(void*)LOG_INFO,"FTP login timed out, disconnected.",
+ 	    (void*) 0, NULL);
-            (void*)0,NULL);
+   
-   remove_timer(TIMER_IDLE,ANY_MODULE);
+ /* should never be reached */
-   remove_timer(TIMER_NOXFER,ANY_MODULE);
+@@ -784,9 +784,9 @@
-@@ -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_NOTICE, "ANON %s: Login successful.", origuser);
-+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s] to %s:%i",
++    log_auth(LOG_INFO, "ANON %s: Login successful.", origuser);
-       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_NOTICE,"USER %s: Login successful.", origuser);
-+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s] to %s:%i",
++    log_auth(LOG_INFO,"USER %s: Login successful.", origuser);
-       origuser,session.c->remote_name,
+ 
-       inet_ascii(p,session.c->remote_ipaddr),
+   /* Write the login to wtmp.  This must be done here because we won't
-       inet_ascii(p,session.c->local_ipaddr),
+    * have access after we give up root.  This can result in falsified
-@@ -1155,7 +1155,7 @@
+@@ -1146,7 +1146,7 @@
-       send_response(R_530,"%s",
+ 			"Too many users in your class, "
-                     sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
+ 			"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);
  	
--      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);
-     }
 @@ -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_NOTICE, "Connection refused (max clients per host %d).",
-+      log_auth(LOG_INFO,"connection refused (max clients %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);
      }
-@@ -1266,7 +1266,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),

net/proftpd/pkg/DEINSTALL

@@ -1,4 +1,4 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/27 19:34:42 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 1999/10/27 22:54:43 brad Exp $
 #
 # proftpd de-installation
 
@@ -16,6 +16,7 @@ if [ -f ${CONFIG_FILE} ]; then
     echo "| this step as root:"
     echo "|"
     echo "|           rm -f ${CONFIG_FILE}"
+    echo "|           rm -rf /var/run/proftpd"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."

net/proftpd/pkg/PLIST

@@ -1,9 +1,11 @@
 bin/ftpcount
+bin/ftpwho
 lib/proftpd/proftpd.conf.sample
 libexec/proftpd
 sbin/ftpshut
 man/man1/ftpcount.1
 man/man1/ftpwho.1
+man/man5/xferlog.5
 man/man8/proftpd.8
 man/man8/ftpshut.8
 @dirrm lib/proftpd