mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
wpa_supplicant 2.10.
This commit is contained in:
Augustin Cavalier
@@ -0,0 +1,95 @@
|
||||
From c32dc38056e9b2e51a9a2c36084bac97eae2c056 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Thu, 3 Mar 2022 15:16:00 -0500
|
||||
Subject: [PATCH] GCC2 fixes.
|
||||
|
||||
---
|
||||
src/ap/hostapd.h | 2 +-
|
||||
src/common/ieee802_11_common.h | 2 +-
|
||||
src/common/ieee802_11_defs.h | 6 +++---
|
||||
wpa_supplicant/bss.h | 2 +-
|
||||
wpa_supplicant/wpa_gui-haiku/main_haiku.cpp | 1 +
|
||||
5 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
|
||||
index f3ca752..aee5518 100644
|
||||
--- a/src/ap/hostapd.h
|
||||
+++ b/src/ap/hostapd.h
|
||||
@@ -146,7 +146,7 @@ struct hostapd_sae_commit_queue {
|
||||
struct dl_list list;
|
||||
int rssi;
|
||||
size_t len;
|
||||
- u8 msg[];
|
||||
+ u8 msg[0];
|
||||
};
|
||||
|
||||
/**
|
||||
diff --git a/src/common/ieee802_11_common.h b/src/common/ieee802_11_common.h
|
||||
index 3c57803..0c846dc 100644
|
||||
--- a/src/common/ieee802_11_common.h
|
||||
+++ b/src/common/ieee802_11_common.h
|
||||
@@ -15,7 +15,7 @@
|
||||
struct element {
|
||||
u8 id;
|
||||
u8 datalen;
|
||||
- u8 data[];
|
||||
+ u8 data[0];
|
||||
} STRUCT_PACKED;
|
||||
|
||||
struct hostapd_hw_modes;
|
||||
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
|
||||
index d04d2d6..41d157f 100644
|
||||
--- a/src/common/ieee802_11_defs.h
|
||||
+++ b/src/common/ieee802_11_defs.h
|
||||
@@ -1001,12 +1001,12 @@ struct ieee80211_mgmt {
|
||||
struct {
|
||||
u8 action;
|
||||
u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
|
||||
- u8 variable[]; /* OCI element */
|
||||
+ u8 variable[0]; /* OCI element */
|
||||
} STRUCT_PACKED sa_query_req;
|
||||
struct {
|
||||
u8 action; /* */
|
||||
u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
|
||||
- u8 variable[]; /* OCI element */
|
||||
+ u8 variable[0]; /* OCI element */
|
||||
} STRUCT_PACKED sa_query_resp;
|
||||
struct {
|
||||
u8 action;
|
||||
@@ -1067,7 +1067,7 @@ struct ieee80211_mgmt {
|
||||
struct {
|
||||
u8 action; /* 12 */
|
||||
u8 dialog_token;
|
||||
- u8 variable[];
|
||||
+ u8 variable[0];
|
||||
} STRUCT_PACKED coloc_intf_report;
|
||||
struct {
|
||||
u8 action; /* 15 */
|
||||
diff --git a/wpa_supplicant/bss.h b/wpa_supplicant/bss.h
|
||||
index 4078b9b..11e0b90 100644
|
||||
--- a/wpa_supplicant/bss.h
|
||||
+++ b/wpa_supplicant/bss.h
|
||||
@@ -122,7 +122,7 @@ struct wpa_bss {
|
||||
size_t beacon_ie_len;
|
||||
/* followed by ie_len octets of IEs */
|
||||
/* followed by beacon_ie_len octets of IEs */
|
||||
- u8 ies[];
|
||||
+ u8 ies[0];
|
||||
};
|
||||
|
||||
static inline const u8 * wpa_bss_ie_ptr(const struct wpa_bss *bss)
|
||||
diff --git a/wpa_supplicant/wpa_gui-haiku/main_haiku.cpp b/wpa_supplicant/wpa_gui-haiku/main_haiku.cpp
|
||||
index 3171d89..3776742 100644
|
||||
--- a/wpa_supplicant/wpa_gui-haiku/main_haiku.cpp
|
||||
+++ b/wpa_supplicant/wpa_gui-haiku/main_haiku.cpp
|
||||
@@ -52,6 +52,7 @@ extern "C" {
|
||||
#undef B_TRANSLATION_CONTEXT
|
||||
#define B_TRANSLATION_CONTEXT "wpa_supplicant"
|
||||
|
||||
+#undef bool
|
||||
|
||||
static const uint32 kMsgJoinTimeout = 'jnto';
|
||||
static const char *kWPASupplicantKeyring = "wpa_supplicant";
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
From 3e64b474c112a40620ada798ec2d69747d921474 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Mon, 13 Apr 2020 18:34:42 -0400
|
||||
Subject: [PATCH] GCC2 fixes.
|
||||
|
||||
---
|
||||
src/ap/hostapd.h | 2 +-
|
||||
src/common/ieee802_11_common.h | 2 +-
|
||||
src/common/ieee802_11_defs.h | 8 ++++----
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
|
||||
index 518c7f1..d31f078 100644
|
||||
--- a/src/ap/hostapd.h
|
||||
+++ b/src/ap/hostapd.h
|
||||
@@ -135,7 +135,7 @@ struct hostapd_sae_commit_queue {
|
||||
struct dl_list list;
|
||||
int rssi;
|
||||
size_t len;
|
||||
- u8 msg[];
|
||||
+ u8 msg[0];
|
||||
};
|
||||
|
||||
/**
|
||||
diff --git a/src/common/ieee802_11_common.h b/src/common/ieee802_11_common.h
|
||||
index 963b67a..9491128 100644
|
||||
--- a/src/common/ieee802_11_common.h
|
||||
+++ b/src/common/ieee802_11_common.h
|
||||
@@ -15,7 +15,7 @@
|
||||
struct element {
|
||||
u8 id;
|
||||
u8 datalen;
|
||||
- u8 data[];
|
||||
+ u8 data[0];
|
||||
} STRUCT_PACKED;
|
||||
|
||||
struct hostapd_hw_modes;
|
||||
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
|
||||
index 71cf383..1b3bdb6 100644
|
||||
--- a/src/common/ieee802_11_defs.h
|
||||
+++ b/src/common/ieee802_11_defs.h
|
||||
@@ -948,12 +948,12 @@ struct ieee80211_mgmt {
|
||||
struct {
|
||||
u8 action;
|
||||
u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
|
||||
- u8 variable[]; /* OCI element */
|
||||
+ u8 variable[0]; /* OCI element */
|
||||
} STRUCT_PACKED sa_query_req;
|
||||
struct {
|
||||
u8 action; /* */
|
||||
u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
|
||||
- u8 variable[]; /* OCI element */
|
||||
+ u8 variable[0]; /* OCI element */
|
||||
} STRUCT_PACKED sa_query_resp;
|
||||
struct {
|
||||
u8 action;
|
||||
@@ -1014,7 +1014,7 @@ struct ieee80211_mgmt {
|
||||
struct {
|
||||
u8 action; /* 12 */
|
||||
u8 dialog_token;
|
||||
- u8 variable[];
|
||||
+ u8 variable[0];
|
||||
} STRUCT_PACKED coloc_intf_report;
|
||||
struct {
|
||||
u8 action; /* 15 */
|
||||
@@ -2109,7 +2109,7 @@ struct ieee80211_he_capabilities {
|
||||
u8 he_phy_capab_info[11];
|
||||
/* Followed by 4, 8, or 12 octets of Supported HE-MCS And NSS Set field
|
||||
* and optional variable length PPE Thresholds field. */
|
||||
- u8 optional[];
|
||||
+ u8 optional[0];
|
||||
} STRUCT_PACKED;
|
||||
|
||||
struct ieee80211_he_operation {
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -7,15 +7,15 @@ desktop/laptop computers and embedded systems. Supplicant is the IEEE \
|
||||
negotiation with a WPA Authenticator and it controls the roaming and IEEE \
|
||||
802.11 authentication/association of the wlan driver."
|
||||
HOMEPAGE="https://w1.fi/wpa_supplicant/"
|
||||
COPYRIGHT="2003-2019 Jouni Malinen"
|
||||
COPYRIGHT="2003-2022 Jouni Malinen"
|
||||
LICENSE="BSD (2-clause)
|
||||
GNU GPL v2"
|
||||
REVISION="3"
|
||||
srcGitRev="546947c950f32569382ba75d97d229280b6345c3"
|
||||
REVISION="1"
|
||||
srcGitRev="8fb311b20f7661e3fbd899dbf110d49d99f4d2f1"
|
||||
SOURCE_URI="https://github.com/haiku/wpa_supplicant/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="28c357e553660013793d8c8089292aaf56aa5f32af7dc947afb49e671c40d31e"
|
||||
CHECKSUM_SHA256="7bdc7bef9f30c754689806998a5e4d492976c8e050b6220e58406a0ee5adbf79"
|
||||
SOURCE_DIR="wpa_supplicant-$srcGitRev"
|
||||
PATCHES="wpa_supplicant-2.9-gcc2.patch"
|
||||
PATCHES="wpa_supplicant-2.10-gcc2.patch"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
SUMMARY="A WPA Supplicant with support for WPA and WPA2"
|
||||
DESCRIPTION="
|
||||
wpa_supplicant is a WPA Supplicant for Linux, BSD, macOS, Windows, and Haiku \
|
||||
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."
|
||||
HOMEPAGE="https://w1.fi/wpa_supplicant/"
|
||||
COPYRIGHT="2003-2018 Jouni Malinen"
|
||||
LICENSE="BSD (2-clause)
|
||||
GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/haiku/wpa_supplicant/archive/2.7devel.haiku.1.tar.gz"
|
||||
CHECKSUM_SHA256="ed18b891907747617e1ad6dcdfb8e4269f21197a03352a1a5042037efab2d3f2"
|
||||
SOURCE_DIR="wpa_supplicant-2.7devel.haiku.1"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
|
||||
PROVIDES="
|
||||
wpa_supplicant = $portVersion compat >= 2
|
||||
cmd:wpa_supplicant = $portVersion compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
lib:libssl
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
devel:libssl >= 1.0.0
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cd wpa_supplicant
|
||||
CFLAGS="-MMD -O2 -Wall" make wpa_supplicant LDO=g++
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd wpa_supplicant
|
||||
mkdir -p $binDir
|
||||
cp -v wpa_supplicant $binDir
|
||||
}
|
||||
Reference in New Issue
Block a user