Pullup ticket #3603 - requested by obache

net/proftpd security update

Revisions pulled up:
- net/proftpd/Makefile                                          1.64-1.65
- net/proftpd/distinfo                                          1.38-1.39
- net/proftpd/patches/patch-ab                                  1.13
- net/proftpd/patches/patch-ac                                  1.14
- net/proftpd/patches/patch-contrib_mod_tls.c                   1.2

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Oct  3 11:23:31 UTC 2011

   Modified Files:
   	pkgsrc/net/proftpd: Makefile distinfo
   	pkgsrc/net/proftpd/patches: patch-ab patch-ac patch-contrib_mod_tls.c

   Log Message:
   Changes 1.3.3f:
   * Fixes segfault if mod_sql_mysql and "SQLAuthenticate groupsetfast"
      configuration used.
   * Fixes mod_wrap syslog level (regression from Bug 3317).
   * Fixes mod_ifsession segfault if regular expression patterns used in
      a <VirtualHost> section.

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Wed Nov 16 09:05:04 UTC 2011

   Modified Files:
   	pkgsrc/net/proftpd: Makefile distinfo

   Log Message:
   Update proftpd to 1.3.3g.

   1.3.3g - Released 09-Nov-2011
   --------------------------------
   - Bug 3702 - ProFTPD with mod_sql_mysql dies of "Alarm clock" on FreeBSD.
   - Bug 3704 - Enable OpenSSL countermeasure against SSLv3/TLSv1 BEAST attacks.
      To disable this countermeasure, which may cause interoperability issues
      with some clients, use the NoEmptyFragments TLSOption.
   - Bug 3711 - Response pool use-after-free memory corruption error.

5 files changed, 29 insertions, 30 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 9942038590f..72ee833115f 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2011/07/03 01:57:06 dholland Exp $
+# $NetBSD: Makefile,v 1.63.4.1 2011/11/16 21:06:49 sbd Exp $
 
-DISTNAME=	proftpd-1.3.3e
-PKGREVISION=	1
+DISTNAME=	proftpd-1.3.3g
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 83122b467fa..985c44ea70e 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2011/05/20 11:15:01 adam Exp $
+$NetBSD: distinfo,v 1.37.4.1 2011/11/16 21:06:50 sbd Exp $
 
-SHA1 (proftpd-1.3.3e.tar.bz2) = b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f
-RMD160 (proftpd-1.3.3e.tar.bz2) = 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07
-Size (proftpd-1.3.3e.tar.bz2) = 4180369 bytes
+SHA1 (proftpd-1.3.3g.tar.bz2) = 70489c2b32c87b3637fd0cf2520773c5229f4ae3
+RMD160 (proftpd-1.3.3g.tar.bz2) = 29bdade06f63ace05811e809b0a3600ea6ed61fe
+Size (proftpd-1.3.3g.tar.bz2) = 4204504 bytes
 SHA1 (patch-aa) = a684d275e0b872f9d7d57b8b4d5e97a630a48eaf
-SHA1 (patch-ab) = 9567cb34dab7feee696cddea4dba7930e500460e
-SHA1 (patch-ac) = d1ba5ec4265337c648da2f76460694a5a7a2dd10
-SHA1 (patch-contrib_mod_tls.c) = 1258e147e27976d06d8a85aef6a13cd50552c0f8
+SHA1 (patch-ab) = 322b94a3c327da55891fbe2590f24c1d3bd751bc
+SHA1 (patch-ac) = d1727a21411f4c2947f0a482ad407fe05ac20b53
+SHA1 (patch-contrib_mod_tls.c) = d82a58fa51572787679a17d1d1c56a219eefcb77
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
index 6ab9e8ae206..483f9cb4b03 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.12 2010/11/07 12:21:09 obache Exp $
+$NetBSD: patch-ab,v 1.12.8.1 2011/11/16 21:06:50 sbd Exp $
 
 Portability fix.
 
 --- configure.orig	2010-04-13 22:01:35.000000000 +0000
 +++ configure
-@@ -12866,7 +12866,7 @@ if test "${with_modules+set}" = set; the
-     if test x"$withval" != x; then
-       modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
-       for amodule in $modules_list; do
--        if test x"$amodule" == xmod_dso ; then
-+        if test x"$amodule" = xmod_dso ; then
-           { { echo "$as_me:$LINENO: error: use --enable-dso instead of --with-modules=mod_dso for DSO support" >&5
+@@ -12892,7 +12892,7 @@ echo "$as_me: error: --with-modules para
+       if test x"$withval" != xno; then
+         modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
+         for amodule in $modules_list; do
+-          if test x"$amodule" == xmod_dso ; then
++          if test x"$amodule" = xmod_dso ; then
+             { { echo "$as_me:$LINENO: error: use --enable-dso instead of --with-modules=mod_dso for DSO support" >&5
  echo "$as_me: error: use --enable-dso instead of --with-modules=mod_dso for DSO support" >&2;}
     { (exit 1); exit 1; }; }
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
index 3d417d5237c..f0f66952639 100644
--- a/net/proftpd/patches/patch-ac
+++ b/net/proftpd/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.13 2010/11/07 12:21:10 obache Exp $
+$NetBSD: patch-ac,v 1.13.8.1 2011/11/16 21:06:50 sbd Exp $
 
 portability fix.
 
 --- configure.in.orig	2010-04-13 21:57:34.000000000 +0000
 +++ configure.in
-@@ -331,7 +331,7 @@ AC_ARG_WITH(modules,
-     if test x"$withval" != x; then
-       modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
-       for amodule in $modules_list; do
--        if test x"$amodule" == xmod_dso ; then
-+        if test x"$amodule" = xmod_dso ; then
-           AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support])
-         fi
-       done
+@@ -348,7 +348,7 @@ AC_ARG_WITH(modules,
+       if test x"$withval" != xno; then
+         modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
+         for amodule in $modules_list; do
+-          if test x"$amodule" == xmod_dso ; then
++          if test x"$amodule" = xmod_dso ; then
+             AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support])
+           fi
+         done
diff --git a/net/proftpd/patches/patch-contrib_mod_tls.c b/net/proftpd/patches/patch-contrib_mod_tls.c
index c1ef4d2a7aa..01b73f0373a 100644
--- a/net/proftpd/patches/patch-contrib_mod_tls.c
+++ b/net/proftpd/patches/patch-contrib_mod_tls.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-contrib_mod_tls.c,v 1.1 2011/03/25 13:58:37 adam Exp $
+$NetBSD: patch-contrib_mod_tls.c,v 1.1.6.1 2011/11/16 21:06:50 sbd Exp $
 
 --- contrib/mod_tls.c.orig	2011-03-25 13:53:45.000000000 +0000
 +++ contrib/mod_tls.c
-@@ -7217,7 +7217,7 @@ static int tls_sess_init(void) {
+@@ -7235,7 +7235,7 @@ static int tls_sess_init(void) {
    if (opts != NULL)
      tls_opts = *opts;