| 1 |
commit: 2c655522c1c063f95e1e0ae12fe5e90933d7064e |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 17:40:57 2022 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 17:41:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c655522 |
| 7 |
|
| 8 |
net-wireless/wpa_supplicant: improve Kconfig_style_config() |
| 9 |
|
| 10 |
As-is, this macro can have imprecise results. Specifically, |
| 11 |
'Kconfig_style_config TLS openssl' is converting lines like |
| 12 |
'CONFIG_TLSV11=y' into 'CONFIG_TLSV11=openssl'. |
| 13 |
|
| 14 |
If we match to the end-of-word '\>', this doesn't happen. |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/16307 |
| 17 |
Author: Brian Norris <briannorris <AT> chromium.org> |
| 18 |
Signed-off-by: Brian Norris <briannorris <AT> chromium.org> |
| 19 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 20 |
|
| 21 |
net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild | 4 ++-- |
| 22 |
net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild | 4 ++-- |
| 23 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild |
| 26 |
index cb80b33748c2..dbd441303c31 100644 |
| 27 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild |
| 28 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild |
| 29 |
@@ -77,13 +77,13 @@ Kconfig_style_config() { |
| 30 |
#first remove any leading "# " if $2 is not n |
| 31 |
sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" |
| 32 |
#set item = $setting (defaulting to y) |
| 33 |
- sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
| 34 |
+ sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
| 35 |
if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then |
| 36 |
echo "$CONFIG_PARAM=$setting" >>.config |
| 37 |
fi |
| 38 |
else |
| 39 |
#ensure item commented out |
| 40 |
- sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
| 41 |
+ sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
| 47 |
index 276c74b2dc41..aee70bb7bc41 100644 |
| 48 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
| 49 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
| 50 |
@@ -77,13 +77,13 @@ Kconfig_style_config() { |
| 51 |
#first remove any leading "# " if $2 is not n |
| 52 |
sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" |
| 53 |
#set item = $setting (defaulting to y) |
| 54 |
- sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
| 55 |
+ sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
| 56 |
if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then |
| 57 |
echo "$CONFIG_PARAM=$setting" >>.config |
| 58 |
fi |
| 59 |
else |
| 60 |
#ensure item commented out |
| 61 |
- sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
| 62 |
+ sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
| 63 |
fi |
| 64 |
} |
Archives