- Fix the last imported patch (which came from proftpd's CVS repo),

  as it was causing segfaults prior to login.
- Add the new CommandBufferSize variable into the default config file to
  stop proftpd complaining.

Reported by:	many

6 files changed, 34 insertions, 16 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 5c7ccf8d6f68..d392044538e3 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
diff --git a/ftp/proftpd-devel/files/patch-main.c b/ftp/proftpd-devel/files/patch-main.c
index 10b29b39584e..eb948cc779aa 100644
--- a/ftp/proftpd-devel/files/patch-main.c
+++ b/ftp/proftpd-devel/files/patch-main.c
@@ -1,5 +1,5 @@
---- src/main.c.orig	Wed Mar 15 21:41:01 2006
-+++ src/main.c	Tue Nov 14 08:47:12 2006
+--- src/main.c.orig	Wed Mar 15 19:41:01 2006
++++ src/main.c	Wed Nov 15 19:06:18 2006
 @@ -116,6 +116,8 @@
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
@@ -27,9 +27,9 @@
 -	cmd_buf_size = 512;
 +      if (bufsz == NULL ||
 +          *bufsz <= 0) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 +
 +      } else if (*bufsz + 1 > sizeof(buf)) {
diff --git a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
index fa3f8dfc355e..d6312df3da95 100644
--- a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
+++ b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
@@ -1,5 +1,5 @@
---- sample-configurations/basic.conf.orig	Fri Jun 17 15:10:06 2005
-+++ sample-configurations/basic.conf	Fri Jun 17 15:10:43 2005
+--- sample-configurations/basic.conf.orig	Thu Apr 15 19:46:38 2004
++++ sample-configurations/basic.conf	Wed Nov 15 19:14:36 2006
 @@ -1,3 +1,7 @@
 +#
 +# To have more informations about Proftpd configuration
@@ -16,7 +16,16 @@
  
  # Port 21 is the standard FTP port.
  Port				21
-@@ -40,23 +45,29 @@
+@@ -22,6 +27,8 @@
+ # (such as xinetd).
+ MaxInstances			30
+ 
++CommandBufferSize		512
++
+ # Set the user and group under which the server will run.
+ User				nobody
+ Group				nogroup
+@@ -40,23 +47,29 @@
  
  # A basic anonymous configuration, no upload directories.  If you do not
  # want anonymous users, simply delete this entire <Anonymous> section.
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 5c7ccf8d6f68..d392044538e3 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
diff --git a/ftp/proftpd/files/patch-main.c b/ftp/proftpd/files/patch-main.c
index 10b29b39584e..eb948cc779aa 100644
--- a/ftp/proftpd/files/patch-main.c
+++ b/ftp/proftpd/files/patch-main.c
@@ -1,5 +1,5 @@
---- src/main.c.orig	Wed Mar 15 21:41:01 2006
-+++ src/main.c	Tue Nov 14 08:47:12 2006
+--- src/main.c.orig	Wed Mar 15 19:41:01 2006
++++ src/main.c	Wed Nov 15 19:06:18 2006
 @@ -116,6 +116,8 @@
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
@@ -27,9 +27,9 @@
 -	cmd_buf_size = 512;
 +      if (bufsz == NULL ||
 +          *bufsz <= 0) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 +
 +      } else if (*bufsz + 1 > sizeof(buf)) {
diff --git a/ftp/proftpd/files/patch-sample-configurations_basic.conf b/ftp/proftpd/files/patch-sample-configurations_basic.conf
index fa3f8dfc355e..d6312df3da95 100644
--- a/ftp/proftpd/files/patch-sample-configurations_basic.conf
+++ b/ftp/proftpd/files/patch-sample-configurations_basic.conf
@@ -1,5 +1,5 @@
---- sample-configurations/basic.conf.orig	Fri Jun 17 15:10:06 2005
-+++ sample-configurations/basic.conf	Fri Jun 17 15:10:43 2005
+--- sample-configurations/basic.conf.orig	Thu Apr 15 19:46:38 2004
++++ sample-configurations/basic.conf	Wed Nov 15 19:14:36 2006
 @@ -1,3 +1,7 @@
 +#
 +# To have more informations about Proftpd configuration
@@ -16,7 +16,16 @@
  
  # Port 21 is the standard FTP port.
  Port				21
-@@ -40,23 +45,29 @@
+@@ -22,6 +27,8 @@
+ # (such as xinetd).
+ MaxInstances			30
+ 
++CommandBufferSize		512
++
+ # Set the user and group under which the server will run.
+ User				nobody
+ Group				nogroup
+@@ -40,23 +47,29 @@
  
  # A basic anonymous configuration, no upload directories.  If you do not
  # want anonymous users, simply delete this entire <Anonymous> section.