| 1 |
commit: b38b28a3f608c898fbea485a78c8c0207486634b |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 23 11:28:12 2019 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 23 11:31:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38b28a3 |
| 7 |
|
| 8 |
net-dns/bind: make ssl no-op |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-dns/bind/bind-9.14.4.ebuild | 10 +++------- |
| 14 |
net-dns/bind/bind-9.15.2.ebuild | 10 +++------- |
| 15 |
2 files changed, 6 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild |
| 18 |
index 02378940927..13e3952bdc3 100644 |
| 19 |
--- a/net-dns/bind/bind-9.14.4.ebuild |
| 20 |
+++ b/net-dns/bind/bind-9.14.4.ebuild |
| 21 |
@@ -39,7 +39,7 @@ SLOT="0" |
| 22 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 23 |
# -berkdb by default re bug 602682 |
| 24 |
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi |
| 25 |
-json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs |
| 26 |
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs |
| 27 |
urandom xml +zlib" |
| 28 |
# sdb-ldap - patch broken |
| 29 |
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
| 30 |
@@ -53,11 +53,8 @@ REQUIRED_USE=" |
| 31 |
python? ( ${PYTHON_REQUIRED_USE} )" |
| 32 |
# sdb-ldap? ( dlz ) |
| 33 |
|
| 34 |
-DEPEND=" |
| 35 |
- ssl? ( |
| 36 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
| 37 |
- libressl? ( dev-libs/libressl ) |
| 38 |
- ) |
| 39 |
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) |
| 40 |
+ libressl? ( dev-libs/libressl ) |
| 41 |
mysql? ( dev-db/mysql-connector-c:0= ) |
| 42 |
odbc? ( >=dev-db/unixODBC-2.2.6 ) |
| 43 |
ldap? ( net-nds/openldap ) |
| 44 |
@@ -154,7 +151,6 @@ src_configure() { |
| 45 |
$(use_with postgres dlz-postgres) |
| 46 |
$(use_with lmdb) |
| 47 |
$(use_with python) |
| 48 |
- $(use_with ssl openssl "${EPREFIX}"/usr) |
| 49 |
$(use_with xml libxml2) |
| 50 |
$(use_with zlib) |
| 51 |
) |
| 52 |
|
| 53 |
diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild |
| 54 |
index 805319e464b..bed30a62d3d 100644 |
| 55 |
--- a/net-dns/bind/bind-9.15.2.ebuild |
| 56 |
+++ b/net-dns/bind/bind-9.15.2.ebuild |
| 57 |
@@ -39,7 +39,7 @@ SLOT="0" |
| 58 |
KEYWORDS="" |
| 59 |
# -berkdb by default re bug 602682 |
| 60 |
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi |
| 61 |
-json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs |
| 62 |
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs |
| 63 |
urandom xml +zlib" |
| 64 |
# sdb-ldap - patch broken |
| 65 |
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
| 66 |
@@ -53,11 +53,8 @@ REQUIRED_USE=" |
| 67 |
python? ( ${PYTHON_REQUIRED_USE} )" |
| 68 |
# sdb-ldap? ( dlz ) |
| 69 |
|
| 70 |
-DEPEND=" |
| 71 |
- ssl? ( |
| 72 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
| 73 |
- libressl? ( dev-libs/libressl ) |
| 74 |
- ) |
| 75 |
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) |
| 76 |
+ libressl? ( dev-libs/libressl ) |
| 77 |
mysql? ( dev-db/mysql-connector-c:0= ) |
| 78 |
odbc? ( >=dev-db/unixODBC-2.2.6 ) |
| 79 |
ldap? ( net-nds/openldap ) |
| 80 |
@@ -154,7 +151,6 @@ src_configure() { |
| 81 |
$(use_with postgres dlz-postgres) |
| 82 |
$(use_with lmdb) |
| 83 |
$(use_with python) |
| 84 |
- $(use_with ssl openssl "${EPREFIX}"/usr) |
| 85 |
$(use_with xml libxml2) |
| 86 |
$(use_with zlib) |
| 87 |
) |
Archives