automatic import of wpa_supplicantopeneuler24.03_LTS

7 files changed, 306 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index e69de29..4392d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wpa_supplicant-2.11.tar.gz
diff --git a/build-config b/build-config
new file mode 100644
index 0000000..79a8fc7
--- /dev/null
+++ b/build-config
@@ -0,0 +1,46 @@
+# some build configs for wpa_supplicant
+
+CONFIG_CTRL_IFACE=y
+CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
+CONFIG_DRIVER_WEXT=y
+CONFIG_LIBNL32=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_MACSEC_LINUX=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TTLS=y
+CONFIG_EAP_FAST=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_PAX=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_SAKE=y
+CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_TNC=y
+CONFIG_WPS=y
+CONFIG_EAP_IKEV2=y
+CONFIG_PKCS12=y
+CONFIG_SMARTCARD=y
+CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_FILE=y
+CONFIG_BACKEND=file
+CONFIG_PEERKEY=y
+CONFIG_BGSCAN_SIMPLE=y
+#CONFIG_FIPS=y
+CONFIG_AP=y
+CONFIG_P2P=y
+CONFIG_IBSS_RSN=y
+CONFIG_IEEE80211N=y
+CONFIG_IEEE80211R=y
+CONFIG_IEEE80211W=y
+CONFIG_WIFI_DISPLAY=y
+CONFIG_MACSEC=y
+#CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES"
diff --git a/sources b/sources
new file mode 100644
index 0000000..1748012
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+72a4a00eddb7a499a58113c3361ab094  wpa_supplicant-2.11.tar.gz
diff --git a/wpa_supplicant-gui-qt4.patch b/wpa_supplicant-gui-qt4.patch
new file mode 100644
index 0000000..7acca1e
--- /dev/null
+++ b/wpa_supplicant-gui-qt4.patch
@@ -0,0 +1,36 @@
+From 9404f356e394604d1d3d6dbffc52abd54260e4d4 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 27 Oct 2015 08:56:35 +0100
+Subject: [PATCH] wpa_supplicant: allow overriding the names of the Qt4 tools
+
+This is useful for distributions that ship different versions of Qt in
+different locations.
+---
+ wpa_supplicant/Makefile | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -35,6 +35,9 @@ export INCDIR ?= /usr/local/include
+ export BINDIR ?= /usr/local/sbin
+ PKG_CONFIG ?= pkg-config
+ 
++QMAKE ?= qmake
++LRELEASE ?= lrelease
++
+ CFLAGS += $(EXTRA_CFLAGS)
+ CFLAGS += -I$(abspath ../src)
+ CFLAGS += -I$(abspath ../src/utils)
+@@ -2039,10 +2042,10 @@ wpa_gui:
+ 	@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
+ 
+ wpa_gui-qt4/Makefile:
+-	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
++	$(QMAKE) -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
+ 
+ wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
+-	lrelease wpa_gui-qt4/wpa_gui.pro
++	$(LRELEASE) wpa_gui-qt4/wpa_gui.pro
+ 
+ wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
+ 	$(MAKE) -C wpa_gui-qt4
diff --git a/wpa_supplicant.logrotate b/wpa_supplicant.logrotate
new file mode 100644
index 0000000..d6eed2e
--- /dev/null
+++ b/wpa_supplicant.logrotate
@@ -0,0 +1,7 @@
+/var/log/wpa_supplicant.log {
+    maxage 365
+    missingok
+    notifempty
+    size 30k
+    create 0600 root root
+}
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
new file mode 100644
index 0000000..bdb1713
--- /dev/null
+++ b/wpa_supplicant.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=WPA supplicant
+Before=network.target
+Wants=network.target
+After=dbus.service
+
+[Service]
+Type=dbus
+BusName=fi.w1.wpa_supplicant1
+EnvironmentFile=-/etc/sysconfig/wpa_supplicant
+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
new file mode 100644
index 0000000..9818ccc
--- /dev/null
+++ b/wpa_supplicant.spec
@@ -0,0 +1,200 @@
+Name:          wpa_supplicant
+Epoch:         1
+Version:       2.11
+Release:       1
+Summary:       A WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN)
+License:       BSD-3-Clause
+Url:           https://w1.fi/wpa_supplicant/
+Source0:       http://w1.fi/releases/%{name}-%{version}.tar.gz
+Source1:       build-config
+Source3:       %{name}.service
+Source5:       %{name}.logrotate
+
+%ifnarch loongarch64
+Patch6000:     wpa_supplicant-gui-qt4.patch
+%endif
+%if "%{?toolchain}" == "clang"
+Patch6001:     Add-clang-support-for-qmake.patch
+%endif
+
+%ifarch loongarch64
+BuildRequires: /usr/bin/qmake
+%else
+BuildRequires: qt-devel >= 4.0
+%endif
+BuildRequires: openssl-devel readline-devel dbus-devel libnl3-devel systemd-units docbook-utils
+
+Requires(post): systemd-sysv
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+Obsoletes:     libeap < %{epoch}:%{version}-%{release} libeap-devel < %{epoch}:%{version}-%{release}
+
+%description
+wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN).
+It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is
+used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming
+and IEEE 802.11 authentication/association of the wlan driver.
+
+%ifnarch loongarch64
+%package gui
+Summary: Graphical User Interface for %{name}
+
+%description gui
+Graphical User Interface for wpa_supplicant written using QT
+%endif
+
+%package help
+Summary: Help package for %{name}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description help
+This is the help package for %{name}, including some doc and man help files.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+%define _build_cmd__() %{make_build} %{?1:-C %1} %{?2}
+%define _build_setups_qt__ QMAKE='%{qmake_qt4}' LRELEASE='%{_qt4_bindir}/lrelease' QTDIR=%{_libdir}/qt4
+
+export CFLAGS="${CFLAGS:-%optflags} -fPIE -DPIE"\
+  CXXFLAGS="${CXXFLAGS:-%optflags} -fPIE -DPIE"\
+  LDFLAGS="${LDFLAGS:-%optflags} -pie -Wl,-z,now"\
+  BINDIR="%{_sbindir}"\
+  LIBDIR="%{_libdir}"
+
+cp -f %{SOURCE1} %{name}/.config
+%{_build_cmd__ %{name}}
+%ifnarch loongarch64
+%{_build_cmd__ %{name} wpa_gui-qt4} %{_build_setups_qt__}
+%endif
+%{_build_cmd__ %{name} eapol_test}
+%{_build_cmd__ %{name}/doc/docbook man}
+
+%install
+install -Dm644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
+install -Dm644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+install -d %{buildroot}/%{_sbindir}
+install -m755 %{name}/{wpa_passphrase,wpa_cli,wpa_supplicant,eapol_test} %{buildroot}%{_sbindir}
+
+install -Dm644 %{name}/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -Dm644 %{name}/dbus/fi.w1.wpa_supplicant1.service %{buildroot}%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
+
+%ifnarch loongarch64
+install -Dm755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir}/wpa_gui
+%endif
+
+install -d %{buildroot}%{_mandir}/man{5,8}
+install -m644 %{name}/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
+install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
+
+%post
+%systemd_post wpa_supplicant
+
+%preun
+%systemd_preun wpa_supplicant
+
+%files
+%license COPYING
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%{_unitdir}/%{name}.service
+%{_sysconfdir}/dbus-1/system.d/%{name}.conf
+%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
+%{_sbindir}/wpa_passphrase
+%{_sbindir}/wpa_supplicant
+%{_sbindir}/wpa_cli
+%{_sbindir}/eapol_test
+
+%ifnarch loongarch64
+%files gui
+%{_bindir}/wpa_gui
+%endif
+
+%files help
+%doc %{name}/ChangeLog README %{name}/eap_testing.txt %{name}/todo.txt %{name}/wpa_supplicant.conf %{name}/examples
+%{_mandir}/man8/*
+%{_mandir}/man5/*
+
+%changelog
+* Wed Jul 24 2024 Funda Wang <fundawang@yeah.net> - 1:2.11-1
+- update to 2.11
+
+* Wed May 29 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1:2.10-6
+- fix build error for loongarch64
+
+* Mon Apr 15 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 1:2.10-5
+- Backport patch fix CVE-2023-52160
+
+* Mon Apr 15 2024 sunmin <sunmin@kubuds.cn> - 1:2.10-5
+- Add clang support for qmake
+
+* Tue Sep 5 2023 xiaofan <xiaofan@iscas.ac.cn> - 1:2.10-4
+- fix wpa_cli not work
+
+* Mon Sep 4 2023 xiaofan <xiaofan@iscas.ac.cn> - 1:2.10-3
+- remove redundant command argument and file
+
+* Sun May 14 2023 Guan Jun-Ming <gjunming@qq.com> - 1:2.10-2
+- update build-config file to remove CONFIG_TLS_DEFAULT_CIPHERS
+
+* Thu Mar 31 2022 yuanxin <yuanxin24@h-partners.com> - 1:2.10-1
+- update version to 2.10
+
+* Wed Jan 26 2022 shixuantong <shixuantong@huawei.com> - 1:2.6-30
+- Type:cves
+- ID:CVE-2022-23303 CVE-2022-23304
+- SUG:NA
+- DESC:fix CVE-2022-23303 CVE-2022-23304
+
+* Wed Sep 22 2021 gaoyusong <gaoyusong1@huawei.com> - 1:2.6-29
+- Type:cves
+- ID: CVE-2021-0326
+- SUG:NA
+- DESC: fix CVE-2021-0326
+
+* Thu Mar 11 2021 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-28
+- fix CVE-2021-27803
+
+* Thu Dec 24 2020 wuchaochao <wuchaochao4@huawei.com> - 1:2.6-27
+- Type:cves
+- ID: CVE-2019-13377
+- SUG:NA
+- DESC: fix CVE-2019-13377
+
+* Tue Feb 04 2020 zhouyihang <zhouyihang1@huawei.com> - 1:2.6-26
+- Type:cves
+- ID: CVE-2019-9495
+- SUG:restart
+- DESC: fix CVE-2019-9495
+
+* Mon Feb 03 2020 zhouyihang <zhouyihang1@huawei.com> - 1:2.6-25
+- Type:cves
+- ID: CVE-2019-9499
+- SUG:restart
+- DESC: fix CVE-2019-9499
+
+* Mon Feb 03 2020 lihao <lihao129@huawei.com> - 1:2.6-24
+- Type:cves
+- ID: CVE-2018-14526
+- SUG:restart
+- DESC: fix CVE-2018-14526
+
+* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-23
+- clean code
+
+* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-22
+- add options of wpa_supplicant.service
+
+* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-21
+- Modify requires
+
+* Mon Dec 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-20
+- fix CVE-2019-16275, CVE-2019-9497, CVE-2019-9498, CVE-2019-9499, CVE-2019-11555
+
+* Wed Sep 25 2019 huzhiyu <huzhiyu1@huawei.com> - 1:2.6-19
+- change patch names legal
+
+* Sat Sep 14 2019 huzhiyu <huzhiyu1@huawei.com> - 1:2.6-18
+- Package init