commit: 897e3fc7404602f02dd84b9258b6812a0167e99e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 17 02:12:31 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 17 02:20:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897e3fc7
net-wireless/hostapd: add 2.10 (security bump) Bug: https://bugs.gentoo.org/816957 Bug: https://bugs.gentoo.org/831332 Signed-off-by: Sam James <sam <AT> gentoo.org> net-wireless/hostapd/Manifest | 1 + .../{hostapd-9999.ebuild => hostapd-2.10.ebuild} | 17 +++++++---------- net-wireless/hostapd/hostapd-9999.ebuild | 17 +++++++---------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index 5e2d0c597715..f33599c9daaa 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -1,2 +1,3 @@ +DIST hostapd-2.10.tar.gz 2440435 BLAKE2B dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f SHA512 243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f 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 diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-2.10.ebuild similarity index 95% copy from net-wireless/hostapd/hostapd-9999.ebuild copy to net-wireless/hostapd/hostapd-2.10.ebuild index dacd094e49ee..7a10010c4725 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-2.10.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit flag-o-matic systemd savedconfig toolchain-funcs -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" +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"; SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"; S="${S}/${PN}" @@ -34,7 +34,7 @@ DEPEND=" internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( - dev-libs/libnl:3 + >=dev-libs/libnl-3.2:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) @@ -60,9 +60,9 @@ 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 - popd &>/dev/null || die + popd >/dev/null || die sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ "${S}/hostapd.conf" || die @@ -180,10 +180,7 @@ src_configure() { 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 + if use kernel_linux; then echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) fi diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild index dacd094e49ee..7a10010c4725 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit flag-o-matic systemd savedconfig toolchain-funcs -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" +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"; SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"; S="${S}/${PN}" @@ -34,7 +34,7 @@ DEPEND=" internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( - dev-libs/libnl:3 + >=dev-libs/libnl-3.2:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) @@ -60,9 +60,9 @@ 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 - popd &>/dev/null || die + popd >/dev/null || die sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ "${S}/hostapd.conf" || die @@ -180,10 +180,7 @@ src_configure() { 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 + if use kernel_linux; then echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) fi
