commit: d07f49b07110bd211a32aea3d9656372a31379c0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 3 04:38:28 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 3 04:38:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07f49b0
net-wireless/wpa_supplicant: fix bindist removal I'd gone back and tried to sync live and ended up with a monstrosity. Bug: https://bugs.gentoo.org/762850 Signed-off-by: Sam James <sam <AT> gentoo.org> ...a_supplicant-2.9-r7.ebuild => wpa_supplicant-2.9-r8.ebuild} | 2 +- net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild similarity index 99% rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild index 2935a7227ab1..6c1e2d23ae78 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild @@ -31,7 +31,7 @@ REQUIRED_USE=" " DEPEND=" - >=dev-libs/openssl-1.0.2k:0=[bindist(-)=] + >=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index 2935a7227ab1..132825beb46c 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -31,7 +31,7 @@ REQUIRED_USE=" " DEPEND=" - >=dev-libs/openssl-1.0.2k:0=[bindist(-)=] + >=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 @@ -151,14 +151,6 @@ src_prepare() { # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die - - ## Security patches - # CVE-2019-16275 (bug #696030) - eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" - # 2020-2, 2021-1 security advisories (bug #768759) - eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch - # CVE-2021-30004 (bug #780138) - eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch } src_configure() {
