[pkg-wpa-devel] [PATCH 2/2] Refresh patches and drop obsolete patches.
Julian Wollrath
jwollrath at web.de
Sat May 23 10:17:31 UTC 2015
---
debian/changelog | 10 +-
.../01_use_pkg-config_for_pcsc-lite_module.patch | 2 +-
debian/patches/12_wpa_gui_knotify_support.patch | 12 +--
...e-SSID-element-length-before-copying-it-C.patch | 2 +-
...apd-operation-without-hw_mode-driver-data.patch | 27 -----
...e802_11_common.c-in-wpa_supplicant-build-.patch | 117 ---------------------
debian/patches/series | 3 -
...ant-MACsec-fix-build-failure-for-IEEE8021.patch | 42 --------
8 files changed, 17 insertions(+), 198 deletions(-)
delete mode 100644 debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
delete mode 100644 debian/patches/include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
delete mode 100644 debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
diff --git a/debian/changelog b/debian/changelog
index 7bae026bad64..03ff07020b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
wpa (2.4-0.1) UNRELEASED; urgency=medium
* Non-maintainer upload.
- * New upstream version.
+ * New upstream version:
+ - Refresh patches:
+ + 01_use_pkg-config_for_pcsc-lite_module.patch
+ + 12_wpa_gui_knotify_support.patch
+ + 2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+ - Drop patches included upstream:
+ + hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
+ + include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
+ + wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
-- Julian Wollrath <jwollrath at web.de> Sat, 23 May 2015 11:17:32 +0200
diff --git a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
index 62c5587325a1..14d2041cd0a3 100644
--- a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
+++ b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
@@ -5,7 +5,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
---
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -882,7 +882,7 @@ ifdef CONFIG_NATIVE_WINDOWS
+@@ -913,7 +913,7 @@ ifdef CONFIG_NATIVE_WINDOWS
#dynamic symbol loading that is now used in pcsc_funcs.c
#LIBS += -lwinscard
else
diff --git a/debian/patches/12_wpa_gui_knotify_support.patch b/debian/patches/12_wpa_gui_knotify_support.patch
index 9e870dc1a9c6..0f8484ee6a39 100644
--- a/debian/patches/12_wpa_gui_knotify_support.patch
+++ b/debian/patches/12_wpa_gui_knotify_support.patch
@@ -19,24 +19,24 @@ Bug-Debian: http://bugs.debian.org/582793
#include "wpagui.h"
#include "dirent.h"
-@@ -1329,10 +1332,21 @@ void WpaGui::createTrayIcon(bool trayOnl
+@@ -1339,10 +1336,21 @@ void WpaGui::createTrayIcon(bool trayOnl
void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
const QString & msg)
{
- if (!QSystemTrayIcon::supportsMessages())
-+ if (isVisible() || !tray_icon || !tray_icon->isVisible())
++ if (isVisible() || !tray_icon || !tray_icon->isVisible() || quietMode)
return;
-- if (isVisible() || !tray_icon || !tray_icon->isVisible())
+- if (isVisible() || !tray_icon || !tray_icon->isVisible() || quietMode)
+ /* first try to use KDE's notifications system if running under
+ * a KDE session */
-+ if (getenv("KDE_FULL_SESSION") != NULL) {
++ if (getenv("KDE_FULL_SESSION") != NULL) {
+ QStringList args;
+ args << "--passivepopup" << msg << QString::number(sec);
+ args << "--title" << "wpa_gui";
-+
++
+ if (QProcess::execute("/usr/bin/kdialog", args) == 0)
-+ return;
++ return;
+ }
+
+ if (!QSystemTrayIcon::supportsMessages())
diff --git a/debian/patches/2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/debian/patches/2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
index 3bf0819be8b0..e408fbe3839e 100644
--- a/debian/patches/2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+++ b/debian/patches/2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -27,7 +27,7 @@ Signed-off-by: Jouni Malinen <jouni at qca.qualcomm.com>
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
-@@ -736,6 +736,7 @@ int p2p_add_device(struct p2p_data *p2p,
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p,
if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
os_memcpy(dev->interface_addr, addr, ETH_ALEN);
if (msg.ssid &&
diff --git a/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch b/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
deleted file mode 100644
index 7444d5db6c16..000000000000
--- a/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j at w1.fi>
-Date: Sun, 16 Nov 2014 23:08:04 +0000
-Subject: Fix hostapd operation without hw_mode driver data
-
-Commit 7f0303d5b0bb425f3e7318a7016b55ba9e67f9de ('hostapd: Verify VHT
-160/80+80 MHz driver support') added couple of hapd->iface->current_mode
-dereferences of which the one in hostapd_set_freq() can be hit with some
-configuration files when using driver wrappers that do not have hw_mode
-data, i.e., when current_mode is NULL. This could result in segmentation
-fault when trying to use driver=wired. Fix this by checking that
-current_mode is not NULL before dereferencing it to get vht_capab.
-
-Signed-off-by: Jouni Malinen <j at w1.fi>
----
---- a/src/ap/ap_drv_ops.c
-+++ b/src/ap/ap_drv_ops.c
-@@ -573,7 +573,8 @@ int hostapd_set_freq(struct hostapd_data
- vht_enabled, sec_channel_offset,
- vht_oper_chwidth,
- center_segment0, center_segment1,
-- hapd->iface->current_mode->vht_capab))
-+ hapd->iface->current_mode ?
-+ hapd->iface->current_mode->vht_capab : 0))
- return -1;
-
- if (hapd->driver == NULL)
diff --git a/debian/patches/include-ieee802_11_common.c-in-wpa_supplicant-build-.patch b/debian/patches/include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
deleted file mode 100644
index 0717ae7d630b..000000000000
--- a/debian/patches/include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 2d4e9c2eb811978a4097b7d249eca3c7e9c510e5 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j at w1.fi>
-Date: Sun, 12 Oct 2014 17:03:25 +0300
-Subject: [PATCH] Include ieee802_11_common.c in wpa_supplicant build
- unconditionally
-
-This is needed for number of items and it was possible to make a build
-configuration that did not include ieee802_11_common.c while still
-trying to use functions from there. While it would be possible to add
-NEED_80211_COMMON=y to all the cases where this file is needed, the
-extra complexity from this is not really justifiable anymore, so include
-the file unconditionally.
-
-Signed-off-by: Jouni Malinen <j at w1.fi>
----
- wpa_supplicant/Android.mk | 7 -------
- wpa_supplicant/Makefile | 7 -------
- 2 files changed, 14 deletions(-)
-
---- a/wpa_supplicant/Android.mk
-+++ b/wpa_supplicant/Android.mk
-@@ -193,7 +193,6 @@ endif
- ifdef CONFIG_IEEE80211R
- L_CFLAGS += -DCONFIG_IEEE80211R
- OBJS += src/rsn_supp/wpa_ft.c
--NEED_80211_COMMON=y
- NEED_SHA256=y
- NEED_AES_OMAC1=y
- endif
-@@ -263,7 +262,6 @@ OBJS += src/utils/bitfield.c
- L_CFLAGS += -DCONFIG_P2P
- NEED_GAS=y
- NEED_OFFCHANNEL=y
--NEED_80211_COMMON=y
- CONFIG_WPS=y
- CONFIG_AP=y
- ifdef CONFIG_P2P_STRICT
-@@ -635,7 +633,6 @@ CONFIG_IEEE8021X_EAPOL=y
- NEED_DH_GROUPS=y
- NEED_SHA256=y
- NEED_BASE64=y
--NEED_80211_COMMON=y
- NEED_AES_CBC=y
- NEED_MODEXP=y
-
-@@ -744,7 +741,6 @@ endif
- endif
-
- ifdef CONFIG_AP
--NEED_80211_COMMON=y
- NEED_EAP_COMMON=y
- NEED_RSN_AUTHENTICATOR=y
- L_CFLAGS += -DCONFIG_AP
-@@ -1368,14 +1364,11 @@ OBJS += src/utils/base64.c
- endif
-
- ifdef NEED_SME
--NEED_80211_COMMON=y
- OBJS += sme.c
- L_CFLAGS += -DCONFIG_SME
- endif
-
--ifdef NEED_80211_COMMON
- OBJS += src/common/ieee802_11_common.c
--endif
-
- ifdef NEED_EAP_COMMON
- OBJS += src/eap_common/eap_common.c
---- a/wpa_supplicant/Makefile
-+++ b/wpa_supplicant/Makefile
-@@ -194,7 +194,6 @@ endif
- ifdef CONFIG_IEEE80211R
- CFLAGS += -DCONFIG_IEEE80211R
- OBJS += ../src/rsn_supp/wpa_ft.o
--NEED_80211_COMMON=y
- NEED_SHA256=y
- NEED_AES_OMAC1=y
- endif
-@@ -264,7 +263,6 @@ OBJS += ../src/utils/bitfield.o
- CFLAGS += -DCONFIG_P2P
- NEED_GAS=y
- NEED_OFFCHANNEL=y
--NEED_80211_COMMON=y
- CONFIG_WPS=y
- CONFIG_AP=y
- ifdef CONFIG_P2P_STRICT
-@@ -635,7 +633,6 @@ CONFIG_IEEE8021X_EAPOL=y
- NEED_DH_GROUPS=y
- NEED_SHA256=y
- NEED_BASE64=y
--NEED_80211_COMMON=y
- NEED_AES_CBC=y
- NEED_MODEXP=y
-
-@@ -757,7 +754,6 @@ OBJS += ../src/pae/ieee802_1x_secy_ops.o
- endif
-
- ifdef CONFIG_AP
--NEED_80211_COMMON=y
- NEED_EAP_COMMON=y
- NEED_RSN_AUTHENTICATOR=y
- CFLAGS += -DCONFIG_AP
-@@ -1386,14 +1382,11 @@ OBJS += ../src/utils/base64.o
- endif
-
- ifdef NEED_SME
--NEED_80211_COMMON=y
- OBJS += sme.o
- CFLAGS += -DCONFIG_SME
- endif
-
--ifdef NEED_80211_COMMON
- OBJS += ../src/common/ieee802_11_common.o
--endif
-
- ifdef NEED_EAP_COMMON
- OBJS += ../src/eap_common/eap_common.o
diff --git a/debian/patches/series b/debian/patches/series
index 288d3a8e3e33..4731ce0f8a3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,9 +4,6 @@
07_dbus_service_syslog.patch
12_wpa_gui_knotify_support.patch
wpa_gui_desktop_add-keywords-entry.patch
-wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
-include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
-hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
networkd-driver-fallback.patch
wpasupplicant_fix-systemd-unit-dependencies.patch
2015-01/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
diff --git a/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch b/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
deleted file mode 100644
index d5687934c553..000000000000
--- a/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d79a8b745b58f0ce1aa1b6969414456415e7eb16 Mon Sep 17 00:00:00 2001
-From: Stefan Lippers-Hollmann <s.l-h at gmx.de>
-Date: Mon, 30 Jun 2014 01:46:27 +0200
-Subject: [PATCH] wpa_supplicant/ MACsec: fix build failure for
- IEEE8021X_EAPOL=n
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building wpa_supplicant >= 2.2 fails on Debian/ kfreebsd with the following
-error message:
-
-cc -c -o wpa_supplicant.o -MMD -Wall -g -Os -fPIC -Isrc -Isrc/utils -DCONFIG_BACKEND_FILE -DCONFIG_DRIVER_BSD -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX wpa_supplicant.c
-wpa_supplicant.c: In function ‘wpa_supplicant_initiate_eapol’:
-wpa_supplicant.c:303:33: error: ‘ssid’ undeclared (first use in this function)
- ieee802_1x_alloc_kay_sm(wpa_s, ssid);
- ^
-wpa_supplicant.c:303:33: note: each undeclared identifier is reported only once for each function it appears in
-
-Move ieee802_1x_alloc_kay_sm(wpa_s, ssid) into the IEEE8021X_EAPOL ifdef,
-as the "ssid" is only conditionally defined for it.
-
-Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
----
-Build-tested only.
-
- wpa_supplicant/wpa_supplicant.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -299,9 +299,9 @@ void wpa_supplicant_initiate_eapol(struc
- eapol_conf.external_sim = wpa_s->conf->external_sim;
- eapol_conf.wps = wpa_s->key_mgmt == WPA_KEY_MGMT_WPS;
- eapol_sm_notify_config(wpa_s->eapol, &ssid->eap, &eapol_conf);
--#endif /* IEEE8021X_EAPOL */
-
- ieee802_1x_alloc_kay_sm(wpa_s, ssid);
-+#endif /* IEEE8021X_EAPOL */
- }
-
-
--
2.1.4
More information about the Pkg-wpa-devel
mailing list