| 1 |
commit: 86cc0139a30af31444b0bb1cd43520c381162c68 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 12 10:46:30 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 12 10:54:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cc0139 |
| 7 |
|
| 8 |
net-wireless/hostapd: ebuild tidying |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-wireless/hostapd/hostapd-2.9-r3.ebuild | 39 +++++++++++++-------------- |
| 13 |
net-wireless/hostapd/hostapd-2.9-r4.ebuild | 43 ++++++++++++++---------------- |
| 14 |
net-wireless/hostapd/hostapd-9999.ebuild | 27 +++++++++---------- |
| 15 |
net-wireless/hostapd/metadata.xml | 2 -- |
| 16 |
4 files changed, 50 insertions(+), 61 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 19 |
index 7a63076e50a..174b3dd6157 100644 |
| 20 |
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 21 |
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild |
| 22 |
@@ -28,30 +28,29 @@ fi |
| 23 |
|
| 24 |
LICENSE="BSD" |
| 25 |
SLOT="0" |
| 26 |
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" |
| 27 |
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" |
| 28 |
|
| 29 |
DEPEND=" |
| 30 |
- internal-tls? ( dev-libs/libtommath ) |
| 31 |
- !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 32 |
- |
| 33 |
+ internal-tls? ( dev-libs/libtommath ) |
| 34 |
+ !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 35 |
kernel_linux? ( |
| 36 |
dev-libs/libnl:3 |
| 37 |
crda? ( net-wireless/crda ) |
| 38 |
) |
| 39 |
netlink? ( net-libs/libnfnetlink ) |
| 40 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 41 |
- |
| 42 |
RDEPEND="${DEPEND}" |
| 43 |
|
| 44 |
pkg_pretend() { |
| 45 |
if use internal-tls; then |
| 46 |
- ewarn "internal-tls implementation is experimental and provides fewer features" |
| 47 |
+ ewarn "internal-tls implementation is experimental and provides fewer features" |
| 48 |
fi |
| 49 |
} |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds |
| 53 |
default |
| 54 |
+ |
| 55 |
if [[ ${PV} == 9999 ]] ; then |
| 56 |
git-r3_src_unpack |
| 57 |
fi |
| 58 |
@@ -63,12 +62,12 @@ src_prepare() { |
| 59 |
pushd ../ >/dev/null || die |
| 60 |
default |
| 61 |
|
| 62 |
- # CVE-2019-16275 bug #696032 |
| 63 |
- eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" |
| 64 |
- # CVE-2020-12695 bug #727542 |
| 65 |
- eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch" |
| 66 |
- eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch" |
| 67 |
- eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch" |
| 68 |
+ # CVE-2019-16275 (bug #696032) |
| 69 |
+ eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch |
| 70 |
+ # CVE-2020-12695 (bug #727542) |
| 71 |
+ eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch |
| 72 |
+ eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch |
| 73 |
+ eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch |
| 74 |
|
| 75 |
popd >/dev/null || die |
| 76 |
|
| 77 |
@@ -77,7 +76,7 @@ src_prepare() { |
| 78 |
} |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
- local CONFIG="${S}/.config" |
| 82 |
+ local CONFIG="${S}"/.config |
| 83 |
|
| 84 |
restore_config "${CONFIG}" |
| 85 |
if [[ -f "${CONFIG}" ]]; then |
| 86 |
@@ -233,20 +232,18 @@ src_install() { |
| 87 |
docinto examples |
| 88 |
dodoc wired.conf |
| 89 |
|
| 90 |
- if use logwatch; then |
| 91 |
- insinto /etc/log.d/conf/services/ |
| 92 |
- doins logwatch/${PN}.conf |
| 93 |
+ insinto /etc/log.d/conf/services/ |
| 94 |
+ doins logwatch/${PN}.conf |
| 95 |
|
| 96 |
- exeinto /etc/log.d/scripts/services/ |
| 97 |
- doexe logwatch/${PN} |
| 98 |
- fi |
| 99 |
+ exeinto /etc/log.d/scripts/services/ |
| 100 |
+ doexe logwatch/${PN} |
| 101 |
|
| 102 |
save_config .config |
| 103 |
} |
| 104 |
|
| 105 |
pkg_postinst() { |
| 106 |
einfo |
| 107 |
- einfo "If you are running openRC you need to follow this instructions:" |
| 108 |
+ einfo "If you are running OpenRC you need to follow this instructions:" |
| 109 |
einfo "In order to use ${PN} you need to set up your wireless card" |
| 110 |
einfo "for master mode in /etc/conf.d/net and then start" |
| 111 |
einfo "/etc/init.d/${PN}." |
| 112 |
@@ -267,7 +264,7 @@ pkg_postinst() { |
| 113 |
|
| 114 |
if use wps; then |
| 115 |
einfo "You have enabled Wi-Fi Protected Setup support, please" |
| 116 |
- einfo "read the README-WPS file in /usr/share/doc/${P}" |
| 117 |
+ einfo "read the README-WPS file in /usr/share/doc/${PF}" |
| 118 |
einfo "for info on how to use WPS" |
| 119 |
fi |
| 120 |
} |
| 121 |
|
| 122 |
diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild b/net-wireless/hostapd/hostapd-2.9-r4.ebuild |
| 123 |
index 8a63e598f55..4130241a64c 100644 |
| 124 |
--- a/net-wireless/hostapd/hostapd-2.9-r4.ebuild |
| 125 |
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild |
| 126 |
@@ -28,30 +28,29 @@ fi |
| 127 |
|
| 128 |
LICENSE="BSD" |
| 129 |
SLOT="0" |
| 130 |
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" |
| 131 |
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" |
| 132 |
|
| 133 |
DEPEND=" |
| 134 |
- internal-tls? ( dev-libs/libtommath ) |
| 135 |
- !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 136 |
- |
| 137 |
+ internal-tls? ( dev-libs/libtommath ) |
| 138 |
+ !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 139 |
kernel_linux? ( |
| 140 |
dev-libs/libnl:3 |
| 141 |
crda? ( net-wireless/crda ) |
| 142 |
) |
| 143 |
netlink? ( net-libs/libnfnetlink ) |
| 144 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 145 |
- |
| 146 |
RDEPEND="${DEPEND}" |
| 147 |
|
| 148 |
pkg_pretend() { |
| 149 |
if use internal-tls; then |
| 150 |
- ewarn "internal-tls implementation is experimental and provides fewer features" |
| 151 |
+ ewarn "internal-tls implementation is experimental and provides fewer features" |
| 152 |
fi |
| 153 |
} |
| 154 |
|
| 155 |
src_unpack() { |
| 156 |
# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds |
| 157 |
default |
| 158 |
+ |
| 159 |
if [[ ${PV} == 9999 ]] ; then |
| 160 |
git-r3_src_unpack |
| 161 |
fi |
| 162 |
@@ -63,14 +62,14 @@ src_prepare() { |
| 163 |
pushd ../ >/dev/null || die |
| 164 |
default |
| 165 |
|
| 166 |
- # CVE-2019-16275 bug #696032 |
| 167 |
- eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" |
| 168 |
- # CVE-2020-12695 bug #727542 |
| 169 |
- eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch" |
| 170 |
- eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch" |
| 171 |
- eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch" |
| 172 |
- # CVE-2021-30004 bug #780135 |
| 173 |
- eapply "${FILESDIR}/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch" |
| 174 |
+ # CVE-2019-16275 (bug #696032) |
| 175 |
+ eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch |
| 176 |
+ # CVE-2020-12695 (bug #727542) |
| 177 |
+ eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch |
| 178 |
+ eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch |
| 179 |
+ eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch |
| 180 |
+ # CVE-2021-30004 (bug #780135) |
| 181 |
+ eapply "${FILESDIR}"/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch |
| 182 |
|
| 183 |
popd >/dev/null || die |
| 184 |
|
| 185 |
@@ -79,7 +78,7 @@ src_prepare() { |
| 186 |
} |
| 187 |
|
| 188 |
src_configure() { |
| 189 |
- local CONFIG="${S}/.config" |
| 190 |
+ local CONFIG="${S}"/.config |
| 191 |
|
| 192 |
restore_config "${CONFIG}" |
| 193 |
if [[ -f "${CONFIG}" ]]; then |
| 194 |
@@ -236,20 +235,18 @@ src_install() { |
| 195 |
docinto examples |
| 196 |
dodoc wired.conf |
| 197 |
|
| 198 |
- if use logwatch; then |
| 199 |
- insinto /etc/log.d/conf/services/ |
| 200 |
- doins logwatch/${PN}.conf |
| 201 |
+ insinto /etc/log.d/conf/services/ |
| 202 |
+ doins logwatch/${PN}.conf |
| 203 |
|
| 204 |
- exeinto /etc/log.d/scripts/services/ |
| 205 |
- doexe logwatch/${PN} |
| 206 |
- fi |
| 207 |
+ exeinto /etc/log.d/scripts/services/ |
| 208 |
+ doexe logwatch/${PN} |
| 209 |
|
| 210 |
save_config .config |
| 211 |
} |
| 212 |
|
| 213 |
pkg_postinst() { |
| 214 |
einfo |
| 215 |
- einfo "If you are running openRC you need to follow this instructions:" |
| 216 |
+ einfo "If you are running OpenRC you need to follow this instructions:" |
| 217 |
einfo "In order to use ${PN} you need to set up your wireless card" |
| 218 |
einfo "for master mode in /etc/conf.d/net and then start" |
| 219 |
einfo "/etc/init.d/${PN}." |
| 220 |
@@ -270,7 +267,7 @@ pkg_postinst() { |
| 221 |
|
| 222 |
if use wps; then |
| 223 |
einfo "You have enabled Wi-Fi Protected Setup support, please" |
| 224 |
- einfo "read the README-WPS file in /usr/share/doc/${P}" |
| 225 |
+ einfo "read the README-WPS file in /usr/share/doc/${PF}" |
| 226 |
einfo "for info on how to use WPS" |
| 227 |
fi |
| 228 |
} |
| 229 |
|
| 230 |
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild |
| 231 |
index c9cb0fa9f95..6149f90b94e 100644 |
| 232 |
--- a/net-wireless/hostapd/hostapd-9999.ebuild |
| 233 |
+++ b/net-wireless/hostapd/hostapd-9999.ebuild |
| 234 |
@@ -28,30 +28,29 @@ fi |
| 235 |
|
| 236 |
LICENSE="BSD" |
| 237 |
SLOT="0" |
| 238 |
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" |
| 239 |
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" |
| 240 |
|
| 241 |
DEPEND=" |
| 242 |
- internal-tls? ( dev-libs/libtommath ) |
| 243 |
- !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 244 |
- |
| 245 |
+ internal-tls? ( dev-libs/libtommath ) |
| 246 |
+ !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
| 247 |
kernel_linux? ( |
| 248 |
dev-libs/libnl:3 |
| 249 |
crda? ( net-wireless/crda ) |
| 250 |
) |
| 251 |
netlink? ( net-libs/libnfnetlink ) |
| 252 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 253 |
- |
| 254 |
RDEPEND="${DEPEND}" |
| 255 |
|
| 256 |
pkg_pretend() { |
| 257 |
if use internal-tls; then |
| 258 |
- ewarn "internal-tls implementation is experimental and provides fewer features" |
| 259 |
+ ewarn "internal-tls implementation is experimental and provides fewer features" |
| 260 |
fi |
| 261 |
} |
| 262 |
|
| 263 |
src_unpack() { |
| 264 |
# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds |
| 265 |
default |
| 266 |
+ |
| 267 |
if [[ ${PV} == 9999 ]] ; then |
| 268 |
git-r3_src_unpack |
| 269 |
fi |
| 270 |
@@ -69,7 +68,7 @@ src_prepare() { |
| 271 |
} |
| 272 |
|
| 273 |
src_configure() { |
| 274 |
- local CONFIG="${S}/.config" |
| 275 |
+ local CONFIG="${S}"/.config |
| 276 |
|
| 277 |
restore_config "${CONFIG}" |
| 278 |
if [[ -f "${CONFIG}" ]]; then |
| 279 |
@@ -226,20 +225,18 @@ src_install() { |
| 280 |
docinto examples |
| 281 |
dodoc wired.conf |
| 282 |
|
| 283 |
- if use logwatch; then |
| 284 |
- insinto /etc/log.d/conf/services/ |
| 285 |
- doins logwatch/${PN}.conf |
| 286 |
+ insinto /etc/log.d/conf/services/ |
| 287 |
+ doins logwatch/${PN}.conf |
| 288 |
|
| 289 |
- exeinto /etc/log.d/scripts/services/ |
| 290 |
- doexe logwatch/${PN} |
| 291 |
- fi |
| 292 |
+ exeinto /etc/log.d/scripts/services/ |
| 293 |
+ doexe logwatch/${PN} |
| 294 |
|
| 295 |
save_config .config |
| 296 |
} |
| 297 |
|
| 298 |
pkg_postinst() { |
| 299 |
einfo |
| 300 |
- einfo "If you are running openRC you need to follow this instructions:" |
| 301 |
+ einfo "If you are running OpenRC you need to follow this instructions:" |
| 302 |
einfo "In order to use ${PN} you need to set up your wireless card" |
| 303 |
einfo "for master mode in /etc/conf.d/net and then start" |
| 304 |
einfo "/etc/init.d/${PN}." |
| 305 |
@@ -260,7 +257,7 @@ pkg_postinst() { |
| 306 |
|
| 307 |
if use wps; then |
| 308 |
einfo "You have enabled Wi-Fi Protected Setup support, please" |
| 309 |
- einfo "read the README-WPS file in /usr/share/doc/${P}" |
| 310 |
+ einfo "read the README-WPS file in /usr/share/doc/${PF}" |
| 311 |
einfo "for info on how to use WPS" |
| 312 |
fi |
| 313 |
} |
| 314 |
|
| 315 |
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml |
| 316 |
index d518c0ca088..563ee67435f 100644 |
| 317 |
--- a/net-wireless/hostapd/metadata.xml |
| 318 |
+++ b/net-wireless/hostapd/metadata.xml |
| 319 |
@@ -9,8 +9,6 @@ |
| 320 |
<use> |
| 321 |
<flag name="crda">Add CRDA support</flag> |
| 322 |
<flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL or GnuTLS</flag> |
| 323 |
- <flag name="logwatch">Install support files for |
| 324 |
- <pkg>sys-apps/logwatch</pkg></flag> |
| 325 |
<flag name="netlink">Adding support for using netlink to create VLANs</flag> |
| 326 |
<flag name="suiteb">Adding support for NSA Suite B Cryptography</flag> |
| 327 |
<flag name="wps">Add support for Wi-Fi Protected Setup</flag> |
Archives