| 1 |
commit: 1eb56d9532c0a7a708492ce294448fccbe27ff29 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 09:37:25 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 09:39:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb56d95 |
| 7 |
|
| 8 |
net-wireless/hostapd: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-wireless/hostapd/hostapd-2.9-r3.ebuild | 19 +++++-------------- |
| 14 |
net-wireless/hostapd/hostapd-9999.ebuild | 19 +++++-------------- |
| 15 |
2 files changed, 10 insertions(+), 28 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 18 |
index 6183c8c4e5f..7a63076e50a 100644 |
| 19 |
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 20 |
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 21 |
@@ -28,17 +28,12 @@ fi |
| 22 |
|
| 23 |
LICENSE="BSD" |
| 24 |
SLOT="0" |
| 25 |
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda" |
| 26 |
- |
| 27 |
-# suiteb impl uses openssl feature not available in libressl, see bug 710992 |
| 28 |
-REQUIRED_USE="?? ( libressl suiteb )" |
| 29 |
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" |
| 30 |
|
| 31 |
DEPEND=" |
| 32 |
- libressl? ( dev-libs/libressl:0= ) |
| 33 |
- !libressl? ( |
| 34 |
internal-tls? ( dev-libs/libtommath ) |
| 35 |
!internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 36 |
- ) |
| 37 |
+ |
| 38 |
kernel_linux? ( |
| 39 |
dev-libs/libnl:3 |
| 40 |
crda? ( net-wireless/crda ) |
| 41 |
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}" |
| 42 |
|
| 43 |
pkg_pretend() { |
| 44 |
if use internal-tls; then |
| 45 |
- if use libressl; then |
| 46 |
- elog "libressl flag takes precedence over internal-tls" |
| 47 |
- else |
| 48 |
ewarn "internal-tls implementation is experimental and provides fewer features" |
| 49 |
- fi |
| 50 |
fi |
| 51 |
} |
| 52 |
|
| 53 |
@@ -107,7 +98,7 @@ src_configure() { |
| 54 |
echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die |
| 55 |
fi |
| 56 |
|
| 57 |
- if use internal-tls && ! use libressl; then |
| 58 |
+ if use internal-tls ; then |
| 59 |
echo "CONFIG_TLS=internal" >> ${CONFIG} || die |
| 60 |
else |
| 61 |
# SSL authentication methods |
| 62 |
@@ -211,7 +202,7 @@ src_configure() { |
| 63 |
src_compile() { |
| 64 |
emake V=1 |
| 65 |
|
| 66 |
- if use libressl || ! use internal-tls; then |
| 67 |
+ if ! use internal-tls; then |
| 68 |
emake V=1 nt_password_hash |
| 69 |
emake V=1 hlr_auc_gw |
| 70 |
fi |
| 71 |
@@ -226,7 +217,7 @@ src_install() { |
| 72 |
dosbin ${PN} |
| 73 |
dobin ${PN}_cli |
| 74 |
|
| 75 |
- if use libressl || ! use internal-tls; then |
| 76 |
+ if ! use internal-tls; then |
| 77 |
dobin nt_password_hash hlr_auc_gw |
| 78 |
fi |
| 79 |
|
| 80 |
|
| 81 |
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild |
| 82 |
index 3ceb1520bd8..515d2b26e21 100644 |
| 83 |
--- a/net-wireless/hostapd/hostapd-9999.ebuild |
| 84 |
+++ b/net-wireless/hostapd/hostapd-9999.ebuild |
| 85 |
@@ -28,17 +28,12 @@ fi |
| 86 |
|
| 87 |
LICENSE="BSD" |
| 88 |
SLOT="0" |
| 89 |
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda" |
| 90 |
- |
| 91 |
-# suiteb impl uses openssl feature not available in libressl, see bug 710992 |
| 92 |
-REQUIRED_USE="?? ( libressl suiteb )" |
| 93 |
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" |
| 94 |
|
| 95 |
DEPEND=" |
| 96 |
- libressl? ( dev-libs/libressl:0= ) |
| 97 |
- !libressl? ( |
| 98 |
internal-tls? ( dev-libs/libtommath ) |
| 99 |
!internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 100 |
- ) |
| 101 |
+ |
| 102 |
kernel_linux? ( |
| 103 |
dev-libs/libnl:3 |
| 104 |
crda? ( net-wireless/crda ) |
| 105 |
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}" |
| 106 |
|
| 107 |
pkg_pretend() { |
| 108 |
if use internal-tls; then |
| 109 |
- if use libressl; then |
| 110 |
- elog "libressl flag takes precedence over internal-tls" |
| 111 |
- else |
| 112 |
ewarn "internal-tls implementation is experimental and provides fewer features" |
| 113 |
- fi |
| 114 |
fi |
| 115 |
} |
| 116 |
|
| 117 |
@@ -107,7 +98,7 @@ src_configure() { |
| 118 |
echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die |
| 119 |
fi |
| 120 |
|
| 121 |
- if use internal-tls && ! use libressl; then |
| 122 |
+ if use internal-tls ; then |
| 123 |
echo "CONFIG_TLS=internal" >> ${CONFIG} || die |
| 124 |
else |
| 125 |
# SSL authentication methods |
| 126 |
@@ -211,7 +202,7 @@ src_configure() { |
| 127 |
src_compile() { |
| 128 |
emake V=1 |
| 129 |
|
| 130 |
- if use libressl || ! use internal-tls; then |
| 131 |
+ if use internal-tls; then |
| 132 |
emake V=1 nt_password_hash |
| 133 |
emake V=1 hlr_auc_gw |
| 134 |
fi |
| 135 |
@@ -226,7 +217,7 @@ src_install() { |
| 136 |
dosbin ${PN} |
| 137 |
dobin ${PN}_cli |
| 138 |
|
| 139 |
- if use libressl || ! use internal-tls; then |
| 140 |
+ if ! use internal-tls; then |
| 141 |
dobin nt_password_hash hlr_auc_gw |
| 142 |
fi |
Archives