commit: 6f9a62579c7893a902c0cf39c245e464d311befa Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Jan 11 12:37:33 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jan 11 12:38:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9a6257
net-ftp/pure-ftpd: Fixed segfault on login with newer glibc. Closes: https://bugs.gentoo.org/642034 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch | 22 ++++++++++++++++++++++ ...1.0.45-r1.ebuild => pure-ftpd-1.0.45-r2.ebuild} | 7 ++++--- ...1.0.45-r1.ebuild => pure-ftpd-1.0.47-r1.ebuild} | 10 +++++----- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch new file mode 100644 index 00000000000..a9ad0a30b9b --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch @@ -0,0 +1,22 @@ +From 27a5c200f9643ce907118aad169279b3a66a9e8a Mon Sep 17 00:00:00 2001 +From: Frank Denis <[email protected]> +Date: Sat, 4 Nov 2017 20:46:16 +0100 +Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements + +--- + src/ftpd.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ftpd.h b/src/ftpd.h +index 1beeab8..5bb1f6b 100644 +--- a/src/ftpd.h ++++ b/src/ftpd.h +@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it. + + #ifndef MAX_DATA_SIZE + # ifdef HAVE_LIBSODIUM +-# define MAX_DATA_SIZE (40 * 1024 * 1024) ++# define MAX_DATA_SIZE (70 * 1024 * 1024) + # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL) + # define MAX_DATA_SIZE (16 * 1024 * 1024) /* Max memory usage - SQL/LDAP need more */ + # else diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild similarity index 95% copy from net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild copy to net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild index 7dcc0d9aee3..d448d8f15cd 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,8 +37,9 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-ftp )" PATCHES=( - "${FILESDIR}"/${PN}-1.0.28-pam.patch - "${FILESDIR}"/${P}-openssl-1.1.patch + "${FILESDIR}/${PN}-1.0.28-pam.patch" + "${FILESDIR}/${P}-openssl-1.1.patch" + "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch" ) src_configure() { diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild similarity index 94% rename from net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild rename to net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild index 7dcc0d9aee3..412951b81a3 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils flag-o-matic +inherit flag-o-matic -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" DESCRIPTION="Fast, production-quality, standard-conformant FTP server" HOMEPAGE="http://www.pureftpd.org/"; @@ -37,8 +37,8 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-ftp )" PATCHES=( - "${FILESDIR}"/${PN}-1.0.28-pam.patch - "${FILESDIR}"/${P}-openssl-1.1.patch + "${FILESDIR}/${PN}-1.0.28-pam.patch" + "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch" ) src_configure() {
