From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F51A138334 for ; Thu, 7 Feb 2019 21:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47033E0A82; Thu, 7 Feb 2019 21:02:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09D00E0A82 for ; Thu, 7 Feb 2019 21:02:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30C9B335DD1 for ; Thu, 7 Feb 2019 21:02:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFA1A44B for ; Thu, 7 Feb 2019 21:02:51 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1549573355.4dffec372d26d2a4f2dd4c674db18b1c9a7dc375.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/proftpd/metadata.xml net-ftp/proftpd/proftpd-1.3.6-r2.ebuild X-VCS-Directories: net-ftp/proftpd/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 4dffec372d26d2a4f2dd4c674db18b1c9a7dc375 X-VCS-Branch: master Date: Thu, 7 Feb 2019 21:02:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3b6919c-f969-4b7c-b3a6-24afd4e202ae X-Archives-Hash: dbd8d396c38bcb6b92333b318ccbfdb9 commit: 4dffec372d26d2a4f2dd4c674db18b1c9a7dc375 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Feb 7 21:02:35 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Feb 7 21:02:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dffec37 net-ftp/proftpd: expose USE=sodium To avoid automagic dependency on dev-libs/libsodium we now explicitly pass --disable-sodium. Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/proftpd/metadata.xml | 1 + net-ftp/proftpd/proftpd-1.3.6-r2.ebuild | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml index 7434ca7e638..d63407ebc65 100644 --- a/net-ftp/proftpd/metadata.xml +++ b/net-ftp/proftpd/metadata.xml @@ -33,6 +33,7 @@ server. Enable support for the mod_shaper module Enable support for the mod_sftp module and optionally mod_sftp_sql and mod_sftp_pam if matching USE flags are enabled Enable support for the sitemisc module + Use dev-libs/libsodium for password encryption an key exchange Enable support for the quotatab module Build with trace support. Should not be enabled on production servers Enable support for the mod_unique_id module, every connection gets unique ID. diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild index 6585ad48c89..3286db7e107 100644 --- a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,7 +29,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius - ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test unique_id vroot xinetd" + ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd" # TODO: geoip REQUIRED_USE="ban? ( ctrls ) msg? ( ctrls ) @@ -52,6 +52,7 @@ CDEPEND="acl? ( virtual/acl ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) + sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) xinetd? ( virtual/inetd )" DEPEND="${CDEPEND} @@ -220,6 +221,7 @@ src_configure() { $(use_enable ssl openssl) \ $(use_enable pam auth-pam) \ $(use_enable pcre) \ + $(use_enable sodium) \ $(use_enable test tests) \ --enable-trace \ $(use_enable userland_GNU shadow) \