From 849c21057fc49ea7ff6fcb0bfd8e7c0cd3cefd23 Mon Sep 17 00:00:00 2001 From: Guan Jun-Ming Date: Sun, 14 May 2023 19:55:57 +0800 Subject: [PATCH 1/5] fix(DEFAULT-CONFIG): issue-I72Z7E fix wpa_supplicant failed to start --- build-config | 2 +- wpa_supplicant.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-config b/build-config index b7369ec..79a8fc7 100644 --- a/build-config +++ b/build-config @@ -43,4 +43,4 @@ CONFIG_IEEE80211R=y CONFIG_IEEE80211W=y CONFIG_WIFI_DISPLAY=y CONFIG_MACSEC=y -CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES" +#CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES" diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index d6cd21f..8957c72 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -1,7 +1,7 @@ Name: wpa_supplicant Epoch: 1 Version: 2.10 -Release: 1 +Release: 2 Summary: A WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN) License: BSD or GPLv2 Url: https://w1.fi/wpa_supplicant/ -- Gitee From 3e48fd52aac004cfd61272f3ac1c5e7fe9259fc4 Mon Sep 17 00:00:00 2001 From: Guan Jun-Ming Date: Sun, 14 May 2023 20:51:22 +0800 Subject: [PATCH 2/5] update change log --- wpa_supplicant.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 8957c72..2e9a335 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -103,6 +103,9 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %{_mandir}/man5/* %changelog +* Sun May 14 2023 yuanxin - 1:2.10-2 +- update build-config file to remove CONFIG_TLS_DEFAULT_CIPHERS + * Thu Mar 31 2022 yuanxin - 1:2.10-1 - update version to 2.10 -- Gitee From 1aa20da4958d593211b8cb9d28853b14889f9981 Mon Sep 17 00:00:00 2001 From: Guan Jun-Ming Date: Sun, 14 May 2023 20:52:07 +0800 Subject: [PATCH 3/5] name --- wpa_supplicant.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 2e9a335..35e63f3 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -103,7 +103,7 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %{_mandir}/man5/* %changelog -* Sun May 14 2023 yuanxin - 1:2.10-2 +* Sun May 14 2023 Guan Jun-Ming - 1:2.10-2 - update build-config file to remove CONFIG_TLS_DEFAULT_CIPHERS * Thu Mar 31 2022 yuanxin - 1:2.10-1 -- Gitee From 1426478828617fe83c7da8cf7b43e228e29fa209 Mon Sep 17 00:00:00 2001 From: xiaofan Date: Mon, 4 Sep 2023 21:06:21 +0800 Subject: [PATCH 4/5] remove redundant command argument and file Signed-off-by: xiaofan --- wpa_supplicant.conf | 3 --- wpa_supplicant.service | 2 +- wpa_supplicant.spec | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 wpa_supplicant.conf diff --git a/wpa_supplicant.conf b/wpa_supplicant.conf deleted file mode 100644 index 65ad645..0000000 --- a/wpa_supplicant.conf +++ /dev/null @@ -1,3 +0,0 @@ -ctrl_interface=/var/run/wpa_supplicant -ctrl_interface_group=wheel - diff --git a/wpa_supplicant.service b/wpa_supplicant.service index 97d4296..c94c182 100644 --- a/wpa_supplicant.service +++ b/wpa_supplicant.service @@ -8,7 +8,7 @@ After=dbus.service Type=dbus BusName=fi.w1.wpa_supplicant1 EnvironmentFile=-/etc/sysconfig/wpa_supplicant -ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u $INTERFACES $DRIVERS $OTHER_ARGS +ExecStart=/usr/sbin/wpa_supplicant -u $INTERFACES $DRIVERS $OTHER_ARGS [Install] WantedBy=multi-user.target diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 35e63f3..d1acf85 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -1,13 +1,12 @@ Name: wpa_supplicant Epoch: 1 Version: 2.10 -Release: 2 +Release: 3 Summary: A WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN) License: BSD or GPLv2 Url: https://w1.fi/wpa_supplicant/ Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz Source1: build-config -Source2: %{name}.conf Source3: %{name}.service Source5: %{name}.logrotate @@ -59,7 +58,6 @@ cp -f %{SOURCE1} %{name}/.config %{_build_cmd__ %{name}/doc/docbook man} %install -install -Dm600 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf install -Dm644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service install -Dm644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -83,7 +81,6 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %files %license COPYING -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_unitdir}/%{name}.service %{_sysconfdir}/dbus-1/system.d/%{name}.conf @@ -92,7 +89,6 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %{_sbindir}/wpa_supplicant %{_sbindir}/wpa_cli %{_sbindir}/eapol_test -%dir %{_sysconfdir}/%{name} %files gui %{_bindir}/wpa_gui @@ -103,6 +99,10 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %{_mandir}/man5/* %changelog + +* Mon Sep 4 2023 xiaofan - 1:2.10-3 +- remove redundant command argument and file + * Sun May 14 2023 Guan Jun-Ming - 1:2.10-2 - update build-config file to remove CONFIG_TLS_DEFAULT_CIPHERS -- Gitee From 99631196eb1c73c2f86d69c55b90c3b64f3afca5 Mon Sep 17 00:00:00 2001 From: xiaofan Date: Tue, 5 Sep 2023 19:41:55 +0800 Subject: [PATCH 5/5] fix wpa_cli not work Signed-off-by: xiaofan --- wpa_supplicant.service | 2 +- wpa_supplicant.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant.service b/wpa_supplicant.service index c94c182..bdb1713 100644 --- a/wpa_supplicant.service +++ b/wpa_supplicant.service @@ -8,7 +8,7 @@ After=dbus.service Type=dbus BusName=fi.w1.wpa_supplicant1 EnvironmentFile=-/etc/sysconfig/wpa_supplicant -ExecStart=/usr/sbin/wpa_supplicant -u $INTERFACES $DRIVERS $OTHER_ARGS +ExecStart=/usr/sbin/wpa_supplicant -u -O /var/run/wpa_supplicant $INTERFACES $DRIVERS $OTHER_ARGS [Install] WantedBy=multi-user.target diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index d1acf85..44ec782 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -1,7 +1,7 @@ Name: wpa_supplicant Epoch: 1 Version: 2.10 -Release: 3 +Release: 4 Summary: A WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN) License: BSD or GPLv2 Url: https://w1.fi/wpa_supplicant/ @@ -100,6 +100,9 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 %changelog +* Tue Sep 5 2023 xiaofan - 1:2.10-4 +- fix wpa_cli not work + * Mon Sep 4 2023 xiaofan - 1:2.10-3 - remove redundant command argument and file -- Gitee