From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C63B158086 for ; Fri, 3 Dec 2021 04:39:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA77FE0825; Fri, 3 Dec 2021 04:39:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1536DE0825 for ; Fri, 3 Dec 2021 04:39:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A57E343163 for ; Fri, 3 Dec 2021 04:39:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9707214D for ; Fri, 3 Dec 2021 04:39:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638506330.d07f49b07110bd211a32aea3d9656372a31379c0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild X-VCS-Directories: net-wireless/wpa_supplicant/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d07f49b07110bd211a32aea3d9656372a31379c0 X-VCS-Branch: master Date: Fri, 3 Dec 2021 04:39:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4227fd6f-c77a-4387-b78e-37773d44f1f4 X-Archives-Hash: 727ea58081d44c0e79bb2daf991a4efd commit: d07f49b07110bd211a32aea3d9656372a31379c0 Author: Sam James gentoo org> AuthorDate: Fri Dec 3 04:38:28 2021 +0000 Commit: Sam James gentoo 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 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() {