[pkgsrc/pkgsrc-2006Q3]: pkgsrc/net/proftpd Pullup ticket 1920 - requested by ...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/298136d0ca04
branches:  pkgsrc-2006Q3
changeset: 519201:298136d0ca04
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Nov 23 12:30:27 2006 +0000

description:
Pullup ticket 1920 - requested by adrianp
fix security fix for proftpd

- pkgsrc/net/proftpd/Makefile                   1.37
- pkgsrc/net/proftpd/distinfo                   1.20
- pkgsrc/net/proftpd/patches/patch-ac           1.6

   Module Name: pkgsrc
   Committed By:        adrianp
   Date:                Thu Nov 23 11:57:07 UTC 2006

   Modified Files:
        pkgsrc/net/proftpd: Makefile distinfo
        pkgsrc/net/proftpd/patches: patch-ac

   Log Message:
   Updated patch-ac via Debian to fix PR #35092

diffstat:

 net/proftpd/Makefile         |   4 +-
 net/proftpd/distinfo         |   4 +-
 net/proftpd/patches/patch-ac |  50 ++++++++++++++++++++++---------------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diffs (104 lines):

diff -r db3ee6a89d14 -r 298136d0ca04 net/proftpd/Makefile
--- a/net/proftpd/Makefile      Thu Nov 23 12:23:28 2006 +0000
+++ b/net/proftpd/Makefile      Thu Nov 23 12:30:27 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35.4.1 2006/11/19 12:15:43 ghen Exp $
+# $NetBSD: Makefile,v 1.35.4.2 2006/11/23 12:30:27 ghen Exp $
 
 DISTNAME=      proftpd-1.3.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.proftpd.org/distrib/source/ \
                ftp://ftp.servus.at/ProFTPD/distrib/source/ \
diff -r db3ee6a89d14 -r 298136d0ca04 net/proftpd/distinfo
--- a/net/proftpd/distinfo      Thu Nov 23 12:23:28 2006 +0000
+++ b/net/proftpd/distinfo      Thu Nov 23 12:30:27 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18.4.1 2006/11/19 12:15:43 ghen Exp $
+$NetBSD: distinfo,v 1.18.4.2 2006/11/23 12:30:27 ghen Exp $
 
 SHA1 (proftpd-1.3.0.tar.bz2) = d117134035a3d8d130c5aa44d6b1788683a33410
 RMD160 (proftpd-1.3.0.tar.bz2) = 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec
 Size (proftpd-1.3.0.tar.bz2) = 1386086 bytes
 SHA1 (patch-aa) = 5ebfe97a0edb8ecee7495fd5d487eff3cf32d1fe
 SHA1 (patch-ab) = 8886177b90089c8a2fa580aceb7a0514fe0ea6a7
-SHA1 (patch-ac) = 25a0b27773e5e025096cf08ad33243aaf143fbb8
+SHA1 (patch-ac) = 4cdfd0cff027524c38785a5a45bae747e3b151f7
diff -r db3ee6a89d14 -r 298136d0ca04 net/proftpd/patches/patch-ac
--- a/net/proftpd/patches/patch-ac      Thu Nov 23 12:23:28 2006 +0000
+++ b/net/proftpd/patches/patch-ac      Thu Nov 23 12:30:27 2006 +0000
@@ -1,47 +1,49 @@
-$NetBSD: patch-ac,v 1.4.6.1 2006/11/19 12:15:43 ghen Exp $
+$NetBSD: patch-ac,v 1.4.6.2 2006/11/23 12:30:27 ghen Exp $
 
---- src/main.c.orig    2006-11-18 14:24:35.000000000 +0000
+--- src/main.c.orig    2006-03-15 19:41:01.000000000 +0000
 +++ src/main.c
 @@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
  
-+#define PR_DEFAULT_CMD_BUFSZ   512
++#define PR_DEFAULT_CMD_BUFSZ    512
 +
  static char **Argv = NULL;
  static char *LastArgv = NULL;
  static const char *PidPath = PR_PID_FILE_PATH;
-@@ -820,16 +822,25 @@ static void cmd_loop(server_rec *server,
+@@ -820,17 +822,24 @@ static void cmd_loop(server_rec *server,
        pr_timer_reset(TIMER_IDLE, NULL);
  
      if (cmd_buf_size == -1) {
 -      long *buf_size = get_param_ptr(main_server->conf,
 -        "CommandBufferSize", FALSE);
-+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
-+        FALSE);
- 
+-
 -      if (buf_size == NULL || *buf_size <= 0)
 -        cmd_buf_size = 512;
-+      if (bufsz == NULL ||
-+          *bufsz <= 0) {
-+      pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
-+          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
-+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
-+
-+      } else if (*bufsz + 1 > sizeof(buf)) {
-+      pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
-+          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
-+      cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
- 
+-
 -      else if (*buf_size + 1 > sizeof(buf)) {
 -      pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
 -          "Resetting to 512.");
 -      cmd_buf_size = 512;
-+      } else {
-+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-+        cmd_buf_size = (long) *bufsz;
-       }
+-      }
++      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
++    if (bufsz == NULL) {
++      cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++    }
++    else if ( bufsz <= 0 ) {
++      pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++                 "given, resetting to default buffer size (%u)",
++               *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++      cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++    } else if (*bufsz + 1 > sizeof(buf)) {
++           pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++                      "given, using default buffer size (%u) instead",
++                      *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++           cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++         } else {
++           pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
++           cmd_buf_size = (long) *bufsz;
++         }
      }
  
+     buf[cmd_buf_size - 1] = '\0';