JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Adjust hostapd patches to apply without errors (#1985)

Browse Source 
* Adjust hostapd patches to apply without errors
* Cleanup FUZZ from patch
* Fix patch
* Disable broken feature
This commit is contained in:
Igor Pečovnik
2020-05-24 20:31:27 +02:00
committed by GitHub
parent 93b690c22f
commit e5876ba032
9 changed files with 14 additions and 8822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/extras-buildpkgs/90-hostapd-realtek.conf
View File

@@ -2,7 +2,7 @@
local package_name="hostapd-realtek"
local package_repo="http://w1.fi/hostap.git"
local package_ref="tag:hostap_2_5"
local package_upstream_version="3:2.5-3"
local package_upstream_version="3:2.5-4"
local package_builddeps="pkg-config libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man"
local package_builddeps_jessie="libssl-dev"
local package_builddeps_xenial="libssl-dev"

2
packages/extras-buildpkgs/90-hostapd.conf
View File

@@ -2,7 +2,7 @@
local package_name="hostapd"
local package_repo="http://w1.fi/hostap.git"
local package_ref="tag:hostap_2_9"
local package_upstream_version="3:2.9-101"
local package_upstream_version="3:2.9-102"
local package_builddeps="pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man"
local package_install_target="hostapd"
local package_component="${release}-utils"

4
packages/extras-buildpkgs/hostapd-realtek/debian/config/hostapd.conf
View File

@@ -25,8 +25,6 @@ rsn_pairwise=CCMP
auth_algs=1
macaddr_acl=0
noscan=1
### IEEE 802.11n
#ieee80211n=1
#ht_capab=
@@ -47,4 +45,4 @@ noscan=1
# controlling enabled
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
ctrl_interface_group=0

8795
packages/extras-buildpkgs/hostapd-realtek/debian/patches/realtek.patch
View File

File diff suppressed because it is too large Load Diff

15
packages/extras-buildpkgs/hostapd-realtek/debian/patches/session-ticket.patch
View File

@@ -1,17 +1,8 @@
From: Jeremy Nickurak <jeremy@nickurak.ca>
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 +
1 file changed, 1 insertion(+)
Index: b/src/crypto/tls_openssl.c
===================================================================
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 23ac64b48..cc8d159e0 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1060,6 +1060,7 @@ struct tls_connection * tls_connection_i
@@ -1577,6 +1577,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 */

4
packages/extras-buildpkgs/hostapd/debian/config/hostapd.conf
View File

@@ -25,8 +25,6 @@ rsn_pairwise=CCMP
auth_algs=1
macaddr_acl=0
noscan=1
### IEEE 802.11n
#ieee80211n=1
#ht_capab=
@@ -47,4 +45,4 @@ noscan=1
# controlling enabled
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
ctrl_interface_group=0

2
packages/extras-buildpkgs/hostapd/debian/patches/0006-Extend-ieee80211_freq_to_channel_ext-to-cover-channe.patch
View File

@@ -15,7 +15,7 @@ diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c
index 603b961..26e08b7 100644
--- a/src/common/ieee802_11_common.c
+++ b/src/common/ieee802_11_common.c
@@ -794,6 +794,25 @@ enum hostapd_hw_mode ieee80211_freq_to_channel_ext(unsigned int freq,
@@ -823,6 +823,25 @@ enum hostapd_hw_mode ieee80211_freq_to_channel_ext(unsigned int freq,
return HOSTAPD_MODE_IEEE80211A;
}

10
packages/extras-buildpkgs/hostapd/debian/patches/300-noscan.patch
View File

@@ -1,8 +1,8 @@
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3317,6 +3317,10 @@ static int hostapd_config_fill(struct ho
}
#endif /* CONFIG_IEEE80211W */
@@ -3411,6 +3411,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
bss->ieee80211w = 1;
#endif /* CONFIG_OCV */
#ifdef CONFIG_IEEE80211N
+ } else if (os_strcmp(buf, "noscan") == 0) {
+ conf->noscan = atoi(pos);
@@ -13,7 +13,7 @@
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -781,6 +781,8 @@ struct hostapd_config {
@@ -932,6 +932,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;
@@ -24,7 +24,7 @@
int no_pri_sec_switch;
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -480,7 +480,8 @@ static int ieee80211n_check_40mhz(struct
@@ -477,7 +477,8 @@ static int ieee80211n_check_40mhz(struct
int ret;
/* Check that HT40 is used and PRI / SEC switch is allowed */

2
packages/extras-buildpkgs/hostapd/debian/patches/session-ticket.patch
View File

@@ -2,7 +2,7 @@ diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 23ac64b48..cc8d159e0 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1354,6 +1354,7 @@ struct tls_connection * tls_connection_init(void *ssl_ctx)
@@ -1577,6 +1577,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 */