summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorkim <kim>2017-04-05 17:36:00 +0000
committerkim <kim>2017-04-05 17:36:00 +0000
commit8f70465c1c08a3dc4f364e2a2900dfc4fc466c6d (patch)
treecb5aefd096f04cf962d684d00e38894e55fbce2c /net
parentb6ac7bfed3d08355c98274d063aa751e1e02df5b (diff)
downloadpkgsrc-8f70465c1c08a3dc4f364e2a2900dfc4fc466c6d.tar.gz
Update net/proftpd (and modules) to 1.3.5d with a fix for CVE-2017-7418
1.3.5d - Released 15-Jan-2017 -------------------------------- - Bug 4283 - All FTP logins treated as anonymous logins again. This is a regression of Bug#3307. 1.3.5c - Released 14-Jan-2017 -------------------------------- - Bug 4254 - SSH rekey during authentication can cause issues with clients. - Bug 4257 - Recursive SCP uploads of multiple directories not handled properly. - Bug 4259 - LIST returns different results for file, depending on path syntax. - Bug 4255 - "AuthAliasOnly on" in server config breaks anonymous logins. - Bug 4272 - CapabilitiesEngine directive not honored for <IfUser>/<IfGroup> sections. - Bug 4275 - Support OpenSSL 1.1.x API. - Bug 4278 - Memory leak when mod_facl is used.
Diffstat (limited to 'net')
-rw-r--r--net/proftpd-postgresql/Makefile3
-rw-r--r--net/proftpd-sqlite/Makefile3
-rw-r--r--net/proftpd/Makefile3
-rw-r--r--net/proftpd/Makefile.common10
-rw-r--r--net/proftpd/distinfo14
5 files changed, 19 insertions, 14 deletions
diff --git a/net/proftpd-postgresql/Makefile b/net/proftpd-postgresql/Makefile
index 3e1a1ad7c07..d6c5534230e 100644
--- a/net/proftpd-postgresql/Makefile
+++ b/net/proftpd-postgresql/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2016/10/09 21:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/05 17:36:00 kim Exp $
-PKGREVISION= 1
.include "../../net/proftpd/Makefile.module"
PROFTPD_MOD= postgresql
diff --git a/net/proftpd-sqlite/Makefile b/net/proftpd-sqlite/Makefile
index 084153216d1..8f7813c2978 100644
--- a/net/proftpd-sqlite/Makefile
+++ b/net/proftpd-sqlite/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.5 2016/12/04 05:17:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/04/05 17:36:00 kim Exp $
-PKGREVISION= 2
.include "../../net/proftpd/Makefile.module"
PROFTPD_MOD= sqlite
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index fe672a55d8c..a550bbaedb1 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.84 2016/07/09 06:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2017/04/05 17:36:00 kim Exp $
-PKGREVISION= 1
.include "../../net/proftpd/Makefile.common"
COMMENT= Highly configurable FTP server software
diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common
index 10c1cf2e3dc..48e9e405e28 100644
--- a/net/proftpd/Makefile.common
+++ b/net/proftpd/Makefile.common
@@ -1,14 +1,19 @@
-# $NetBSD: Makefile.common,v 1.4 2017/01/19 18:52:20 agc Exp $
+# $NetBSD: Makefile.common,v 1.5 2017/04/05 17:36:00 kim Exp $
# used by net/proftpd/Makefile
# used by net/proftpd/Makefile.module
-DISTNAME= proftpd-1.3.5b
+DISTNAME= proftpd-1.3.5d
CATEGORIES= net
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/
MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/
MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
+PATCH_SITES= https://github.com/proftpd/proftpd/commit/
+PATCH_DIST_STRIP= -p1
+# For CVE-2017-7418
+PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch
+
MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.proftpd.org/
LICENSE= gnu-gpl-v2
@@ -16,7 +21,6 @@ LICENSE= gnu-gpl-v2
DISTINFO_FILE= ${.CURDIR}/../../net/proftpd/distinfo
PATCHDIR= ${.CURDIR}/../../net/proftpd/patches
-
USE_TOOLS+= gmake intltool msgfmt perl:run
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 61e3544e68d..073f13b4d21 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.45 2016/03/14 22:47:10 wiedi Exp $
+$NetBSD: distinfo,v 1.46 2017/04/05 17:36:00 kim Exp $
-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 (ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch) = a508c2b37482b178d8ff7b06e45d36044818b5f8
+RMD160 (ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch) = 5cc12fd67e6c722151f0d0c2a22365aff16f7219
+SHA512 (ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch) = 7cfadcdb33eff71925d61c78d9d54fe171df3c161d43a940485bd70965046da4ad82d2381d94452dee80548b3131be6801d4f85bbfb2fc3afc7b9a872a00d707
+Size (ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch) = 3851 bytes
+SHA1 (proftpd-1.3.5d.tar.gz) = e7271c9f6df331eda393a834ad66ff60eff134ca
+RMD160 (proftpd-1.3.5d.tar.gz) = 2052a7c41824c8ce9558fd11c78843b1b07ab6e7
+SHA512 (proftpd-1.3.5d.tar.gz) = 3297ddd1f11d46123bbe46488d75fa7a6dcdf2c2d6e7e880a78a427f9f1e9901878dab179e41092e0b9864a615d8ba0b0bf444d4f829870e993e3169c7141c37
+Size (proftpd-1.3.5d.tar.gz) = 29966560 bytes
SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed