openkylin
/
wpa
mirror of https://gitee.com/openkylin/wpa.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 03:18:56 +08:00
parent b726ff8f97
commit 0d26a8603d
13 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch vendored
View File

@ -1,14 +1,18 @@
From: Reinhard Tartler <siretart@tauware.de>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Use pkg-config for libpcsclite linkage flags
At least in debian, we can rely on pkg-config being available and
returning more accurate ldflags.
---
wpa_supplicant/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index f3e86c1de6c0..ba3fe350675a 100644
index f1384d5..98ac987 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -934,7 +934,7 @@ else
@@ -1017,7 +1017,7 @@ else
ifdef CONFIG_OSX
LIBS += -framework PCSC
else

6
debian/patches/02_dbus_group_policy.patch vendored
View File

@ -1,4 +1,5 @@
From: Michael Biebl <biebl@debian.org>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Add D-Bus group policy
Debian does not use pam_console but uses group membership
@ -7,6 +8,11 @@ makes it work on Debian and Ubuntu.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=412179
---
wpa_supplicant/dbus/dbus-wpa_supplicant.conf | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/wpa_supplicant/dbus/dbus-wpa_supplicant.conf b/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
index e81b495..a333302 100644
--- a/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
+++ b/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
@@ -9,6 +9,14 @@

6
debian/patches/06_wpa_gui_menu_exec_path.patch vendored
View File

@ -1,9 +1,15 @@
From: Kel Modderman <kel@otaku42.de>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Use full executable path into wpa_gui.desktop
Debian specific patch to desktop menu entry, so that we may exec
wpa_gui which being in /usr/sbin may not be in the PATH
---
wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop b/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
index ccc7d87..e560f3d 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
+++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
@@ -2,7 +2,7 @@

11
debian/patches/07_dbus_service_syslog.patch vendored
View File

@ -1,10 +1,17 @@
From: Kel Modderman <kel@otaku42.de>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Tweak D-Bus/systemd service activation configuration files:
* log wpa_supplicant messages to syslog
* activate control socket interface so that wpa_cli can be used by D-Bus
activated wpa_supplicant daemon
---
wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in | 2 +-
wpa_supplicant/systemd/wpa_supplicant.service.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
index d97ff39..3b0af67 100644
--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
@@ -1,5 +1,5 @@
@ -14,9 +21,11 @@ Subject: Tweak D-Bus/systemd service activation configuration files:
+Exec=@BINDIR@/wpa_supplicant -u -s -O /run/wpa_supplicant
User=root
SystemdService=wpa_supplicant.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
index 75a37a8..32516a3 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -6,7 +6,7 @@
@@ -6,7 +6,7 @@ Wants=network.target
[Service]
Type=dbus
BusName=fi.w1.wpa_supplicant1

8
debian/patches/12_wpa_gui_knotify_support.patch vendored
View File

@ -1,8 +1,14 @@
From: Raphael Geissert <geissert@debian.org>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Use KDE's KNotify when running under KDE
Bug-Debian: http://bugs.debian.org/582793
---
wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index a0aa05e..396b121 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -11,11 +11,14 @@
@ -20,7 +26,7 @@ Bug-Debian: http://bugs.debian.org/582793
#include "wpagui.h"
#include "dirent.h"
@@ -1415,10 +1418,21 @@
@@ -1415,10 +1418,21 @@ void WpaGui::createTrayIcon(bool trayOnly)
void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
const QString & msg)
{

8
debian/patches/CVE-2019-16275.patch vendored
View File

@ -1,4 +1,3 @@
From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 29 Aug 2019 11:52:04 +0300
Subject: [PATCH] AP: Silently ignore management frame from unexpected source
@ -22,7 +21,7 @@ Signed-off-by: Jouni Malinen <j@w1.fi>
2 files changed, 25 insertions(+)
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 31587685fe3b..34ca379edc3d 100644
index 3158768..34ca379 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
@ -46,7 +45,7 @@ index 31587685fe3b..34ca379edc3d 100644
hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index c85a28db44b7..e7065372e158 100644
index c85a28d..e706537 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
@ -68,6 +67,3 @@ index c85a28db44b7..e7065372e158 100644
if (stype == WLAN_FC_STYPE_BEACON) {
handle_beacon(hapd, mgmt, len, fi);
return 1;
--
2.20.1

8
debian/patches/allow-tlsv1.patch vendored
View File

@ -1,12 +1,18 @@
From: Andrej Shadura <andrewsh@debian.org>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Enable TLSv1.0 by default
OpenSSL 1.1.1 disables TLSv1.0 by default and sets the security level to 2.
Some older networks may support for TLSv1.0 and less secure cyphers.
---
src/crypto/tls_openssl.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 07d38e4..97a7fd6 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1027,6 +1027,13 @@
@@ -1035,6 +1035,13 @@ void * tls_init(const struct tls_config *conf)
os_free(data);
return NULL;
}

13
debian/patches/git_realtek_macrand.patch vendored
View File

@ -1,4 +1,3 @@
From 7546c489a95a033c78331915fcdfa0e6fd74d563 Mon Sep 17 00:00:00 2001
From: Ouden <Ouden.Biz@gmail.com>
Date: Wed, 18 Mar 2020 17:58:37 +0800
Subject: nl80211: Fix RTM NEW/DELLINK IFLA_IFNAME copy for maximum ifname
@ -18,11 +17,11 @@ Signed-off-by: Ouden <Ouden.Biz@gmail.com>
src/drivers/driver_nl80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: wpa-2.9/src/drivers/driver_nl80211.c
===================================================================
--- wpa-2.9.orig/src/drivers/driver_nl80211.c
+++ wpa-2.9/src/drivers/driver_nl80211.c
@@ -1065,7 +1065,7 @@ static void wpa_driver_nl80211_event_rtm
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 0a356ee..47df47f 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -1065,7 +1065,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
while (RTA_OK(attr, attrlen)) {
switch (attr->rta_type) {
case IFLA_IFNAME:
@ -31,7 +30,7 @@ Index: wpa-2.9/src/drivers/driver_nl80211.c
break;
os_memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr));
ifname[RTA_PAYLOAD(attr)] = '\0';
@@ -1240,7 +1240,7 @@ static void wpa_driver_nl80211_event_rtm
@@ -1240,7 +1240,7 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
while (RTA_OK(attr, attrlen)) {
switch (attr->rta_type) {
case IFLA_IFNAME:

6
debian/patches/networkd-driver-fallback.patch vendored
View File

@ -1,8 +1,14 @@
From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: wpasupplicant: configure driver fallback for networkd
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
---
wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
index 7788b38..cff0b6d 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
@@ -9,7 +9,7 @@ Wants=network.target

1
debian/patches/series vendored
View File

@ -6,7 +6,6 @@
networkd-driver-fallback.patch
wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch
allow-tlsv1.patch
# Ubuntu patches
session-ticket.patch
wpa_service_ignore-on-isolate.patch
CVE-2019-16275.patch

9
debian/patches/session-ticket.patch vendored
View File

@ -1,15 +1,16 @@
From: Jeremy Nickurak <jeremy@nickurak.ca>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: Disable the session ticket TLS extension.
Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343
Bug: http://w1.fi/bugz/show_bug.cgi?id=447
---
src/crypto/tls_openssl.c | 1 +
src/crypto/tls_openssl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 97a7fd6..0e0567f 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1584,6 +1584,7 @@ struct tls_connection * tls_connection_i
@@ -1584,6 +1584,7 @@ struct tls_connection * tls_connection_init(void *ssl_ctx)
#ifdef SSL_OP_NO_COMPRESSION
options |= SSL_OP_NO_COMPRESSION;
#endif /* SSL_OP_NO_COMPRESSION */

11
debian/patches/wpa_service_ignore-on-isolate.patch vendored
View File

@ -1,9 +1,14 @@
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: wpa_service_ignore-on-isolate
Updated: 2017-11-10
---
wpa_supplicant/systemd/wpa_supplicant.service.in | 2 ++
1 file changed, 2 insertions(+)
wpa_supplicant/systemd/wpa_supplicant.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
index bc0688a..561ae8f 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -3,6 +3,7 @@ Description=WPA supplicant

6
debian/patches/wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch vendored
View File

@ -1,4 +1,5 @@
From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Date: Sat, 14 May 2022 03:18:56 +0800
Subject: wpa_supplicant: Fix dependency odering when invoked with DBus
Make sure that DBus isn't shut down before wpa_supplicant, as that would
@ -9,6 +10,11 @@ systemd upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=89847
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
---
wpa_supplicant/systemd/wpa_supplicant.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
index 32516a3..bc0688a 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -1,6 +1,7 @@