From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- net-wireless/hostapd/Manifest | 8 +- ...date-DigestAlgorithmIdentifier-parameters.patch | 115 +++++++++ net-wireless/hostapd/hostapd-2.9-r3.ebuild | 39 ++- net-wireless/hostapd/hostapd-2.9-r4.ebuild | 273 +++++++++++++++++++++ net-wireless/hostapd/hostapd-9999.ebuild | 42 ++-- net-wireless/hostapd/metadata.xml | 2 - 6 files changed, 427 insertions(+), 52 deletions(-) create mode 100644 net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch create mode 100644 net-wireless/hostapd/hostapd-2.9-r4.ebuild (limited to 'net-wireless/hostapd') diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index 3691a5bb2b4a..7b7f8951ee9c 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -2,8 +2,10 @@ AUX hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch AUX hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch 2284 BLAKE2B 0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06 SHA512 00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch 1553 BLAKE2B 736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac SHA512 69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 +AUX hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch 3839 BLAKE2B 943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43 SHA512 88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c -EBUILD hostapd-2.9-r3.ebuild 7550 BLAKE2B e779c6986b7205fe7499809eed0bd3b129b20b9c7d87b5ccbadd68df852b5142fd119ee8be4cd7f20c3b199399cfcebf1b2e37bbc333266e827592a9a89d3bf3 SHA512 df47ee822e74a0f6638846693bd54250e39b750d7e010a037a7e44020adf5f662d860b63c19d307a76f0a34bf75082d746c442768e32a51050156737995f459e -EBUILD hostapd-9999.ebuild 7554 BLAKE2B 35f31a8f1c76573552f13c8f1370eea464f33ee865be1b669d7e947081cbfc2abb6b82fe9857b62ff8fbc0c2ea396d402ca4580ced38d3851c92f3c435591697 SHA512 898bfa0c1df91d394c83f9c22f1c6eef6202172f7b7651f7d39e73fbc0ebe7ba1ed8fc7c5fa818dc082e1665b66f87ee4d4d3feccbc90631b9cd4295b4538fb6 -MISC metadata.xml 1106 BLAKE2B 4b92b2eaa73222e60eb079522620e58991393296da9e981c742cd2b20fa38a5984c8c7b3d6242f0a27770af32caff148089eaa1ace27b4a152a751557ac0e0b9 SHA512 b0b6e8a9f72e01534770876d5a656360397d48d3736ec6aa5f799e65d414be4291729f78b4f2ebea1a2c55510d337adc0ae709021b3d360deef04f0ea2e32002 +EBUILD hostapd-2.9-r3.ebuild 7504 BLAKE2B 7d74aaa531264ff0d04fa19a17e19633dd1b72e95289bc3bb812924583da12d7da4d9b00adf155995f9dcb3a9c46917363f816b1f6e9b9daadbb8ef138797c3d SHA512 0dd1ab1500f4983b080ddd79d899092e998ae9a111c469be554a27747c7f896ccfba148385f90e72660d1949fb2f46117733b44bd0005684110edec1058b8938 +EBUILD hostapd-2.9-r4.ebuild 7667 BLAKE2B 7f7268cbfc7a67f41a4e11fa136066a45b14fff697cb89e7bae58624351a086bbb412f59f2a375fd04e05d47db0b68bda5ff77c55b3a53092f345c6b95157d0e SHA512 c5a8f6854bd6cafd30e7cad6f97a8f5de15afc214ddf6d54dff5c4f375f702d73a7a2c95a7b3aa13b8498b1bb3526fa95c253e2e0751f20fc3379bb12cb26020 +EBUILD hostapd-9999.ebuild 7128 BLAKE2B ddb2bbe4264737d17b92d23a1011274449d93ada1917dc231f403498955081bcd8cb942513589e60d0402a6d50257d2a924bc7ae269e669fef4dce2f28c23214 SHA512 6725675b1c839bb0bc5f9a0335d48372f01792a9520ba1e0af531cabbba4a314f0b469cadabc439c69751afd558fa14a85e8253ca53ca0c7c3531ce53b36d6a8 +MISC metadata.xml 1016 BLAKE2B 2582e31954d531776cdd315747006e1744c9a9f61faf6c73f251f8174d92e061a9dadb71152b9f666e210fe5478a5fe351bcd109b2804d94dfc268fc53004939 SHA512 27b8f32edde034f776c1538fd8e223f6963ab2a0bd760a9a3d5a3a08dd2c8549e990bfcaf5f197be47c4b92897ed13f07b111dec609a56c4268c1a659e493df1 diff --git a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch new file mode 100644 index 000000000000..8c8ba9335504 --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch @@ -0,0 +1,115 @@ +From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 18:19:31 +0200 +Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters + +The supported hash algorithms do not use AlgorithmIdentifier parameters. +However, there are implementations that include NULL parameters in +addition to ones that omit the parameters. Previous implementation did +not check the parameters value at all which supported both these cases, +but did not reject any other unexpected information. + +Use strict validation of digest algorithm parameters and reject any +unexpected value when validating a signature. This is needed to prevent +potential forging attacks. + +Signed-off-by: Jouni Malinen +--- + src/tls/pkcs1.c | 21 +++++++++++++++++++++ + src/tls/x509v3.c | 20 ++++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index bbdb0d7..5761dfe 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", ++ hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "PKCS #1: Unexpected digest algorithm parameters"); ++ os_free(decrypted); ++ return -1; ++ } + + if (!asn1_oid_equal(&oid, hash_alg)) { + char txt[100], txt2[100]; +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a8944dd..df337ec 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "X509: Unexpected digest algorithm parameters"); ++ os_free(data); ++ return -1; ++ } + + if (x509_sha1_oid(&oid)) { + if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { +-- +cgit v0.12 + diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild index 7a63076e50a7..174b3dd6157a 100644 --- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild +++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild @@ -28,30 +28,29 @@ fi LICENSE="BSD" SLOT="0" -IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" +IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" DEPEND=" - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )" - RDEPEND="${DEPEND}" pkg_pretend() { if use internal-tls; then - ewarn "internal-tls implementation is experimental and provides fewer features" + ewarn "internal-tls implementation is experimental and provides fewer features" fi } src_unpack() { # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds default + if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack fi @@ -63,12 +62,12 @@ src_prepare() { pushd ../ >/dev/null || die default - # CVE-2019-16275 bug #696032 - eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" - # CVE-2020-12695 bug #727542 - eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch" - eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch" - eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch" + # CVE-2019-16275 (bug #696032) + eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch + # CVE-2020-12695 (bug #727542) + eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch + eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch + eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch popd >/dev/null || die @@ -77,7 +76,7 @@ src_prepare() { } src_configure() { - local CONFIG="${S}/.config" + local CONFIG="${S}"/.config restore_config "${CONFIG}" if [[ -f "${CONFIG}" ]]; then @@ -233,20 +232,18 @@ src_install() { docinto examples dodoc wired.conf - if use logwatch; then - insinto /etc/log.d/conf/services/ - doins logwatch/${PN}.conf + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf - exeinto /etc/log.d/scripts/services/ - doexe logwatch/${PN} - fi + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} save_config .config } pkg_postinst() { einfo - einfo "If you are running openRC you need to follow this instructions:" + einfo "If you are running OpenRC you need to follow this instructions:" einfo "In order to use ${PN} you need to set up your wireless card" einfo "for master mode in /etc/conf.d/net and then start" einfo "/etc/init.d/${PN}." @@ -267,7 +264,7 @@ pkg_postinst() { if use wps; then einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "read the README-WPS file in /usr/share/doc/${PF}" einfo "for info on how to use WPS" fi } diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild b/net-wireless/hostapd/hostapd-2.9-r4.ebuild new file mode 100644 index 000000000000..4130241a64ce --- /dev/null +++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs systemd savedconfig + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" +EXTRAS_VER="2.7-r2" +EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" +SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" +S="${S}/${PN}" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://w1.fi/hostap.git" +else + if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then + SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz" + else + SRC_URI+=" https://w1.fi/releases/${P}.tar.gz" + fi + + # Never stabilize snapshot ebuilds please + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" + +DEPEND=" + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist] ) + kernel_linux? ( + dev-libs/libnl:3 + crda? ( net-wireless/crda ) + ) + netlink? ( net-libs/libnfnetlink ) + sqlite? ( >=dev-db/sqlite-3 )" +RDEPEND="${DEPEND}" + +pkg_pretend() { + if use internal-tls; then + ewarn "internal-tls implementation is experimental and provides fewer features" + fi +} + +src_unpack() { + # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds + default + + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + # Allow users to apply patches to src/drivers for example, + # i.e. anything outside ${S}/${PN} + pushd ../ >/dev/null || die + default + + # CVE-2019-16275 (bug #696032) + eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch + # CVE-2020-12695 (bug #727542) + eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch + eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch + eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch + # CVE-2021-30004 (bug #780135) + eapply "${FILESDIR}"/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch + + popd >/dev/null || die + + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${S}/hostapd.conf" || die +} + +src_configure() { + local CONFIG="${S}"/.config + + restore_config "${CONFIG}" + if [[ -f "${CONFIG}" ]]; then + default + return 0 + fi + + # toolchain setup + echo "CC = $(tc-getCC)" > ${CONFIG} || die + + # EAP authentication methods + echo "CONFIG_EAP=y" >> ${CONFIG} || die + echo "CONFIG_ERP=y" >> ${CONFIG} || die + echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die + + if use suiteb; then + echo "CONFIG_SUITEB=y" >> ${CONFIG} || die + echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die + fi + + if use internal-tls ; then + echo "CONFIG_TLS=internal" >> ${CONFIG} || die + else + # SSL authentication methods + echo "CONFIG_DPP=y" >> ${CONFIG} || die + echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die + echo "CONFIG_OWE=y" >> ${CONFIG} || die + echo "CONFIG_SAE=y" >> ${CONFIG} || die + echo "CONFIG_TLSV11=y" >> ${CONFIG} || die + echo "CONFIG_TLSV12=y" >> ${CONFIG} || die + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> ${CONFIG} || die + echo "CONFIG_WPS2=y" >> ${CONFIG} || die + echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die + echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die + echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die + echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die + echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die + echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die + echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die + echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die + echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die + echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die + echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die + + einfo "Enabling drivers: " + + # drivers + echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die + einfo " HostAP driver enabled" + echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die + einfo " Wired driver enabled" + echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die + einfo " None driver enabled" + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die + + # epoll + echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die + + # misc + echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die + echo "CONFIG_PKCS12=y" >> ${CONFIG} || die + echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die + echo "CONFIG_IAPP=y" >> ${CONFIG} || die + echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die + echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die + echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die + echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die + echo "CONFIG_OCV=y" >> ${CONFIG} || die + echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die + echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die + echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die + echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die + echo "CONFIG_HS20=y" >> ${CONFIG} || die + echo "CONFIG_WNM=y" >> ${CONFIG} || die + echo "CONFIG_FST=y" >> ${CONFIG} || die + echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die + echo "CONFIG_ACS=y" >> ${CONFIG} || die + + if use netlink; then + # Netlink support + echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die + fi + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> ${CONFIG} || die + fi + + if use sqlite; then + # Sqlite support + echo "CONFIG_SQLITE=y" >> ${CONFIG} || die + fi + + # If we are using libnl 2.0 and above, enable support for it + # Removed for now, since the 3.2 version is broken, and we don't + # support it. + if has_version ">=dev-libs/libnl-3.2"; then + echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die + fi + + # TODO: Add support for BSD drivers + + default +} + +src_compile() { + emake V=1 + + if ! use internal-tls; then + emake V=1 nt_password_hash + emake V=1 hlr_auc_gw + fi +} + +src_install() { + insinto /etc/${PN} + doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} + + fperms -R 600 /etc/${PN} + + dosbin ${PN} + dobin ${PN}_cli + + if ! use internal-tls; then + dobin nt_password_hash hlr_auc_gw + fi + + newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} + newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} + systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service + + doman ${PN}{.8,_cli.1} + + dodoc ChangeLog README + use wps && dodoc README-WPS + + docinto examples + dodoc wired.conf + + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} + + save_config .config +} + +pkg_postinst() { + einfo + einfo "If you are running OpenRC you need to follow this instructions:" + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/${PN}." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + + #if [[ -e "${KV_DIR}"/net/mac80211 ]]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${PF}" + einfo "for info on how to use WPS" + fi +} diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild index 515d2b26e214..6149f90b94e0 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-9999.ebuild @@ -28,30 +28,29 @@ fi LICENSE="BSD" SLOT="0" -IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" +IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" DEPEND=" - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )" - RDEPEND="${DEPEND}" pkg_pretend() { if use internal-tls; then - ewarn "internal-tls implementation is experimental and provides fewer features" + ewarn "internal-tls implementation is experimental and provides fewer features" fi } src_unpack() { # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds default + if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack fi @@ -60,24 +59,16 @@ src_unpack() { src_prepare() { # Allow users to apply patches to src/drivers for example, # i.e. anything outside ${S}/${PN} - pushd ../ >/dev/null || die + pushd ../ &>/dev/null || die default - - # CVE-2019-16275 bug #696032 - eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" - # CVE-2020-12695 bug #727542 - eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch" - eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch" - eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch" - - popd >/dev/null || die + popd &>/dev/null || die sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ "${S}/hostapd.conf" || die } src_configure() { - local CONFIG="${S}/.config" + local CONFIG="${S}"/.config restore_config "${CONFIG}" if [[ -f "${CONFIG}" ]]; then @@ -162,6 +153,7 @@ src_configure() { echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die + echo "CONFIG_OCV=y" >> ${CONFIG} || die echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die @@ -202,7 +194,7 @@ src_configure() { src_compile() { emake V=1 - if use internal-tls; then + if ! use internal-tls; then emake V=1 nt_password_hash emake V=1 hlr_auc_gw fi @@ -233,20 +225,18 @@ src_install() { docinto examples dodoc wired.conf - if use logwatch; then - insinto /etc/log.d/conf/services/ - doins logwatch/${PN}.conf + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf - exeinto /etc/log.d/scripts/services/ - doexe logwatch/${PN} - fi + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} save_config .config } pkg_postinst() { einfo - einfo "If you are running openRC you need to follow this instructions:" + einfo "If you are running OpenRC you need to follow this instructions:" einfo "In order to use ${PN} you need to set up your wireless card" einfo "for master mode in /etc/conf.d/net and then start" einfo "/etc/init.d/${PN}." @@ -267,7 +257,7 @@ pkg_postinst() { if use wps; then einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "read the README-WPS file in /usr/share/doc/${PF}" einfo "for info on how to use WPS" fi } diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml index d518c0ca0889..563ee67435f0 100644 --- a/net-wireless/hostapd/metadata.xml +++ b/net-wireless/hostapd/metadata.xml @@ -9,8 +9,6 @@ Add CRDA support Use internal TLSv1 implementation instead of depending on OpenSSL or GnuTLS - Install support files for - sys-apps/logwatch Adding support for using netlink to create VLANs Adding support for NSA Suite B Cryptography Add support for Wi-Fi Protected Setup -- cgit v1.2.3