From a5ea553ef9d26e70d025f589f0741d63cad30a35 Mon Sep 17 00:00:00 2001
From: wiedi <wiedi@pkgsrc.org>
Date: Mon, 14 Mar 2016 22:47:10 +0000
Subject: [PATCH] Update net/proftpd (and modules) to 1.3.5b

1.3.5b - Released 10-Mar-2016
--------------------------------
- Bug 4187 - mod_geoip does not load all of the GeoIPTables properly.
- Bug 4191 - "Incorrect string value" reported by mod_sql_mysql for some UTF8
  characters.
- Bug 4097 - SSH rekey fails when using RSA hostkey smaller than 2048 bits.
- Bug 4198 - MLSD/MLST fact type "cdir" is incorrectly used for the current
  working directory.
- Bug 4201 - HiddenStores temporary files not removed when exceeding quota
  using SCP.
- Bug 4202 - MLSD lines not properly terminated with CRLF.
- Bug 4209 - Zero-length memory allocation possible, with undefined results.
- Bug 4210 - Avoid unbounded SFTP extended attribute key/values.
- Bug 4212 - Ensure that FTP data transfer commands fail appropriately when
  "RootRevoke on" is in effect.
- Bug 4217 - Handle FTP re-authentication attempts better.
- Bug 4223 - Permissions on files uploaded via STOU do not honor configured
  Umask.
- Bug 4227 - Support SFTP clients that send multiple INIT requests.
- Bug 4230 - TLSDHParamFile directive appears ignored because unexpected DH is
  chosen.
---
 net/proftpd-ldap/Makefile   |  3 +--
 net/proftpd-sqlite/Makefile |  3 +--
 net/proftpd/Makefile        |  3 +--
 net/proftpd/Makefile.common |  4 ++--
 net/proftpd/distinfo        | 10 +++++-----
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/net/proftpd-ldap/Makefile b/net/proftpd-ldap/Makefile
index 018252b27fda..99b9117bfe27 100644
--- a/net/proftpd-ldap/Makefile
+++ b/net/proftpd-ldap/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/03/14 22:47:10 wiedi Exp $
 
-PKGREVISION= 1
 .include "../../net/proftpd/Makefile.module"
 
 PROFTPD_MOD=	ldap
diff --git a/net/proftpd-sqlite/Makefile b/net/proftpd-sqlite/Makefile
index 7ed63cdd3917..73c0523a9839 100644
--- a/net/proftpd-sqlite/Makefile
+++ b/net/proftpd-sqlite/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2015/10/10 01:58:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2016/03/14 22:47:10 wiedi Exp $
 
-PKGREVISION= 1
 .include "../../net/proftpd/Makefile.module"
 
 PROFTPD_MOD=	sqlite
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 89cb6ab0769c..08c7055fbc79 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2016/03/05 11:29:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2016/03/14 22:47:10 wiedi Exp $
 
 .include "../../net/proftpd/Makefile.common"
 
-PKGREVISION=	3
 COMMENT=	Highly configurable FTP server software
 
 MODULES+=	\
diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common
index 17b87d9b92c4..9f458f706d2b 100644
--- a/net/proftpd/Makefile.common
+++ b/net/proftpd/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2015/10/23 08:37:35 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/03/14 22:47:10 wiedi Exp $
 
 # used by net/proftpd/Makefile
 # used by net/proftpd/Makefile.module
 
-DISTNAME=	proftpd-1.3.5a
+DISTNAME=	proftpd-1.3.5b
 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 22776af779a2..61e3544e68d4 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2015/11/04 00:35:28 agc Exp $
+$NetBSD: distinfo,v 1.45 2016/03/14 22:47:10 wiedi Exp $
 
-SHA1 (proftpd-1.3.5a.tar.gz) = 7c4027c207bdfe7c88b859810c7fa9b978b0524d
-RMD160 (proftpd-1.3.5a.tar.gz) = ff9050ee8c0fb741eb84ef815ad0974bf237193a
-SHA512 (proftpd-1.3.5a.tar.gz) = d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c
-Size (proftpd-1.3.5a.tar.gz) = 29988477 bytes
+SHA1 (proftpd-1.3.5b.tar.gz) = fd11ba8f2d157f4e59162a24b22f82cd7d32d3cd
+RMD160 (proftpd-1.3.5b.tar.gz) = 1a682879fbeb7f0ef61d944399650fc7f7da4982
+SHA512 (proftpd-1.3.5b.tar.gz) = 5bdb9718c85c26b92256d7b3791a6a5456bec3826801b7b68f4d493d202ac77179c8378ad06efc1a805efce639db266561d3beb4bc7af61ca1352fb4bdfd4e6a
+Size (proftpd-1.3.5b.tar.gz) = 29992107 bytes
 SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
 SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
 SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed