Mon Apr 20 12:50:02 2020 UTC ()
Upgrade to 1.3.6c:

1.3.6c
---------
  + Fixed regression in directory listing latency (Issue #863).
  + Detect OpenSSH-specific formatted SFTPHostKeys, and log hint for
    converting them to supported format.
  + Fixed use-after-free vulnerability during data transfers (Issue #903).
  + Fixed out-of-bounds read in mod_cap by updating the bundled libcap
    (Issue #902).

1.3.6b
---------
  + Fixed pre-authentication remote denial-of-service issue (Issue #846).
  + Backported fix for building mod_sql_mysql using MySQL 8 (Issue #824).

1.3.6a
---------
  + Fixed symlink navigation (Bug#4332).
  + Fixed building of mod_sftp using OpenSSL 1.1.x releases (Issue#674).
  + Fixed SITE COPY honoring of <Limit> restrictions (Bug#4372).
  + Fixed segfault on login when using mod_sftp + mod_sftp_pam (Issue#656).
  + Fixed restarts when using mod_facl as a static module.


(christos)
diff -r1.89 -r1.90 pkgsrc/net/proftpd/Makefile
diff -r1.10 -r1.11 pkgsrc/net/proftpd/Makefile.common
diff -r1.50 -r1.51 pkgsrc/net/proftpd/distinfo
cvs diff -r1.89 -r1.90 pkgsrc/net/proftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile 2020/01/18 21:50:24 1.89
+++ pkgsrc/net/proftpd/Makefile 2020/04/20 12:50:02 1.90
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.89 2020/01/18 21:50:24 jperkin Exp $ 1# $NetBSD: Makefile,v 1.90 2020/04/20 12:50:02 christos Exp $
2 2
3#PKGREVISION= 2 3#PKGREVISION= 2
4PKGREVISION= 1 
5.include "../../net/proftpd/Makefile.common" 4.include "../../net/proftpd/Makefile.common"
6 5
7COMMENT= Highly configurable FTP server software 6COMMENT= Highly configurable FTP server software
8 7
9MODULES+= \ 8MODULES+= \
10 mod_ban \ 9 mod_ban \
11 mod_copy \ 10 mod_copy \
12 mod_ctrls_admin \ 11 mod_ctrls_admin \
13 mod_deflate \ 12 mod_deflate \
14 mod_dnsbl \ 13 mod_dnsbl \
15 mod_dynmasq \ 14 mod_dynmasq \
16 mod_exec \ 15 mod_exec \
17 mod_ifsession \ 16 mod_ifsession \
cvs diff -r1.10 -r1.11 pkgsrc/net/proftpd/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile.common 2019/12/09 19:22:57 1.10
+++ pkgsrc/net/proftpd/Makefile.common 2020/04/20 12:50:02 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.10 2019/12/09 19:22:57 nros Exp $ 1# $NetBSD: Makefile.common,v 1.11 2020/04/20 12:50:02 christos Exp $
2 2
3# used by net/proftpd/Makefile 3# used by net/proftpd/Makefile
4# used by net/proftpd/Makefile.module 4# used by net/proftpd/Makefile.module
5 5
6DISTNAME= proftpd-1.3.6 6DISTNAME= proftpd-1.3.6c
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ 8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/
9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/ 9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/
10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ 10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
11 11
12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/ 12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/
13#PATCH_DIST_STRIP= -p1 13#PATCH_DIST_STRIP= -p1
14# For CVE-2017-7418 14# For CVE-2017-7418
15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch 15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch
16 16
17MAINTAINER= pkgsrc-users@NetBSD.org 17MAINTAINER= pkgsrc-users@NetBSD.org
18HOMEPAGE= http://www.proftpd.org/ 18HOMEPAGE= http://www.proftpd.org/
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
cvs diff -r1.50 -r1.51 pkgsrc/net/proftpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/proftpd/distinfo 2019/12/19 12:52:28 1.50
+++ pkgsrc/net/proftpd/distinfo 2020/04/20 12:50:02 1.51
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.50 2019/12/19 12:52:28 nros Exp $ 1$NetBSD: distinfo,v 1.51 2020/04/20 12:50:02 christos Exp $
2 2
3SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2 3SHA1 (proftpd-1.3.6c.tar.gz) = 661fe96f6d4403e91bd2199ff8b5d8f0413ce9e6
4RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6 4RMD160 (proftpd-1.3.6c.tar.gz) = 0fcb3453fef0c5a25b9605940b5840eacead8f40
5SHA512 (proftpd-1.3.6.tar.gz) = 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 5SHA512 (proftpd-1.3.6c.tar.gz) = 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
6Size (proftpd-1.3.6.tar.gz) = 20251898 bytes 6Size (proftpd-1.3.6c.tar.gz) = 20271908 bytes
7SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812 7SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812
8SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 8SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
9SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816 9SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816
10SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200 10SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200
11SHA1 (patch-contrib_mod__load_mod__load.c) = c51abd46ffc950b5baec615a0fdaf92c993414e3 11SHA1 (patch-contrib_mod__load_mod__load.c) = c51abd46ffc950b5baec615a0fdaf92c993414e3
12SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5 12SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5
13SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee 13SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
14SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed 14SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed
15SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c 15SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c
16SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48 16SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48
17SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88 17SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88
18SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510 18SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510