From a72956bbff0be6a2aa4f0d659586f11759ad479c Mon Sep 17 00:00:00 2001 From: xiaofan Date: Mon, 4 Sep 2023 21:06:21 +0800 Subject: [PATCH 1/2] 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 03b820567d1fd0f9ee73ed0efe2eba7672ff3354 Mon Sep 17 00:00:00 2001 From: xiaofan Date: Tue, 5 Sep 2023 19:41:55 +0800 Subject: [PATCH 2/2] 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