commit:     4dffec372d26d2a4f2dd4c674db18b1c9a7dc375
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 21:02:35 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 <slyfox <AT> 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.</longdescription>
                <flag name="shaper">Enable support for the mod_shaper 
module</flag>
                <flag name="sftp">Enable support for the mod_sftp module and 
optionally mod_sftp_sql and mod_sftp_pam if matching USE flags are 
enabled</flag>
                <flag name="sitemisc">Enable support for the sitemisc 
module</flag>
+               <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for 
password encryption an key exchange</flag>
                <flag name="softquota">Enable support for the quotatab 
module</flag>
                <flag name="trace">Build with trace support. Should not be 
enabled on production servers</flag>
                <flag name="unique_id">Enable support for the mod_unique_id 
module, every connection gets unique ID.</flag>

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) \

Reply via email to