[pkgsrc/trunk]: pkgsrc/net/proftpd Updated net/proftpd to 1.3.2rc3

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/98f86e5b5f54
branches:  trunk
changeset: 550395:98f86e5b5f54
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Nov 21 08:00:36 2008 +0000

description:
Updated net/proftpd to 1.3.2rc3

* Bug fixes

diffstat:

 net/proftpd/Makefile         |    4 +-
 net/proftpd/distinfo         |   14 ++--
 net/proftpd/patches/patch-ab |   10 +-
 net/proftpd/patches/patch-ac |   10 +-
 net/proftpd/patches/patch-ad |   80 -----------------------------
 net/proftpd/patches/patch-ae |  117 -------------------------------------------
 6 files changed, 18 insertions(+), 217 deletions(-)

diffs (285 lines):

diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/Makefile
--- a/net/proftpd/Makefile      Fri Nov 21 08:00:31 2008 +0000
+++ b/net/proftpd/Makefile      Fri Nov 21 08:00:36 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2008/10/04 02:25:59 obache Exp $
+# $NetBSD: Makefile,v 1.50 2008/11/21 08:00:36 martti Exp $
 
-DISTNAME=              proftpd-1.3.2rc2
+DISTNAME=              proftpd-1.3.2rc3
 #PKGREVISION=          1
 CATEGORIES=            net
 MASTER_SITES=          ftp://ftp.proftpd.org/distrib/source/ \
diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/distinfo
--- a/net/proftpd/distinfo      Fri Nov 21 08:00:31 2008 +0000
+++ b/net/proftpd/distinfo      Fri Nov 21 08:00:36 2008 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.26 2008/10/03 06:52:03 martti Exp $
+$NetBSD: distinfo,v 1.27 2008/11/21 08:00:36 martti Exp $
 
-SHA1 (proftpd-1.3.2rc2.tar.bz2) = 94c5e71a7be7e65ae04d97df62c8b3675398c3b6
-RMD160 (proftpd-1.3.2rc2.tar.bz2) = 4048327e14ce4e03075bbfdb6de4adb4d5e23f61
-Size (proftpd-1.3.2rc2.tar.bz2) = 2356053 bytes
+SHA1 (proftpd-1.3.2rc3.tar.bz2) = 941e283d04e63d14f62556330b3fce75436af0b2
+RMD160 (proftpd-1.3.2rc3.tar.bz2) = 20e26b46baa42419cd0ad86899c7c3cb60dcb5e1
+Size (proftpd-1.3.2rc3.tar.bz2) = 2407996 bytes
 SHA1 (patch-aa) = e254d3a2d31ec43a408d80c8974f1b346fbc7e5a
-SHA1 (patch-ab) = 7f03db9449506499fa49361aed51f15f1b1043c9
-SHA1 (patch-ac) = 2de0ce81727c8823a3cba87c4631fe02153eba13
-SHA1 (patch-ad) = f65da6a6ff954c259af9123324876a60182cfac9
-SHA1 (patch-ae) = 3421c4b1084208834aac253883e3ac2326d79c6a
+SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306
+SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785
diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/patches/patch-ab
--- a/net/proftpd/patches/patch-ab      Fri Nov 21 08:00:31 2008 +0000
+++ b/net/proftpd/patches/patch-ab      Fri Nov 21 08:00:36 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.8 2008/10/03 06:52:03 martti Exp $
+$NetBSD: patch-ab,v 1.9 2008/11/21 08:00:36 martti Exp $
 
 Make this pkgsrc friendly.
 
---- configure.orig     2008-09-02 19:00:54.000000000 +0300
-+++ configure  2008-10-03 09:35:50.000000000 +0300
-@@ -36925,7 +36925,7 @@
+--- configure.orig     2008-11-19 05:54:50.000000000 +0200
++++ configure  2008-11-21 09:55:06.000000000 +0200
+@@ -37222,7 +37222,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -13,7 +13,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
-@@ -36933,7 +36933,7 @@
+@@ -37230,7 +37230,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/patches/patch-ac
--- a/net/proftpd/patches/patch-ac      Fri Nov 21 08:00:31 2008 +0000
+++ b/net/proftpd/patches/patch-ac      Fri Nov 21 08:00:36 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.10 2008/10/03 06:52:03 martti Exp $
+$NetBSD: patch-ac,v 1.11 2008/11/21 08:00:36 martti Exp $
 
 Make this pkgsrc friendly.
 
---- configure.in.orig  2008-09-02 18:54:49.000000000 +0300
-+++ configure.in       2008-10-03 09:36:41.000000000 +0300
-@@ -2067,9 +2067,9 @@
+--- configure.in.orig  2008-11-19 05:51:38.000000000 +0200
++++ configure.in       2008-11-21 09:55:26.000000000 +0200
+@@ -2111,9 +2111,9 @@
  locale_dir="`eval echo ${locale_dir}`"
- AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}/locale"`")
+ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
  
 -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`")
 +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`")
diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/patches/patch-ad
--- a/net/proftpd/patches/patch-ad      Fri Nov 21 08:00:31 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/10/03 06:52:03 martti Exp $
-
-http://bugs.proftpd.org/show_bug.cgi?id=3115
-
-Index: src/main.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/src/main.c,v
-retrieving revision 1.344
-diff -u -r1.344 main.c
---- src/main.c 8 Sep 2008 00:47:11 -0000       1.344
-+++ src/main.c 20 Sep 2008 20:10:49 -0000
-@@ -516,20 +516,32 @@
- static long get_max_cmd_len(size_t buflen) {
-   long res;
-   int *bufsz = NULL;
-+  size_t default_cmd_bufsz;
- 
-+  /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
-+   * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
-+   * properly.
-+   */
-+  default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
-+  if (default_cmd_bufsz > buflen) {
-+    default_cmd_bufsz = buflen;
-+  }
-+ 
-   bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
-   if (bufsz == NULL) {
--    res = PR_DEFAULT_CMD_BUFSZ;
-+    res = default_cmd_bufsz;
- 
-   } else if (*bufsz <= 0) {
-     pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) given, "
--      "using default buffer size (%u) instead", *bufsz, PR_DEFAULT_CMD_BUFSZ);
--    res = PR_DEFAULT_CMD_BUFSZ;
-+      "using default buffer size (%lu) instead", *bufsz,
-+      (unsigned long) default_cmd_bufsz);
-+    res = default_cmd_bufsz;
- 
-   } else if (*bufsz + 1 > buflen) {
-     pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) given, "
--      "using default buffer size (%u) instead", *bufsz, PR_DEFAULT_CMD_BUFSZ);
--    res = PR_DEFAULT_CMD_BUFSZ;
-+      "using default buffer size (%lu) instead", *bufsz,
-+      (unsigned long) default_cmd_bufsz);
-+    res = default_cmd_bufsz;
- 
-   } else {
-     pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-@@ -577,11 +589,26 @@
-     return -1;
-   }
- 
--  memset(buf, '\0', sizeof(buf));
-+  while (TRUE) {
-+    pr_signals_handle();
- 
--  if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
--      session.c->outstrm) == NULL)
--    return -1;
-+    memset(buf, '\0', sizeof(buf));
-+
-+    if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
-+        session.c->outstrm) == NULL) {
-+
-+      if (errno == E2BIG) {
-+        /* The client sent a too-long command which was ignored; give
-+         * them another chance?
-+         */
-+       continue;
-+      }
-+
-+      return -1;
-+    }
-+
-+    break;
-+  }
- 
-   if (cmd_bufsz == -1)
-     cmd_bufsz = get_max_cmd_len(sizeof(buf));
diff -r 574110da3537 -r 98f86e5b5f54 net/proftpd/patches/patch-ae
--- a/net/proftpd/patches/patch-ae      Fri Nov 21 08:00:31 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2008/10/03 06:52:03 martti Exp $
-
-http://bugs.proftpd.org/show_bug.cgi?id=3115
-
-Index: src/netio.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/src/netio.c,v
-retrieving revision 1.33
-diff -u -r1.33 netio.c
---- src/netio.c        3 Apr 2008 03:14:31 -0000       1.33
-+++ src/netio.c        20 Sep 2008 20:10:49 -0000
-@@ -1,6 +1,6 @@
- /*
-  * ProFTPD - FTP server daemon
-- * Copyright (c) 2001-2007 The ProFTPD Project team
-+ * Copyright (c) 2001-2008 The ProFTPD Project team
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -30,19 +30,19 @@
- #include <signal.h>
- 
- #ifndef IAC
--#define IAC   255
-+# define IAC  255
- #endif
- #ifndef DONT
--#define DONT  254
-+# define DONT 254
- #endif
- #ifndef DO
--#define DO    253
-+# define DO   253
- #endif
- #ifndef WONT
--#define WONT  252
-+# define WONT 252
- #endif
- #ifndef WILL
--#define WILL  251
-+# define WILL 251
- #endif
- 
- static const char *trace_channel = "netio";
-@@ -51,6 +51,17 @@
- static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
- static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
- 
-+/* Used to track whether the previous text read from the client's control
-+ * connection was a properly-terminated command.  If so, then read in the
-+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
-+ * command), then read in the next/current text, but ignore it.  Only clear
-+ * this flag if the next/current command can be read as per normal.
-+ *
-+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
-+ * saw_newline flag, for handling too-long commands from clients.
-+ */
-+static int properly_terminated_prev_command = TRUE;
-+
- static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
-   pool *netio_pool = NULL;
-   pr_netio_stream_t *nstrm = NULL;
-@@ -950,7 +961,7 @@
-   char *bp = buf;
-   unsigned char cp;
-   static unsigned char mode = 0;
--  int toread, handle_iac = TRUE;
-+  int toread, handle_iac = TRUE, saw_newline = FALSE;
-   pr_buffer_t *pbuf = NULL;
- 
-   if (buflen == 0) {
-@@ -983,8 +994,9 @@
-           *bp = '\0';
-           return buf;
- 
--        } else
-+        } else {
-           return NULL;
-+        }
-       }
- 
-       pbuf->remaining = pbuf->buflen - toread;
-@@ -1049,6 +1061,8 @@
-       toread--;
-       *bp++ = *pbuf->current++;
-       pbuf->remaining++;
-+
-+      saw_newline = TRUE;
-       break;
-     }
- 
-@@ -1056,6 +1070,25 @@
-       pbuf->current = NULL;
-   }
- 
-+  if (!saw_newline) {
-+    /* If we haven't seen a newline, then assume the client is deliberately
-+     * sending a too-long command, trying to exploit buffer sizes and make
-+     * the server make some possibly bad assumptions.
-+     */
-+
-+    properly_terminated_prev_command = FALSE;
-+    errno = E2BIG;
-+    return NULL;
-+  }
-+
-+  if (!properly_terminated_prev_command) {
-+    properly_terminated_prev_command = TRUE;
-+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
-+    errno = E2BIG;
-+    return NULL;
-+  }
-+
-+  properly_terminated_prev_command = TRUE;
-   *bp = '\0';
-   return buf;
- }