|
|
@@ -4,7 +4,7 @@
|
|
|
Summary: WPA/WPA2/IEEE 802.1X Supplicant
|
|
|
Name: wpa_supplicant
|
|
|
Version: 2.9
|
|
|
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: network,system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -45,6 +45,12 @@ Patch9: 0001-D-Bus-Allow-changing-an-interface-bridge-via-D-Bus.patch
|
|
|
#expose OWE capability in D-Bus
|
|
|
Patch10: 0001-dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch
|
|
|
|
|
|
+# CVE-2021-0326
|
|
|
+Patch11: 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
|
|
|
+
|
|
|
+# CVE-2021-27803
|
|
|
+Patch12: 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
|
|
|
+
|
|
|
## Vine patches
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
@@ -179,8 +185,8 @@ fi
|
|
|
%systemd_preun wpa_supplicant.service
|
|
|
%else
|
|
|
if [ $1 = 0 -o -x /bin/systemctl ]; then
|
|
|
- /sbin/service %{name} stop > /dev/null 2>&1
|
|
|
- killall -TERM wpa_supplicant >/dev/null 2>&1
|
|
|
+ /sbin/service %{name} stop > /dev/null 2>&1 ||:
|
|
|
+ killall -TERM wpa_supplicant >/dev/null 2>&1 || :
|
|
|
/sbin/chkconfig --del %{name}
|
|
|
fi
|
|
|
%endif
|
|
|
@@ -190,7 +196,7 @@ fi
|
|
|
%systemd_postun_with_restart wpa_supplicant.service
|
|
|
%else
|
|
|
if [ $1 -ge 1 ]; then
|
|
|
- /sbin/service %{name} condrestart > /dev/null 2>&1
|
|
|
+ /sbin/service %{name} condrestart > /dev/null 2>&1 ||:
|
|
|
fi
|
|
|
%endif
|
|
|
|
|
|
@@ -226,6 +232,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Mar 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.9-3
|
|
|
+- imported Patch11 from upstream to fix CVE-2021-0326.
|
|
|
+- imported Patch12 from upstream to fix CVE-2021-27803.
|
|
|
+
|
|
|
* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.9-2
|
|
|
- diasabled gui as default.
|
|
|
- added systemd support (disabled as default).
|
