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

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 (file)
index 0000000..a9ad0a3
--- /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 <github@pureftpd.org>
+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%
rename from net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
rename to net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
index 7dcc0d9aee3d1299e4f00b33637b95d6a51a836a..d448d8f15cd287586d9ba116c0109eb4106f2e84 100644 (file)
--- 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.47-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
new file mode 100644 (file)
index 0000000..412951b
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+       http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+
+REQUIRED_USE="implicittls? ( ssl )"
+
+DEPEND="caps? ( sys-libs/libcap )
+       charconv? ( virtual/libiconv )
+       ldap? ( >=net-nds/openldap-2.0.25 )
+       mysql? ( virtual/mysql )
+       pam? ( virtual/pam )
+       postgres? ( dev-db/postgresql:= )
+       ssl? (
+               !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
+               libressl? ( dev-libs/libressl:= )
+       )
+       sysquota? ( sys-fs/quota[-rpc] )
+       xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+       dev-libs/libsodium:=
+       net-ftp/ftpbase
+       selinux? ( sec-policy/selinux-ftp )"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.28-pam.patch"
+       "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
+)
+
+src_configure() {
+       # adjust max user length to something more appropriate
+       # for virtual hosts. See bug #62472 for details.
+       sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
+               -i "${S}/src/ftpd.h" || die "sed failed"
+
+       # Those features are only configurable like this, see bug #179375.
+       use anondel && append-cppflags -DANON_CAN_DELETE
+       use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
+       use anonren && append-cppflags -DANON_CAN_RENAME
+       use anonres && append-cppflags -DANON_CAN_RESUME
+       use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+
+       # Do not auto-use SSP -- let the user select this.
+       export ax_cv_check_cflags___fstack_protector_all=no
+
+       local myeconfargs=(
+               --enable-largefile
+               --with-altlog
+               --with-cookie
+               --with-diraliases
+               --with-extauth
+               --with-ftpwho
+               --with-language=${PUREFTPD_LANG:=english}
+               --with-peruserlimits
+               --with-privsep
+               --with-puredb
+               --with-quotas
+               --with-ratios
+               --with-throttling
+               --with-uploadscript
+               --with-virtualhosts
+               $(use_with charconv rfc2640)
+               $(use_with ldap)
+               $(use_with mysql)
+               $(use_with pam)
+               $(use_with paranoidmsg)
+               $(use_with postgres pgsql)
+               $(use_with ssl tls)
+               $(use_with implicittls)
+               $(use_with vchroot virtualchroot)
+               $(use_with sysquota sysquotas)
+               $(usex caps '' '--without-capabilities')
+               $(usex noiplog '--without-iplogging' '')
+               $(usex xinetd '' '--without-inetd')
+       )
+       econf "${myeconfargs[@]}"
+}
+
+src_install() {
+       local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
+
+       default
+
+       newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
+       newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
+
+       if use implicittls ; then
+               sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
+                       || die "Adjusting default server port for implicittls usage failed!"
+       fi
+
+       keepdir /var/lib/run/${PN}
+
+       if use xinetd ; then
+               insinto /etc/xinetd.d
+               newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
+       fi
+
+       if use ldap ; then
+               insinto /etc/openldap/schema
+               doins pureftpd.schema
+               insinto /etc/openldap
+               insopts -m 0600
+               doins pureftpd-ldap.conf
+       fi
+}
+
+pkg_postinst() {
+       if [[ -z "${REPLACING_VERSIONS}" ]]; then
+               # This is a new installation
+               elog
+               elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+               elog
+               ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+               ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+               ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+               ewarn
+               if use charconv ; then
+                       ewarn "Charset conversion is an *experimental* feature!"
+                       ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+               fi
+       fi
+}