From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1609081-garchives=archives.gentoo.org@lists.gentoo.org>
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 A3809158041
for <garchives@archives.gentoo.org>; Sat, 9 Mar 2024 21:24:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DFFCFE2A49;
Sat, 9 Mar 2024 21:24:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C339FE2A49
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Mar 2024 21:24:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 E699333BEF1
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Mar 2024 21:24:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 114A313E6
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Mar 2024 21:24:22 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1710019388.4c8375e12db9421a1155f034705b68fdbe8f928e.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.10-r3.ebuild net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.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: 4c8375e12db9421a1155f034705b68fdbe8f928e
X-VCS-Branch: master
Date: Sat, 9 Mar 2024 21:24:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3cdb7e6b-c66b-413d-8db8-50a725b0e2f1
X-Archives-Hash: 28bb446a9b74126f4e2c4df615690329
commit: 4c8375e12db9421a1155f034705b68fdbe8f928e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 21:23:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 21:23:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8375e1
net-wireless/wpa_supplicant: always install OpenRC init script, cleanup cruft
I haven't dug into the historical reasons for the has_version here, my guess
is it relied on some newer OpenRC feature rather than intentionally omitting
for systemd machines (where the small file policy applies in both directions).
Always install them accordingly.
Also, cleanup an ancient <baselayout-2 hack.
Signed-off-by: Sam James <sam <AT> gentoo.org>
...t-2.10-r3.ebuild => wpa_supplicant-2.10-r4.ebuild} | 16 +++-------------
.../wpa_supplicant/wpa_supplicant-9999.ebuild | 19 +++++--------------
2 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
similarity index 96%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
index b4b8610aa549..5778596a4275 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -389,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
- # baselayout-1 compat
- if has_version "<sys-apps/baselayout-2.0.0"; then
- dodir /sbin
- dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
- dodir /bin
- dosym ../usr/bin/wpa_cli /bin/wpa_cli
- fi
-
- if has_version ">=sys-apps/openrc-0.5.0"; then
- newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
- newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
- fi
+ newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+ newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 8c93c31c2554..5778596a4275 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git"
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz"
fi
@@ -124,6 +124,7 @@ src_prepare() {
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+ eapply "${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
@@ -388,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
- # baselayout-1 compat
- if has_version "<sys-apps/baselayout-2.0.0"; then
- dodir /sbin
- dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
- dodir /bin
- dosym ../usr/bin/wpa_cli /bin/wpa_cli
- fi
-
- if has_version ">=sys-apps/openrc-0.5.0"; then
- newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
- newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
- fi
+ newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+ newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh