Upgrade to 1.2.0, and associated changes.

8 files changed, 106 insertions, 84 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index b9b34461947a..0e6a5ab554e4 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -3,38 +3,26 @@
 # Date created:		26 January 1998
 # Whom:			Stephane Legrand
 #
-# $Id: Makefile,v 1.3 1998/06/14 15:56:40 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/02 11:06:26 vanilla Exp $
 #
 
-DISTNAME=	proftpd-1.0.3pl1
-PKGNAME=	proftpd-1.0.3
+DISTNAME=	proftpd-1.2.0pre1
+PKGNAME=	proftpd-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/
 
 MAINTAINER=	stephane@lituus.fr
 
-MAN1=	ftpwho.1 ftpcount.1
+MAN1=	ftpcount.1
 MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-#
-# - "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 \
+			--with-modules=mod_ratio
 
 post-configure:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
-	${SED}	-e "s:^prefix=\/usr:prefix=${PREFIX}:" \
-		-e "s:^etcdir=\/etc:etcdir=${PREFIX}\/etc:" \
-		< ${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
-
-	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.pre_sed
-	${SED}	-e 's:\/etc\/proftpd\.conf:${PREFIX}\/etc\/proftpd.conf:' \
-		< ${WRKSRC}/config.h.pre_sed > ${WRKSRC}/config.h
 
 	@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
 	@${SED}	-e 's:/etc:${PREFIX}/etc:' \
@@ -48,18 +36,21 @@ post-configure:
 		-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
 
-post-install:
-	strip ${PREFIX}/bin/ftpcount \
-		${PREFIX}/bin/ftpwho \
-		${PREFIX}/libexec/proftpd \
-		${PREFIX}/sbin/ftpshut \
+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 ${PREFIX}/etc/proftpd.conf ]; then \
+		${INSTALL_SCRIPT} \
+	${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 307eb757bdf4..5b5a2cef6721 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.0.3pl1.tar.gz) = 4f6c85a84ba42365704df359fd2aae0b
+MD5 (proftpd-1.2.0pre1.tar.gz) = cd4456ebcdd19a2eb6e79ef7f4e3e65a
diff --git a/ftp/proftpd-devel/files/patch-ae b/ftp/proftpd-devel/files/patch-ae
index 7496f3be8d6f..284fbca2c7f8 100644
--- a/ftp/proftpd-devel/files/patch-ae
+++ b/ftp/proftpd-devel/files/patch-ae
@@ -1,6 +1,6 @@
---- modules//mod_auth.c.orig	Sun Jun  7 16:17:57 1998
-+++ modules/mod_auth.c	Sun Jun  7 16:21:29 1998
-@@ -177,7 +177,7 @@
+--- 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);
@@ -9,20 +9,32 @@
             (void*)0,NULL);
    remove_timer(TIMER_IDLE,ANY_MODULE);
    remove_timer(TIMER_NOXFER,ANY_MODULE);
-@@ -763,10 +763,10 @@
-   }
+@@ -763,13 +763,13 @@
+     resolve_anonymous_dirs(c->subset);
  
    if(c)
--    log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s]",
-+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s]",
-     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
+-    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]",
-+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s]",
-     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
+-    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));
  
-   session.user = pstrdup(permanent_pool,auth_map_uid(pw->pw_uid));
-@@ -987,7 +987,7 @@
+-      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));
  
@@ -31,3 +43,12 @@
                 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),
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index ee16f2d28e71..a52e4bf17bfb 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/ftpcount
-bin/ftpwho
 etc/proftpd.conf
 libexec/proftpd
 sbin/ftpshut
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index b9b34461947a..0e6a5ab554e4 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -3,38 +3,26 @@
 # Date created:		26 January 1998
 # Whom:			Stephane Legrand
 #
-# $Id: Makefile,v 1.3 1998/06/14 15:56:40 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/02 11:06:26 vanilla Exp $
 #
 
-DISTNAME=	proftpd-1.0.3pl1
-PKGNAME=	proftpd-1.0.3
+DISTNAME=	proftpd-1.2.0pre1
+PKGNAME=	proftpd-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/
 
 MAINTAINER=	stephane@lituus.fr
 
-MAN1=	ftpwho.1 ftpcount.1
+MAN1=	ftpcount.1
 MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-#
-# - "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 \
+			--with-modules=mod_ratio
 
 post-configure:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
-	${SED}	-e "s:^prefix=\/usr:prefix=${PREFIX}:" \
-		-e "s:^etcdir=\/etc:etcdir=${PREFIX}\/etc:" \
-		< ${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
-
-	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.pre_sed
-	${SED}	-e 's:\/etc\/proftpd\.conf:${PREFIX}\/etc\/proftpd.conf:' \
-		< ${WRKSRC}/config.h.pre_sed > ${WRKSRC}/config.h
 
 	@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
 	@${SED}	-e 's:/etc:${PREFIX}/etc:' \
@@ -48,18 +36,21 @@ post-configure:
 		-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
 
-post-install:
-	strip ${PREFIX}/bin/ftpcount \
-		${PREFIX}/bin/ftpwho \
-		${PREFIX}/libexec/proftpd \
-		${PREFIX}/sbin/ftpshut \
+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 ${PREFIX}/etc/proftpd.conf ]; then \
+		${INSTALL_SCRIPT} \
+	${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 307eb757bdf4..5b5a2cef6721 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.0.3pl1.tar.gz) = 4f6c85a84ba42365704df359fd2aae0b
+MD5 (proftpd-1.2.0pre1.tar.gz) = cd4456ebcdd19a2eb6e79ef7f4e3e65a
diff --git a/ftp/proftpd/files/patch-ae b/ftp/proftpd/files/patch-ae
index 7496f3be8d6f..284fbca2c7f8 100644
--- a/ftp/proftpd/files/patch-ae
+++ b/ftp/proftpd/files/patch-ae
@@ -1,6 +1,6 @@
---- modules//mod_auth.c.orig	Sun Jun  7 16:17:57 1998
-+++ modules/mod_auth.c	Sun Jun  7 16:21:29 1998
-@@ -177,7 +177,7 @@
+--- 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);
@@ -9,20 +9,32 @@
             (void*)0,NULL);
    remove_timer(TIMER_IDLE,ANY_MODULE);
    remove_timer(TIMER_NOXFER,ANY_MODULE);
-@@ -763,10 +763,10 @@
-   }
+@@ -763,13 +763,13 @@
+     resolve_anonymous_dirs(c->subset);
  
    if(c)
--    log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s]",
-+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s]",
-     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
+-    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]",
-+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s]",
-     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
+-    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));
  
-   session.user = pstrdup(permanent_pool,auth_map_uid(pw->pw_uid));
-@@ -987,7 +987,7 @@
+-      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));
  
@@ -31,3 +43,12 @@
                 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),
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index ee16f2d28e71..a52e4bf17bfb 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -1,5 +1,4 @@
 bin/ftpcount
-bin/ftpwho
 etc/proftpd.conf
 libexec/proftpd
 sbin/ftpshut