| 1 |
commit: 4dffec372d26d2a4f2dd4c674db18b1c9a7dc375 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 7 21:02:35 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 7 21:02:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dffec37 |
| 7 |
|
| 8 |
net-ftp/proftpd: expose USE=sodium |
| 9 |
|
| 10 |
To avoid automagic dependency on dev-libs/libsodium |
| 11 |
we now explicitly pass --disable-sodium. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 15 |
|
| 16 |
net-ftp/proftpd/metadata.xml | 1 + |
| 17 |
net-ftp/proftpd/proftpd-1.3.6-r2.ebuild | 6 ++++-- |
| 18 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml |
| 21 |
index 7434ca7e638..d63407ebc65 100644 |
| 22 |
--- a/net-ftp/proftpd/metadata.xml |
| 23 |
+++ b/net-ftp/proftpd/metadata.xml |
| 24 |
@@ -33,6 +33,7 @@ server.</longdescription> |
| 25 |
<flag name="shaper">Enable support for the mod_shaper module</flag> |
| 26 |
<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> |
| 27 |
<flag name="sitemisc">Enable support for the sitemisc module</flag> |
| 28 |
+ <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag> |
| 29 |
<flag name="softquota">Enable support for the quotatab module</flag> |
| 30 |
<flag name="trace">Build with trace support. Should not be enabled on production servers</flag> |
| 31 |
<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag> |
| 32 |
|
| 33 |
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild |
| 34 |
index 6585ad48c89..3286db7e107 100644 |
| 35 |
--- a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild |
| 36 |
+++ b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild |
| 37 |
@@ -1,4 +1,4 @@ |
| 38 |
-# Copyright 1999-2018 Gentoo Foundation |
| 39 |
+# Copyright 1999-2019 Gentoo Authors |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
EAPI=6 |
| 43 |
@@ -29,7 +29,7 @@ SLOT="0" |
| 44 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 45 |
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 |
| 46 |
kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 47 |
- ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test unique_id vroot xinetd" |
| 48 |
+ ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd" |
| 49 |
# TODO: geoip |
| 50 |
REQUIRED_USE="ban? ( ctrls ) |
| 51 |
msg? ( ctrls ) |
| 52 |
@@ -52,6 +52,7 @@ CDEPEND="acl? ( virtual/acl ) |
| 53 |
pam? ( virtual/pam ) |
| 54 |
pcre? ( dev-libs/libpcre ) |
| 55 |
postgres? ( dev-db/postgresql:= ) |
| 56 |
+ sodium? ( dev-libs/libsodium:0= ) |
| 57 |
sqlite? ( dev-db/sqlite:3 ) |
| 58 |
xinetd? ( virtual/inetd )" |
| 59 |
DEPEND="${CDEPEND} |
| 60 |
@@ -220,6 +221,7 @@ src_configure() { |
| 61 |
$(use_enable ssl openssl) \ |
| 62 |
$(use_enable pam auth-pam) \ |
| 63 |
$(use_enable pcre) \ |
| 64 |
+ $(use_enable sodium) \ |
| 65 |
$(use_enable test tests) \ |
| 66 |
--enable-trace \ |
| 67 |
$(use_enable userland_GNU shadow) \ |
Archives