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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/proftpd Updated net/proftpd to 1.3.2rc2
From: martti <martti%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:39:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/424eb07c7a64
branches:  trunk
changeset: 547796:424eb07c7a64
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Oct 03 06:52:03 2008 +0000

description:
Updated net/proftpd to 1.3.2rc2

Fix for http://bugs.proftpd.org/show_bug.cgi?id=3115

diffstat:

 net/proftpd/Makefile         |   14 ++--
 net/proftpd/PLIST            |   16 ++++-
 net/proftpd/distinfo         |   16 +++--
 net/proftpd/patches/patch-aa |   14 ++--
 net/proftpd/patches/patch-ab |   14 ++--
 net/proftpd/patches/patch-ac |   16 +++--
 net/proftpd/patches/patch-ad |   80 +++++++++++++++++++++++++++++
 net/proftpd/patches/patch-ae |  117 +++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 250 insertions(+), 37 deletions(-)

diffs (truncated from 406 to 300 lines):

diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/Makefile
--- a/net/proftpd/Makefile      Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/Makefile      Fri Oct 03 06:52:03 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2008/06/12 02:14:41 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2008/10/03 06:52:03 martti Exp $
 
-DISTNAME=              proftpd-1.3.1
+DISTNAME=              proftpd-1.3.2rc2
 #PKGREVISION=          1
 CATEGORIES=            net
 MASTER_SITES=          ftp://ftp.proftpd.org/distrib/source/ \
@@ -20,8 +20,8 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake intltool
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --disable-sendfile
 CONFIGURE_ARGS+=       --enable-ctrls
 CONFIGURE_ARGS+=       --enable-nls
@@ -32,14 +32,14 @@
 
 RCD_SCRIPTS=           proftpd
 
-CONF_FILES=            ${PREFIX:Q}/share/examples/proftpd/basic.conf \
-                       ${PKG_SYSCONFDIR:Q}/proftpd.conf
+CONF_FILES=            ${PREFIX}/share/examples/proftpd/basic.conf \
+                       ${PKG_SYSCONFDIR}/proftpd.conf
 
 SUBST_CLASSES+=                man
 SUBST_MESSAGE.man=     Fixing paths in manual pages.
 SUBST_STAGE.man=       pre-configure
 SUBST_FILES.man=       utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in
-SUBST_SED.man=         -e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE:Q}/run,
+SUBST_SED.man=         -e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
 
 INSTALLATION_DIRS+=    share/doc/proftpd
 INSTALLATION_DIRS+=    share/examples/proftpd
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/PLIST
--- a/net/proftpd/PLIST Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/PLIST Fri Oct 03 06:52:03 2008 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2007/07/06 11:04:40 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/10/03 06:52:03 martti Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
 bin/ftpwho
+bin/prxs
 include/proftpd/auth.h
 include/proftpd/bindings.h
 include/proftpd/buildstamp.h
@@ -16,14 +17,15 @@
 include/proftpd/default_paths.h
 include/proftpd/dirtree.h
 include/proftpd/display.h
+include/proftpd/encode.h
 include/proftpd/env.h
 include/proftpd/event.h
+include/proftpd/expr.h
 include/proftpd/feat.h
 include/proftpd/fsio.h
 include/proftpd/ftp.h
 include/proftpd/glibc-glob.h
 include/proftpd/help.h
-include/proftpd/ident.h
 include/proftpd/inet.h
 include/proftpd/libsupp.h
 include/proftpd/log.h
@@ -45,14 +47,16 @@
 include/proftpd/response.h
 include/proftpd/scoreboard.h
 include/proftpd/sets.h
+include/proftpd/str.h
 include/proftpd/support.h
 include/proftpd/table.h
+include/proftpd/throttle.h
 include/proftpd/timers.h
 include/proftpd/trace.h
-include/proftpd/utf8.h
 include/proftpd/var.h
 include/proftpd/version.h
 include/proftpd/xferlog.h
+lib/pkgconfig/proftpd.pc
 man/man1/ftpcount.1
 man/man1/ftptop.1
 man/man1/ftpwho.1
@@ -82,6 +86,10 @@
 share/examples/proftpd/mod_sql.conf
 share/examples/proftpd/virtual.conf
 share/examples/rc.d/proftpd
-@dirrm share/doc/proftpd
+share/locale/en_US/LC_MESSAGES/proftpd.mo
+share/locale/it_IT/LC_MESSAGES/proftpd.mo
+share/locale/zh_CN/LC_MESSAGES/proftpd.mo
 @dirrm share/examples/proftpd
+@dirrm share/doc/proftpd
+@dirrm lib/proftpd
 @dirrm include/proftpd
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/distinfo
--- a/net/proftpd/distinfo      Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/distinfo      Fri Oct 03 06:52:03 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.25 2007/10/12 10:06:20 martti Exp $
+$NetBSD: distinfo,v 1.26 2008/10/03 06:52:03 martti Exp $
 
-SHA1 (proftpd-1.3.1.tar.bz2) = 0b54286492967172c5355e2f489f9665b46591e5
-RMD160 (proftpd-1.3.1.tar.bz2) = ed47f7a7c446b01c3d00d2d25d89573c787da905
-Size (proftpd-1.3.1.tar.bz2) = 2243888 bytes
-SHA1 (patch-aa) = d7ad034e763a2bf729c9af669c3094402bdd03b7
-SHA1 (patch-ab) = f214c7b321028bda1c27d654059b2a1d6aa73cbc
-SHA1 (patch-ac) = be33bb40718c4f5a124e2c80ad5dfe8db28e3af3
+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 (patch-aa) = e254d3a2d31ec43a408d80c8974f1b346fbc7e5a
+SHA1 (patch-ab) = 7f03db9449506499fa49361aed51f15f1b1043c9
+SHA1 (patch-ac) = 2de0ce81727c8823a3cba87c4631fe02153eba13
+SHA1 (patch-ad) = f65da6a6ff954c259af9123324876a60182cfac9
+SHA1 (patch-ae) = 3421c4b1084208834aac253883e3ac2326d79c6a
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/patches/patch-aa
--- a/net/proftpd/patches/patch-aa      Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/patches/patch-aa      Fri Oct 03 06:52:03 2008 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.9 2007/01/13 09:47:38 martti Exp $
+$NetBSD: patch-aa,v 1.10 2008/10/03 06:52:03 martti Exp $
+
+Make this pkgsrc friendly.
 
---- Makefile.in.orig   2007-01-10 02:19:02.000000000 +0000
-+++ Makefile.in        2007-01-13 11:40:16.000000000 +0000
-@@ -122,7 +122,7 @@
+--- Makefile.in.orig   2008-09-08 23:56:02.000000000 +0300
++++ Makefile.in        2008-10-03 09:35:29.000000000 +0300
+@@ -142,7 +142,7 @@
        $(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1   $(DESTDIR)$(mandir)/man1
        $(INSTALL_MAN) $(top_srcdir)/src/xferlog.5    $(DESTDIR)$(mandir)/man5
  
--install-all: install-proftpd install-modules install-utils install-conf install-man install-headers install-locales $(INSTALL_DEPS)
-+install-all: install-proftpd install-modules install-utils install-man install-headers install-locales $(INSTALL_DEPS)
+-install-all: install-proftpd install-modules install-utils install-conf install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS)
++install-all: install-proftpd install-modules install-utils install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS)
  
  install: all install-all
  
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/patches/patch-ab
--- a/net/proftpd/patches/patch-ab      Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/patches/patch-ab      Fri Oct 03 06:52:03 2008 +0000
@@ -1,9 +1,11 @@
-$NetBSD: patch-ab,v 1.7 2007/07/06 11:04:40 martti Exp $
+$NetBSD: patch-ab,v 1.8 2008/10/03 06:52:03 martti Exp $
+
+Make this pkgsrc friendly.
 
---- configure.orig     2007-05-23 00:01:32.000000000 +0300
-+++ configure  2007-07-06 13:52:59.000000000 +0300
-@@ -37098,7 +37098,7 @@
- _ACEOF
+--- configure.orig     2008-09-02 19:00:54.000000000 +0300
++++ configure  2008-10-03 09:35:50.000000000 +0300
+@@ -36925,7 +36925,7 @@
+ 
  
  cat >>confdefs.h <<_ACEOF
 -#define PR_RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
@@ -11,7 +13,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
-@@ -37106,7 +37106,7 @@
+@@ -36933,7 +36933,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/patches/patch-ac
--- a/net/proftpd/patches/patch-ac      Fri Oct 03 05:06:20 2008 +0000
+++ b/net/proftpd/patches/patch-ac      Fri Oct 03 06:52:03 2008 +0000
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.9 2007/07/06 11:04:40 martti Exp $
+$NetBSD: patch-ac,v 1.10 2008/10/03 06:52:03 martti Exp $
+
+Make this pkgsrc friendly.
 
---- configure.in.orig  2007-05-22 23:54:09.000000000 +0300
-+++ configure.in       2007-07-06 13:53:22.000000000 +0300
-@@ -2019,9 +2019,9 @@
- AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`")
- AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`")
- AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${datadir}/locale"`")
+--- 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 @@
+ locale_dir="`eval echo ${locale_dir}`"
+ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}/locale"`")
+ 
 -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`")
 +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`")
  AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
diff -r 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ad      Fri Oct 03 06:52:03 2008 +0000
@@ -0,0 +1,80 @@
+$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 2b3bad9519d8 -r 424eb07c7a64 net/proftpd/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ae      Fri Oct 03 06:52:03 2008 +0000
@@ -0,0 +1,117 @@
+$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
Prev by Date: [pkgsrc/trunk]: pkgsrc/editors/vim-share Updated editors/vim-share to 7.2.25
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/pine-pgp-filters Requires gpg. Bump revision.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/editors/vim-share Updated editors/vim-share to 7.2.25
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/pine-pgp-filters Requires gpg. Bump revision.
Indexes:
Home | Main Index | Thread Index | Old Index